Begin porting Zed1 themes to Zed2 (#3793)

Marshall Bowers created

This PR is a first pass at porting the Zed1 themes to Zed2.

For the initial release of Zed2 we'll be shipping just the themes that
existed in Zed1, ported to Zed2. The new themes that were previously
added just in Zed2 have been removed.

Release Notes:

- N/A

Change summary

crates/file_finder2/src/file_finder.rs      |    5 
crates/theme2/src/registry.rs               |   19 
crates/theme2/src/themes/andromeda.rs       |  768 +-
crates/theme2/src/themes/atelier.rs         | 7159 +++++++++++++++++++++++
crates/theme2/src/themes/ayu.rs             |  666 +
crates/theme2/src/themes/dracula.rs         |  250 
crates/theme2/src/themes/gruvbox.rs         |  693 +
crates/theme2/src/themes/mod.rs             |   30 
crates/theme2/src/themes/night_owl.rs       |  547 -
crates/theme2/src/themes/noctis.rs          | 3110 ---------
crates/theme2/src/themes/nord.rs            |  277 
crates/theme2/src/themes/one.rs             |  718 -
crates/theme2/src/themes/rose_pine.rs       |  791 +
crates/theme2/src/themes/sandcastle.rs      |  353 +
crates/theme2/src/themes/solarized.rs       |  487 +
crates/theme2/src/themes/summercamp.rs      |  353 +
crates/theme2/src/themes/synthwave_84.rs    |  248 
crates/theme_importer/src/main.rs           |  278 
crates/theme_importer/src/theme_printer.rs  |    1 
crates/theme_importer/src/zed1/converter.rs |   56 
crates/workspace2/src/dock.rs               |    1 
21 files changed, 10,327 insertions(+), 6,483 deletions(-)

Detailed changes

crates/file_finder2/src/file_finder.rs πŸ”—

@@ -721,10 +721,7 @@ impl PickerDelegate for FileFinderDelegate {
                 .child(
                     v_stack()
                         .child(HighlightedLabel::new(file_name, file_name_positions))
-                        .child(
-                            HighlightedLabel::new(full_path, full_path_positions)
-                                .color(Color::Muted),
-                        ),
+                        .child(HighlightedLabel::new(full_path, full_path_positions)),
                 ),
         )
     }

crates/theme2/src/registry.rs πŸ”—

@@ -6,8 +6,8 @@ use gpui::{HighlightStyle, SharedString};
 use refineable::Refineable;
 
 use crate::{
-    one_themes::one_family, zed_pro_family, Appearance, PlayerColors, StatusColors, SyntaxTheme,
-    SystemColors, Theme, ThemeColors, ThemeFamily, ThemeStyles, UserTheme, UserThemeFamily,
+    Appearance, PlayerColors, StatusColors, SyntaxTheme, SystemColors, Theme, ThemeColors,
+    ThemeFamily, ThemeStyles, UserTheme, UserThemeFamily,
 };
 
 #[derive(Debug, Clone)]
@@ -34,7 +34,7 @@ impl ThemeRegistry {
     }
 
     #[allow(unused)]
-    fn insert_user_theme_familes(&mut self, families: impl IntoIterator<Item = UserThemeFamily>) {
+    fn insert_user_theme_families(&mut self, families: impl IntoIterator<Item = UserThemeFamily>) {
         for family in families.into_iter() {
             self.insert_user_themes(family.themes);
         }
@@ -117,18 +117,23 @@ impl ThemeRegistry {
 
     pub fn load_user_themes(&mut self) {
         #[cfg(not(feature = "importing-themes"))]
-        self.insert_user_theme_familes(crate::all_user_themes());
+        self.insert_user_theme_families(crate::all_user_themes());
     }
 }
 
 impl Default for ThemeRegistry {
     fn default() -> Self {
-        let mut this = Self {
+        let mut registry = Self {
             themes: HashMap::default(),
         };
 
-        this.insert_theme_families([zed_pro_family(), one_family()]);
+        // We're loading our new versions of the One themes by default, as
+        // we need them to be loaded for tests.
+        //
+        // These themes will get overwritten when `load_user_themes` is called
+        // when Zed starts, so the One variants used will be the ones ported from Zed1.
+        registry.insert_theme_families([crate::one_themes::one_family()]);
 
-        this
+        registry
     }
 }

crates/theme2/src/themes/andromeda.rs πŸ”—

@@ -12,442 +12,342 @@ use crate::{
 pub fn andromeda() -> UserThemeFamily {
     UserThemeFamily {
         name: "Andromeda".into(),
-        author: "Eliver Lara (EliverLara)".into(),
-        themes: vec![
-            UserTheme {
-                name: "Andromeda".into(),
-                appearance: Appearance::Dark,
-                styles: UserThemeStylesRefinement {
-                    colors: ThemeColorsRefinement {
-                        border: Some(rgba(0x1b1d23ff).into()),
-                        border_variant: Some(rgba(0x1b1d23ff).into()),
-                        border_focused: Some(rgba(0x746f77ff).into()),
-                        border_selected: Some(rgba(0x1b1d23ff).into()),
-                        border_transparent: Some(rgba(0x1b1d23ff).into()),
-                        border_disabled: Some(rgba(0x1b1d23ff).into()),
-                        elevated_surface_background: Some(rgba(0x2b303bff).into()),
-                        surface_background: Some(rgba(0x23262eff).into()),
-                        background: Some(rgba(0x23262eff).into()),
-                        element_background: Some(rgba(0x00e8c5cc).into()),
-                        element_hover: Some(rgba(0x23262eff).into()),
-                        element_selected: Some(rgba(0x23262eff).into()),
-                        drop_target_background: Some(rgba(0x3a404eff).into()),
-                        ghost_element_hover: Some(rgba(0x23262eff).into()),
-                        ghost_element_selected: Some(rgba(0x23262eff).into()),
-                        text: Some(rgba(0xd5ced9ff).into()),
-                        text_muted: Some(rgba(0x746f77ff).into()),
-                        status_bar_background: Some(rgba(0x23262eff).into()),
-                        title_bar_background: Some(rgba(0x23262eff).into()),
-                        toolbar_background: Some(rgba(0x23262eff).into()),
-                        tab_bar_background: Some(rgba(0x23262eff).into()),
-                        tab_inactive_background: Some(rgba(0x23262eff).into()),
-                        tab_active_background: Some(rgba(0x23262eff).into()),
-                        scrollbar_thumb_background: Some(rgba(0x3a3f4c77).into()),
-                        scrollbar_thumb_hover_background: Some(rgba(0x3a3f4caa).into()),
-                        scrollbar_thumb_border: Some(rgba(0x3a3f4c77).into()),
-                        scrollbar_track_background: Some(rgba(0x23262eff).into()),
-                        scrollbar_track_border: Some(rgba(0x1b1d23ff).into()),
-                        editor_foreground: Some(rgba(0xd5ced9ff).into()),
-                        editor_background: Some(rgba(0x23262eff).into()),
-                        editor_gutter_background: Some(rgba(0x23262eff).into()),
-                        editor_line_number: Some(rgba(0x746f77ff).into()),
-                        editor_active_line_number: Some(rgba(0xd5ced9ff).into()),
-                        editor_wrap_guide: Some(rgba(0x1b1d23ff).into()),
-                        editor_active_wrap_guide: Some(rgba(0x1b1d23ff).into()),
-                        terminal_ansi_bright_red: Some(rgba(0xee5d43ff).into()),
-                        terminal_ansi_bright_green: Some(rgba(0x96e072ff).into()),
-                        terminal_ansi_bright_yellow: Some(rgba(0xffe66dff).into()),
-                        terminal_ansi_bright_blue: Some(rgba(0x7cb7ffff).into()),
-                        terminal_ansi_bright_magenta: Some(rgba(0xff00aaff).into()),
-                        terminal_ansi_bright_cyan: Some(rgba(0x00e8c6ff).into()),
-                        terminal_ansi_red: Some(rgba(0xee5d43ff).into()),
-                        terminal_ansi_green: Some(rgba(0x96e072ff).into()),
-                        terminal_ansi_yellow: Some(rgba(0xffe66dff).into()),
-                        terminal_ansi_blue: Some(rgba(0x7cb7ffff).into()),
-                        terminal_ansi_magenta: Some(rgba(0xff00aaff).into()),
-                        terminal_ansi_cyan: Some(rgba(0x00e8c6ff).into()),
-                        ..Default::default()
-                    },
-                    status: StatusColorsRefinement {
-                        created: Some(rgba(0x9bc53dbb).into()),
-                        deleted: Some(rgba(0xfc644dbb).into()),
-                        error: Some(rgba(0xfc644dff).into()),
-                        hidden: Some(rgba(0x746f77ff).into()),
-                        hint: Some(rgba(0x969696ff).into()),
-                        ignored: Some(rgba(0x555555ff).into()),
-                        modified: Some(rgba(0x5bc0ebbb).into()),
-                        ..Default::default()
-                    },
-                    syntax: Some(UserSyntaxTheme {
-                        highlights: vec![
-                            (
-                                "attribute".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xffe66dff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "comment".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xa0a1a7cc).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "comment.doc".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xa0a1a7cc).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "constant".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xee5d43ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "constructor".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xf92672ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "emphasis".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xc74dedff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "emphasis.strong".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xf39c12ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "function".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xffe66dff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "keyword".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xc74dedff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "number".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xf39c12ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "operator".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xee5d43ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x96e072ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.escape".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x96e072ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.regex".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x96e072ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.special".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x96e072ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.special.symbol".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x96e072ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "tag".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xf92672ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "text.literal".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x96e072ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "type".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xffe66dff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "variable".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x00e8c6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "variable.special".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x00e8c6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                        ],
-                    }),
+        author: "Zed Industries".into(),
+        themes: vec![UserTheme {
+            name: "Andromeda".into(),
+            appearance: Appearance::Dark,
+            styles: UserThemeStylesRefinement {
+                colors: ThemeColorsRefinement {
+                    border: Some(rgba(0x2b2f39ff).into()),
+                    border_variant: Some(rgba(0x2b2f39ff).into()),
+                    elevated_surface_background: Some(rgba(0x262a33ff).into()),
+                    background: Some(rgba(0x262a33ff).into()),
+                    panel_background: Some(rgba(0x21242bff).into()),
+                    element_hover: Some(rgba(0x2b2f3980).into()),
+                    element_selected: Some(rgba(0x383b4580).into()),
+                    text: Some(rgba(0xaca8aeff).into()),
+                    text_muted: Some(rgba(0x474a53ff).into()),
+                    status_bar_background: Some(rgba(0x262a33ff).into()),
+                    title_bar_background: Some(rgba(0x262a33ff).into()),
+                    toolbar_background: Some(rgba(0x1e2025ff).into()),
+                    tab_bar_background: Some(rgba(0x21242bff).into()),
+                    tab_inactive_background: Some(rgba(0x21242bff).into()),
+                    tab_active_background: Some(rgba(0x1e2025ff).into()),
+                    scrollbar_thumb_background: Some(rgba(0xf7f7f84d).into()),
+                    scrollbar_thumb_hover_background: Some(rgba(0xf7f7f84d).into()),
+                    scrollbar_thumb_border: Some(rgba(0x21232aff).into()),
+                    scrollbar_track_border: Some(rgba(0x21232aff).into()),
+                    editor_foreground: Some(rgba(0xf7f7f8ff).into()),
+                    editor_background: Some(rgba(0x1e2025ff).into()),
+                    editor_gutter_background: Some(rgba(0x1e2025ff).into()),
+                    editor_line_number: Some(rgba(0xf7f7f859).into()),
+                    editor_active_line_number: Some(rgba(0xf7f7f8ff).into()),
+                    editor_wrap_guide: Some(rgba(0xf7f7f80d).into()),
+                    editor_active_wrap_guide: Some(rgba(0xf7f7f81a).into()),
+                    terminal_background: Some(rgba(0x1e2025ff).into()),
+                    terminal_ansi_bright_black: Some(rgba(0x40434cff).into()),
+                    terminal_ansi_bright_red: Some(rgba(0x8e103aff).into()),
+                    terminal_ansi_bright_green: Some(rgba(0x457c38ff).into()),
+                    terminal_ansi_bright_yellow: Some(rgba(0x958435ff).into()),
+                    terminal_ansi_bright_blue: Some(rgba(0x1b5148ff).into()),
+                    terminal_ansi_bright_magenta: Some(rgba(0x682781ff).into()),
+                    terminal_ansi_bright_cyan: Some(rgba(0x018169ff).into()),
+                    terminal_ansi_bright_white: Some(rgba(0xf7f7f8ff).into()),
+                    terminal_ansi_black: Some(rgba(0x1e2025ff).into()),
+                    terminal_ansi_red: Some(rgba(0xf82872ff).into()),
+                    terminal_ansi_green: Some(rgba(0x96df72ff).into()),
+                    terminal_ansi_yellow: Some(rgba(0xfee56dff).into()),
+                    terminal_ansi_blue: Some(rgba(0x11a793ff).into()),
+                    terminal_ansi_magenta: Some(rgba(0xc74decff).into()),
+                    terminal_ansi_cyan: Some(rgba(0x09e7c6ff).into()),
+                    terminal_ansi_white: Some(rgba(0xf7f7f8ff).into()),
+                    ..Default::default()
                 },
-            },
-            UserTheme {
-                name: "Andromeda Bordered".into(),
-                appearance: Appearance::Dark,
-                styles: UserThemeStylesRefinement {
-                    colors: ThemeColorsRefinement {
-                        border: Some(rgba(0x1b1d23ff).into()),
-                        border_variant: Some(rgba(0x1b1d23ff).into()),
-                        border_focused: Some(rgba(0x746f77ff).into()),
-                        border_selected: Some(rgba(0x1b1d23ff).into()),
-                        border_transparent: Some(rgba(0x1b1d23ff).into()),
-                        border_disabled: Some(rgba(0x1b1d23ff).into()),
-                        elevated_surface_background: Some(rgba(0x2b303bff).into()),
-                        surface_background: Some(rgba(0x23262eff).into()),
-                        background: Some(rgba(0x262a33ff).into()),
-                        element_background: Some(rgba(0x00e8c5cc).into()),
-                        element_hover: Some(rgba(0x23262eff).into()),
-                        element_selected: Some(rgba(0x23262eff).into()),
-                        drop_target_background: Some(rgba(0x3a404eff).into()),
-                        ghost_element_hover: Some(rgba(0x23262eff).into()),
-                        ghost_element_selected: Some(rgba(0x23262eff).into()),
-                        text: Some(rgba(0xd5ced9ff).into()),
-                        text_muted: Some(rgba(0x746f77ff).into()),
-                        status_bar_background: Some(rgba(0x23262eff).into()),
-                        title_bar_background: Some(rgba(0x23262eff).into()),
-                        toolbar_background: Some(rgba(0x262a33ff).into()),
-                        tab_bar_background: Some(rgba(0x23262eff).into()),
-                        tab_inactive_background: Some(rgba(0x23262eff).into()),
-                        tab_active_background: Some(rgba(0x262a33ff).into()),
-                        scrollbar_thumb_background: Some(rgba(0x3a3f4c77).into()),
-                        scrollbar_thumb_hover_background: Some(rgba(0x3a3f4caa).into()),
-                        scrollbar_thumb_border: Some(rgba(0x3a3f4c77).into()),
-                        scrollbar_track_background: Some(rgba(0x262a33ff).into()),
-                        scrollbar_track_border: Some(rgba(0x1b1d23ff).into()),
-                        editor_foreground: Some(rgba(0xd5ced9ff).into()),
-                        editor_background: Some(rgba(0x262a33ff).into()),
-                        editor_gutter_background: Some(rgba(0x262a33ff).into()),
-                        editor_line_number: Some(rgba(0x746f77ff).into()),
-                        editor_active_line_number: Some(rgba(0xd5ced9ff).into()),
-                        editor_wrap_guide: Some(rgba(0x1b1d23ff).into()),
-                        editor_active_wrap_guide: Some(rgba(0x1b1d23ff).into()),
-                        terminal_ansi_bright_red: Some(rgba(0xee5d43ff).into()),
-                        terminal_ansi_bright_green: Some(rgba(0x96e072ff).into()),
-                        terminal_ansi_bright_yellow: Some(rgba(0xffe66dff).into()),
-                        terminal_ansi_bright_blue: Some(rgba(0x7cb7ffff).into()),
-                        terminal_ansi_bright_magenta: Some(rgba(0xff00aaff).into()),
-                        terminal_ansi_bright_cyan: Some(rgba(0x00e8c6ff).into()),
-                        terminal_ansi_red: Some(rgba(0xee5d43ff).into()),
-                        terminal_ansi_green: Some(rgba(0x96e072ff).into()),
-                        terminal_ansi_yellow: Some(rgba(0xffe66dff).into()),
-                        terminal_ansi_blue: Some(rgba(0x7cb7ffff).into()),
-                        terminal_ansi_magenta: Some(rgba(0xff00aaff).into()),
-                        terminal_ansi_cyan: Some(rgba(0x00e8c6ff).into()),
-                        ..Default::default()
-                    },
-                    status: StatusColorsRefinement {
-                        created: Some(rgba(0x9bc53dbb).into()),
-                        deleted: Some(rgba(0xfc644dbb).into()),
-                        error: Some(rgba(0xfc644dff).into()),
-                        hidden: Some(rgba(0x746f77ff).into()),
-                        hint: Some(rgba(0x969696ff).into()),
-                        ignored: Some(rgba(0x555555ff).into()),
-                        modified: Some(rgba(0x5bc0ebbb).into()),
-                        ..Default::default()
-                    },
-                    syntax: Some(UserSyntaxTheme {
-                        highlights: vec![
-                            (
-                                "attribute".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xffe66dff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "comment".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xa0a1a7cc).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "comment.doc".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xa0a1a7cc).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "constant".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xee5d43ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "constructor".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xf92672ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "emphasis".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xc74dedff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "emphasis.strong".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xf39c12ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "function".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xffe66dff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "keyword".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xc74dedff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "number".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xf39c12ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "operator".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xee5d43ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x96e072ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.escape".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x96e072ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.regex".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x96e072ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.special".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x96e072ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.special.symbol".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x96e072ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "tag".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xf92672ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "text.literal".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x96e072ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "type".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xffe66dff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "variable".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x00e8c6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "variable.special".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x00e8c6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                        ],
-                    }),
+                status: StatusColorsRefinement {
+                    created: Some(rgba(0x96df72ff).into()),
+                    deleted: Some(rgba(0xcd1d5aff).into()),
+                    error: Some(rgba(0xf82872ff).into()),
+                    modified: Some(rgba(0xfee56dff).into()),
+                    success: Some(rgba(0xf7f7f8ff).into()),
+                    warning: Some(rgba(0xfee56dff).into()),
+                    ..Default::default()
                 },
+                syntax: Some(UserSyntaxTheme {
+                    highlights: vec![
+                        (
+                            "attribute".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0x11a793ff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "boolean".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0x96df72ff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "comment".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xafabb1ff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "comment.doc".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xafabb1ff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "constant".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0x96df72ff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "constructor".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0x11a793ff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "embedded".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xf7f7f8ff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "emphasis".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0x11a793ff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "emphasis.strong".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0x11a793ff).into()),
+                                font_weight: Some(UserFontWeight(700.0)),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "enum".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xf29c14ff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "function".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xfee56dff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "hint".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0x618399ff).into()),
+                                font_weight: Some(UserFontWeight(700.0)),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "keyword".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0x11a793ff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "label".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0x11a793ff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "link_text".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xf29c14ff).into()),
+                                font_style: Some(UserFontStyle::Italic),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "link_uri".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0x96df72ff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "number".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0x96df72ff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "operator".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xf29c14ff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "predictive".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0x315f70ff).into()),
+                                font_style: Some(UserFontStyle::Italic),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "preproc".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xf7f7f8ff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "primary".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xf7f7f8ff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "property".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0x11a793ff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "punctuation".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xd8d5dbff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "punctuation.bracket".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xd8d5dbff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "punctuation.delimiter".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xd8d5dbff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "punctuation.list_marker".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xd8d5dbff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "punctuation.special".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xd8d5dbff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "string".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xf29c14ff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "string.escape".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xafabb1ff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "string.regex".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xf29c14ff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "string.special".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xf29c14ff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "string.special.symbol".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xf29c14ff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "tag".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0x11a793ff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "text.literal".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xf29c14ff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "title".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xf7f7f8ff).into()),
+                                font_weight: Some(UserFontWeight(700.0)),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "type".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0x09e7c6ff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "variable".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xf7f7f8ff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "variant".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0x11a793ff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                    ],
+                }),
             },
-        ],
+        }],
     }
 }

crates/theme2/src/themes/atelier.rs πŸ”—

@@ -0,0 +1,7159 @@
+// This file was generated by the `theme_importer`.
+// Be careful when modifying it by hand.
+
+use gpui::rgba;
+
+#[allow(unused)]
+use crate::{
+    Appearance, StatusColorsRefinement, ThemeColorsRefinement, UserFontStyle, UserFontWeight,
+    UserHighlightStyle, UserSyntaxTheme, UserTheme, UserThemeFamily, UserThemeStylesRefinement,
+};
+
+pub fn atelier() -> UserThemeFamily {
+    UserThemeFamily {
+        name: "Atelier".into(),
+        author: "Zed Industries".into(),
+        themes: vec![
+            UserTheme {
+                name: "Atelier Estuary Light".into(),
+                appearance: Appearance::Light,
+                styles: UserThemeStylesRefinement {
+                    colors: ThemeColorsRefinement {
+                        border: Some(rgba(0x969585ff).into()),
+                        border_variant: Some(rgba(0x969585ff).into()),
+                        elevated_surface_background: Some(rgba(0xc5c4b9ff).into()),
+                        background: Some(rgba(0xc5c4b9ff).into()),
+                        panel_background: Some(rgba(0xebeae3ff).into()),
+                        element_hover: Some(rgba(0x96958580).into()),
+                        element_selected: Some(rgba(0x8b8a7880).into()),
+                        text: Some(rgba(0x61604fff).into()),
+                        text_muted: Some(rgba(0x878573ff).into()),
+                        status_bar_background: Some(rgba(0xc5c4b9ff).into()),
+                        title_bar_background: Some(rgba(0xc5c4b9ff).into()),
+                        toolbar_background: Some(rgba(0xf4f3ecff).into()),
+                        tab_bar_background: Some(rgba(0xebeae3ff).into()),
+                        tab_inactive_background: Some(rgba(0xebeae3ff).into()),
+                        tab_active_background: Some(rgba(0xf4f3ecff).into()),
+                        scrollbar_thumb_background: Some(rgba(0x22221b4d).into()),
+                        scrollbar_thumb_hover_background: Some(rgba(0x22221b4d).into()),
+                        scrollbar_thumb_border: Some(rgba(0xedece5ff).into()),
+                        scrollbar_track_border: Some(rgba(0xedece5ff).into()),
+                        editor_foreground: Some(rgba(0x302f27ff).into()),
+                        editor_background: Some(rgba(0xf4f3ecff).into()),
+                        editor_gutter_background: Some(rgba(0xf4f3ecff).into()),
+                        editor_line_number: Some(rgba(0x22221b59).into()),
+                        editor_active_line_number: Some(rgba(0x22221bff).into()),
+                        editor_wrap_guide: Some(rgba(0x22221b0d).into()),
+                        editor_active_wrap_guide: Some(rgba(0x22221b1a).into()),
+                        terminal_background: Some(rgba(0xf4f3ecff).into()),
+                        terminal_ansi_bright_black: Some(rgba(0x898775ff).into()),
+                        terminal_ansi_bright_red: Some(rgba(0xe4af96ff).into()),
+                        terminal_ansi_bright_green: Some(rgba(0xc0ca93ff).into()),
+                        terminal_ansi_bright_yellow: Some(rgba(0xd7ca8dff).into()),
+                        terminal_ansi_bright_blue: Some(rgba(0xa0d1b0ff).into()),
+                        terminal_ansi_bright_magenta: Some(rgba(0xcfb4bcff).into()),
+                        terminal_ansi_bright_cyan: Some(rgba(0xaecea1ff).into()),
+                        terminal_ansi_bright_white: Some(rgba(0x22221bff).into()),
+                        terminal_ansi_black: Some(rgba(0xf4f3ecff).into()),
+                        terminal_ansi_red: Some(rgba(0xba6337ff).into()),
+                        terminal_ansi_green: Some(rgba(0x7d9728ff).into()),
+                        terminal_ansi_yellow: Some(rgba(0xa59810ff).into()),
+                        terminal_ansi_blue: Some(rgba(0x38a166ff).into()),
+                        terminal_ansi_magenta: Some(rgba(0x9d6c7cff).into()),
+                        terminal_ansi_cyan: Some(rgba(0x5c9d49ff).into()),
+                        terminal_ansi_white: Some(rgba(0x22221bff).into()),
+                        ..Default::default()
+                    },
+                    status: StatusColorsRefinement {
+                        created: Some(rgba(0x98ab54ff).into()),
+                        deleted: Some(rgba(0xba6337ff).into()),
+                        error: Some(rgba(0xba6337ff).into()),
+                        modified: Some(rgba(0xa59810ff).into()),
+                        success: Some(rgba(0x22221bff).into()),
+                        warning: Some(rgba(0xa59810ff).into()),
+                        ..Default::default()
+                    },
+                    syntax: Some(UserSyntaxTheme {
+                        highlights: vec![
+                            (
+                                "attribute".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x38a166ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "boolean".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7d9728ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "comment".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x878573ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "comment.doc".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x5f5e4eff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "constant".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7d9728ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "constructor".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x38a166ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "embedded".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x22221bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "emphasis".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x38a166ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "emphasis.strong".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x38a166ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "enum".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xae7315ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x36a166ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function.method".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x36a166ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function.special.definition".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xa5980dff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "hint".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x768962ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "keyword".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x5f9182ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "label".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x38a166ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "link_text".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xae7315ff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "link_uri".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7d9728ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "number".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xae7313ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "operator".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x5f5e4eff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "predictive".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x879a72ff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "preproc".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x22221bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "primary".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x302f27ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "property".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xba6236ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x302f27ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.bracket".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x5f5e4eff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.delimiter".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x5f5e4eff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.list_marker".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x302f27ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x9d6c7cff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7d9726ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.escape".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x5f5e4eff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.regex".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x5b9d48ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x9d6c7cff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.special.symbol".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7d9726ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "tag".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x38a166ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "text.literal".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xae7315ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "title".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x22221bff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "type".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xa5980dff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variable".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x302f27ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variable.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x5f9182ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variant".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xa5980dff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                        ],
+                    }),
+                },
+            },
+            UserTheme {
+                name: "Atelier Forest Dark".into(),
+                appearance: Appearance::Dark,
+                styles: UserThemeStylesRefinement {
+                    colors: ThemeColorsRefinement {
+                        border: Some(rgba(0x665f5cff).into()),
+                        border_variant: Some(rgba(0x665f5cff).into()),
+                        elevated_surface_background: Some(rgba(0x443c39ff).into()),
+                        background: Some(rgba(0x443c39ff).into()),
+                        panel_background: Some(rgba(0x27211eff).into()),
+                        element_hover: Some(rgba(0x665f5c80).into()),
+                        element_selected: Some(rgba(0x71696680).into()),
+                        text: Some(rgba(0xa79f9dff).into()),
+                        text_muted: Some(rgba(0x766e6bff).into()),
+                        status_bar_background: Some(rgba(0x443c39ff).into()),
+                        title_bar_background: Some(rgba(0x443c39ff).into()),
+                        toolbar_background: Some(rgba(0x1b1918ff).into()),
+                        tab_bar_background: Some(rgba(0x27211eff).into()),
+                        tab_inactive_background: Some(rgba(0x27211eff).into()),
+                        tab_active_background: Some(rgba(0x1b1918ff).into()),
+                        scrollbar_thumb_background: Some(rgba(0xf1efee4d).into()),
+                        scrollbar_thumb_hover_background: Some(rgba(0xf1efee4d).into()),
+                        scrollbar_thumb_border: Some(rgba(0x251f1dff).into()),
+                        scrollbar_track_border: Some(rgba(0x251f1dff).into()),
+                        editor_foreground: Some(rgba(0xe6e2e0ff).into()),
+                        editor_background: Some(rgba(0x1b1918ff).into()),
+                        editor_gutter_background: Some(rgba(0x1b1918ff).into()),
+                        editor_line_number: Some(rgba(0xf1efee59).into()),
+                        editor_active_line_number: Some(rgba(0xf1efeeff).into()),
+                        editor_wrap_guide: Some(rgba(0xf1efee0d).into()),
+                        editor_active_wrap_guide: Some(rgba(0xf1efee1a).into()),
+                        terminal_background: Some(rgba(0x1b1918ff).into()),
+                        terminal_ansi_bright_black: Some(rgba(0x746c69ff).into()),
+                        terminal_ansi_bright_red: Some(rgba(0x8c1223ff).into()),
+                        terminal_ansi_bright_green: Some(rgba(0x3e491aff).into()),
+                        terminal_ansi_bright_yellow: Some(rgba(0x674115ff).into()),
+                        terminal_ansi_bright_blue: Some(rgba(0x213f78ff).into()),
+                        terminal_ansi_bright_magenta: Some(rgba(0x662186ff).into()),
+                        terminal_ansi_bright_cyan: Some(rgba(0x264958ff).into()),
+                        terminal_ansi_bright_white: Some(rgba(0xf1efeeff).into()),
+                        terminal_ansi_black: Some(rgba(0x1b1918ff).into()),
+                        terminal_ansi_red: Some(rgba(0xf22d40ff).into()),
+                        terminal_ansi_green: Some(rgba(0x7b9727ff).into()),
+                        terminal_ansi_yellow: Some(rgba(0xc38419ff).into()),
+                        terminal_ansi_blue: Some(rgba(0x417ee6ff).into()),
+                        terminal_ansi_magenta: Some(rgba(0xc340f2ff).into()),
+                        terminal_ansi_cyan: Some(rgba(0x3e97b8ff).into()),
+                        terminal_ansi_white: Some(rgba(0xf1efeeff).into()),
+                        ..Default::default()
+                    },
+                    status: StatusColorsRefinement {
+                        created: Some(rgba(0x7b9727ff).into()),
+                        deleted: Some(rgba(0xc82234ff).into()),
+                        error: Some(rgba(0xf22d40ff).into()),
+                        modified: Some(rgba(0xc38419ff).into()),
+                        success: Some(rgba(0xf1efeeff).into()),
+                        warning: Some(rgba(0xc38419ff).into()),
+                        ..Default::default()
+                    },
+                    syntax: Some(UserSyntaxTheme {
+                        highlights: vec![
+                            (
+                                "attribute".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x417ee6ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "boolean".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7b9727ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "comment".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x766e6bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "comment.doc".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xa8a19fff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "constant".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7b9727ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "constructor".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x417ee6ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "embedded".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xf1efeeff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "emphasis".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x417ee6ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "emphasis.strong".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x417ee6ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "enum".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xdf5321ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x407ee7ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function.method".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x407ee7ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function.special.definition".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xc38418ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "hint".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xa87187ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "keyword".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x6666eaff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "label".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x417ee6ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "link_text".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xdf5321ff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "link_uri".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7b9727ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "number".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xdf5320ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "operator".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xa8a19fff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "predictive".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x8f5b71ff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "preproc".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xf1efeeff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "primary".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xe6e2e0ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "property".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xf22c40ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xe6e2e0ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.bracket".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xa8a19fff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.delimiter".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xa8a19fff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.list_marker".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xe6e2e0ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xc33ff3ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7b9726ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.escape".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xa8a19fff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.regex".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x3d97b8ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xc33ff3ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.special.symbol".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7b9726ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "tag".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x417ee6ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "text.literal".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xdf5321ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "title".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xf1efeeff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "type".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xc38418ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variable".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xe6e2e0ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variable.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x6666eaff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variant".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xc38418ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                        ],
+                    }),
+                },
+            },
+            UserTheme {
+                name: "Atelier Savanna Light".into(),
+                appearance: Appearance::Light,
+                styles: UserThemeStylesRefinement {
+                    colors: ThemeColorsRefinement {
+                        border: Some(rgba(0x8b968eff).into()),
+                        border_variant: Some(rgba(0x8b968eff).into()),
+                        elevated_surface_background: Some(rgba(0xbcc5bfff).into()),
+                        background: Some(rgba(0xbcc5bfff).into()),
+                        panel_background: Some(rgba(0xe3ebe6ff).into()),
+                        element_hover: Some(rgba(0x8b968e80).into()),
+                        element_selected: Some(rgba(0x7e8b8280).into()),
+                        text: Some(rgba(0x546259ff).into()),
+                        text_muted: Some(rgba(0x79877dff).into()),
+                        status_bar_background: Some(rgba(0xbcc5bfff).into()),
+                        title_bar_background: Some(rgba(0xbcc5bfff).into()),
+                        toolbar_background: Some(rgba(0xecf4eeff).into()),
+                        tab_bar_background: Some(rgba(0xe3ebe6ff).into()),
+                        tab_inactive_background: Some(rgba(0xe3ebe6ff).into()),
+                        tab_active_background: Some(rgba(0xecf4eeff).into()),
+                        scrollbar_thumb_background: Some(rgba(0x171c194d).into()),
+                        scrollbar_thumb_hover_background: Some(rgba(0x171c194d).into()),
+                        scrollbar_thumb_border: Some(rgba(0xe5ede7ff).into()),
+                        scrollbar_track_border: Some(rgba(0xe5ede7ff).into()),
+                        editor_foreground: Some(rgba(0x232a25ff).into()),
+                        editor_background: Some(rgba(0xecf4eeff).into()),
+                        editor_gutter_background: Some(rgba(0xecf4eeff).into()),
+                        editor_line_number: Some(rgba(0x171c1959).into()),
+                        editor_active_line_number: Some(rgba(0x171c19ff).into()),
+                        editor_wrap_guide: Some(rgba(0x171c190d).into()),
+                        editor_active_wrap_guide: Some(rgba(0x171c191a).into()),
+                        terminal_background: Some(rgba(0xecf4eeff).into()),
+                        terminal_ansi_bright_black: Some(rgba(0x7b897fff).into()),
+                        terminal_ansi_bright_red: Some(rgba(0xdeae97ff).into()),
+                        terminal_ansi_bright_green: Some(rgba(0xa5ccafff).into()),
+                        terminal_ansi_bright_yellow: Some(rgba(0xd3bd9aff).into()),
+                        terminal_ansi_bright_blue: Some(rgba(0xa5c5c6ff).into()),
+                        terminal_ansi_bright_magenta: Some(rgba(0xc2b7b1ff).into()),
+                        terminal_ansi_bright_cyan: Some(rgba(0x9dcdcfff).into()),
+                        terminal_ansi_bright_white: Some(rgba(0x171c19ff).into()),
+                        terminal_ansi_black: Some(rgba(0xecf4eeff).into()),
+                        terminal_ansi_red: Some(rgba(0xb1623aff).into()),
+                        terminal_ansi_green: Some(rgba(0x499963ff).into()),
+                        terminal_ansi_yellow: Some(rgba(0xa07e3cff).into()),
+                        terminal_ansi_blue: Some(rgba(0x488c90ff).into()),
+                        terminal_ansi_magenta: Some(rgba(0x867469ff).into()),
+                        terminal_ansi_cyan: Some(rgba(0x1f9aa0ff).into()),
+                        terminal_ansi_white: Some(rgba(0x171c19ff).into()),
+                        ..Default::default()
+                    },
+                    status: StatusColorsRefinement {
+                        created: Some(rgba(0x6fae80ff).into()),
+                        deleted: Some(rgba(0xb1623aff).into()),
+                        error: Some(rgba(0xb1623aff).into()),
+                        modified: Some(rgba(0xa07e3cff).into()),
+                        success: Some(rgba(0x171c19ff).into()),
+                        warning: Some(rgba(0xa07e3cff).into()),
+                        ..Default::default()
+                    },
+                    syntax: Some(UserSyntaxTheme {
+                        highlights: vec![
+                            (
+                                "attribute".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x488c90ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "boolean".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x499963ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "comment".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x78877dff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "comment.doc".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x526057ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "constant".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x499963ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "constructor".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x488c90ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "embedded".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x171c19ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "emphasis".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x488c90ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "emphasis.strong".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x488c90ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "enum".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x9f713dff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x478c90ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function.method".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x478c90ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function.special.definition".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xa07e3bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "hint".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x66847cff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "keyword".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x55859bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "label".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x488c90ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "link_text".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x9f713dff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "link_uri".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x499963ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "number".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x9f713cff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "operator".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x526057ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "predictive".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x76958cff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "preproc".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x171c19ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "primary".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x232a25ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "property".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xb16139ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x232a25ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.bracket".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x526057ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.delimiter".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x526057ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.list_marker".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x232a25ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x867469ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x489963ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.escape".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x526057ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.regex".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x1c9aa0ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x867469ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.special.symbol".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x489963ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "tag".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x488c90ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "text.literal".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x9f713dff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "title".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x171c19ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "type".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xa07e3bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variable".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x232a25ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variable.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x55859bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variant".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xa07e3bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                        ],
+                    }),
+                },
+            },
+            UserTheme {
+                name: "Atelier Cave Dark".into(),
+                appearance: Appearance::Dark,
+                styles: UserThemeStylesRefinement {
+                    colors: ThemeColorsRefinement {
+                        border: Some(rgba(0x56505eff).into()),
+                        border_variant: Some(rgba(0x56505eff).into()),
+                        elevated_surface_background: Some(rgba(0x3a353fff).into()),
+                        background: Some(rgba(0x3a353fff).into()),
+                        panel_background: Some(rgba(0x221f26ff).into()),
+                        element_hover: Some(rgba(0x56505e80).into()),
+                        element_selected: Some(rgba(0x605a6880).into()),
+                        text: Some(rgba(0x898591ff).into()),
+                        text_muted: Some(rgba(0x655f6dff).into()),
+                        status_bar_background: Some(rgba(0x3a353fff).into()),
+                        title_bar_background: Some(rgba(0x3a353fff).into()),
+                        toolbar_background: Some(rgba(0x19171cff).into()),
+                        tab_bar_background: Some(rgba(0x221f26ff).into()),
+                        tab_inactive_background: Some(rgba(0x221f26ff).into()),
+                        tab_active_background: Some(rgba(0x19171cff).into()),
+                        scrollbar_thumb_background: Some(rgba(0xefecf44d).into()),
+                        scrollbar_thumb_hover_background: Some(rgba(0xefecf44d).into()),
+                        scrollbar_thumb_border: Some(rgba(0x201e24ff).into()),
+                        scrollbar_track_border: Some(rgba(0x201e24ff).into()),
+                        editor_foreground: Some(rgba(0xe2dfe7ff).into()),
+                        editor_background: Some(rgba(0x19171cff).into()),
+                        editor_gutter_background: Some(rgba(0x19171cff).into()),
+                        editor_line_number: Some(rgba(0xefecf459).into()),
+                        editor_active_line_number: Some(rgba(0xefecf4ff).into()),
+                        editor_wrap_guide: Some(rgba(0xefecf40d).into()),
+                        editor_active_wrap_guide: Some(rgba(0xefecf41a).into()),
+                        terminal_background: Some(rgba(0x19171cff).into()),
+                        terminal_ansi_bright_black: Some(rgba(0x635d6bff).into()),
+                        terminal_ansi_bright_red: Some(rgba(0x5c283cff).into()),
+                        terminal_ansi_bright_green: Some(rgba(0x1f4747ff).into()),
+                        terminal_ansi_bright_yellow: Some(rgba(0x4e3821ff).into()),
+                        terminal_ansi_bright_blue: Some(rgba(0x2d376fff).into()),
+                        terminal_ansi_bright_magenta: Some(rgba(0x60255bff).into()),
+                        terminal_ansi_bright_cyan: Some(rgba(0x26445eff).into()),
+                        terminal_ansi_bright_white: Some(rgba(0xefecf4ff).into()),
+                        terminal_ansi_black: Some(rgba(0x19171cff).into()),
+                        terminal_ansi_red: Some(rgba(0xbe4678ff).into()),
+                        terminal_ansi_green: Some(rgba(0x2c9292ff).into()),
+                        terminal_ansi_yellow: Some(rgba(0xa06e3bff).into()),
+                        terminal_ansi_blue: Some(rgba(0x576ddaff).into()),
+                        terminal_ansi_magenta: Some(rgba(0xbf41bfff).into()),
+                        terminal_ansi_cyan: Some(rgba(0x3a8bc6ff).into()),
+                        terminal_ansi_white: Some(rgba(0xefecf4ff).into()),
+                        ..Default::default()
+                    },
+                    status: StatusColorsRefinement {
+                        created: Some(rgba(0x2c9292ff).into()),
+                        deleted: Some(rgba(0x953a5fff).into()),
+                        error: Some(rgba(0xbe4678ff).into()),
+                        modified: Some(rgba(0xa06e3bff).into()),
+                        success: Some(rgba(0xefecf4ff).into()),
+                        warning: Some(rgba(0xa06e3bff).into()),
+                        ..Default::default()
+                    },
+                    syntax: Some(UserSyntaxTheme {
+                        highlights: vec![
+                            (
+                                "attribute".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x576ddaff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "boolean".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x2c9292ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "comment".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x655f6dff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "comment.doc".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x8b8792ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "constant".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x2c9292ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "constructor".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x576ddaff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "embedded".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xefecf4ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "emphasis".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x576ddaff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "emphasis.strong".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x576ddaff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "enum".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xaa573cff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x576ddbff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function.method".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x576ddbff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function.special.definition".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xa06e3bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "hint".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x716998ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "keyword".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x955ae7ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "label".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x576ddaff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "link_text".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xaa573cff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "link_uri".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x2c9292ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "number".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xaa573cff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "operator".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x8b8792ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "predictive".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x625887ff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "preproc".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xefecf4ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "primary".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xe2dfe7ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "property".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xbe4678ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xe2dfe7ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.bracket".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x8b8792ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.delimiter".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x8b8792ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.list_marker".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xe2dfe7ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xbf40bfff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x2a9292ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.escape".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x8b8792ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.regex".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x398bc6ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xbf40bfff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.special.symbol".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x2a9292ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "tag".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x576ddaff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "text.literal".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xaa573cff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "title".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xefecf4ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "type".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xa06e3bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variable".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xe2dfe7ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variable.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x955ae7ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variant".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xa06e3bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                        ],
+                    }),
+                },
+            },
+            UserTheme {
+                name: "Atelier Estuary Dark".into(),
+                appearance: Appearance::Dark,
+                styles: UserThemeStylesRefinement {
+                    colors: ThemeColorsRefinement {
+                        border: Some(rgba(0x5d5c4cff).into()),
+                        border_variant: Some(rgba(0x5d5c4cff).into()),
+                        elevated_surface_background: Some(rgba(0x424136ff).into()),
+                        background: Some(rgba(0x424136ff).into()),
+                        panel_background: Some(rgba(0x2c2b23ff).into()),
+                        element_hover: Some(rgba(0x5d5c4c80).into()),
+                        element_selected: Some(rgba(0x67665580).into()),
+                        text: Some(rgba(0x91907fff).into()),
+                        text_muted: Some(rgba(0x6c6b5aff).into()),
+                        status_bar_background: Some(rgba(0x424136ff).into()),
+                        title_bar_background: Some(rgba(0x424136ff).into()),
+                        toolbar_background: Some(rgba(0x22221bff).into()),
+                        tab_bar_background: Some(rgba(0x2c2b23ff).into()),
+                        tab_inactive_background: Some(rgba(0x2c2b23ff).into()),
+                        tab_active_background: Some(rgba(0x22221bff).into()),
+                        scrollbar_thumb_background: Some(rgba(0xf4f3ec4d).into()),
+                        scrollbar_thumb_hover_background: Some(rgba(0xf4f3ec4d).into()),
+                        scrollbar_thumb_border: Some(rgba(0x2a2922ff).into()),
+                        scrollbar_track_border: Some(rgba(0x2a2922ff).into()),
+                        editor_foreground: Some(rgba(0xe7e6dfff).into()),
+                        editor_background: Some(rgba(0x22221bff).into()),
+                        editor_gutter_background: Some(rgba(0x22221bff).into()),
+                        editor_line_number: Some(rgba(0xf4f3ec59).into()),
+                        editor_active_line_number: Some(rgba(0xf4f3ecff).into()),
+                        editor_wrap_guide: Some(rgba(0xf4f3ec0d).into()),
+                        editor_active_wrap_guide: Some(rgba(0xf4f3ec1a).into()),
+                        terminal_background: Some(rgba(0x22221bff).into()),
+                        terminal_ansi_bright_black: Some(rgba(0x6a6958ff).into()),
+                        terminal_ansi_bright_red: Some(rgba(0x5c331fff).into()),
+                        terminal_ansi_bright_green: Some(rgba(0x3f491aff).into()),
+                        terminal_ansi_bright_yellow: Some(rgba(0x514a14ff).into()),
+                        terminal_ansi_bright_blue: Some(rgba(0x234e34ff).into()),
+                        terminal_ansi_bright_magenta: Some(rgba(0x4c373eff).into()),
+                        terminal_ansi_bright_cyan: Some(rgba(0x314c27ff).into()),
+                        terminal_ansi_bright_white: Some(rgba(0xf4f3ecff).into()),
+                        terminal_ansi_black: Some(rgba(0x22221bff).into()),
+                        terminal_ansi_red: Some(rgba(0xba6237ff).into()),
+                        terminal_ansi_green: Some(rgba(0x7d9727ff).into()),
+                        terminal_ansi_yellow: Some(rgba(0xa59810ff).into()),
+                        terminal_ansi_blue: Some(rgba(0x37a166ff).into()),
+                        terminal_ansi_magenta: Some(rgba(0x9d6c7cff).into()),
+                        terminal_ansi_cyan: Some(rgba(0x5b9d48ff).into()),
+                        terminal_ansi_white: Some(rgba(0xf4f3ecff).into()),
+                        ..Default::default()
+                    },
+                    status: StatusColorsRefinement {
+                        created: Some(rgba(0x7d9727ff).into()),
+                        deleted: Some(rgba(0x934e2dff).into()),
+                        error: Some(rgba(0xba6237ff).into()),
+                        modified: Some(rgba(0xa59810ff).into()),
+                        success: Some(rgba(0xf4f3ecff).into()),
+                        warning: Some(rgba(0xa59810ff).into()),
+                        ..Default::default()
+                    },
+                    syntax: Some(UserSyntaxTheme {
+                        highlights: vec![
+                            (
+                                "attribute".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x37a166ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "boolean".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7d9727ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "comment".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x6c6b5aff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "comment.doc".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x929181ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "constant".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7d9727ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "constructor".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x37a166ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "embedded".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xf4f3ecff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "emphasis".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x37a166ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "emphasis.strong".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x37a166ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "enum".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xae7315ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x36a166ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function.method".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x36a166ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function.special.definition".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xa5980dff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "hint".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x70825bff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "keyword".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x5f9182ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "label".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x37a166ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "link_text".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xae7315ff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "link_uri".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7d9727ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "number".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xae7313ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "operator".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x929181ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "predictive".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x5f724cff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "preproc".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xf4f3ecff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "primary".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xe7e6dfff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "property".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xba6236ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xe7e6dfff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.bracket".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x929181ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.delimiter".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x929181ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.list_marker".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xe7e6dfff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x9d6c7cff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7d9726ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.escape".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x929181ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.regex".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x5b9d48ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x9d6c7cff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.special.symbol".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7d9726ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "tag".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x37a166ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "text.literal".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xae7315ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "title".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xf4f3ecff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "type".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xa5980dff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variable".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xe7e6dfff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variable.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x5f9182ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variant".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xa5980dff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                        ],
+                    }),
+                },
+            },
+            UserTheme {
+                name: "Atelier Sulphurpool Dark".into(),
+                appearance: Appearance::Dark,
+                styles: UserThemeStylesRefinement {
+                    colors: ThemeColorsRefinement {
+                        border: Some(rgba(0x5c6485ff).into()),
+                        border_variant: Some(rgba(0x5c6485ff).into()),
+                        elevated_surface_background: Some(rgba(0x3e4769ff).into()),
+                        background: Some(rgba(0x3e4769ff).into()),
+                        panel_background: Some(rgba(0x262f51ff).into()),
+                        element_hover: Some(rgba(0x5c648580).into()),
+                        element_selected: Some(rgba(0x666e8f80).into()),
+                        text: Some(rgba(0x959bb2ff).into()),
+                        text_muted: Some(rgba(0x6b7394ff).into()),
+                        status_bar_background: Some(rgba(0x3e4769ff).into()),
+                        title_bar_background: Some(rgba(0x3e4769ff).into()),
+                        toolbar_background: Some(rgba(0x202746ff).into()),
+                        tab_bar_background: Some(rgba(0x262f51ff).into()),
+                        tab_inactive_background: Some(rgba(0x262f51ff).into()),
+                        tab_active_background: Some(rgba(0x202746ff).into()),
+                        scrollbar_thumb_background: Some(rgba(0xf5f7ff4d).into()),
+                        scrollbar_thumb_hover_background: Some(rgba(0xf5f7ff4d).into()),
+                        scrollbar_thumb_border: Some(rgba(0x252d4fff).into()),
+                        scrollbar_track_border: Some(rgba(0x252d4fff).into()),
+                        editor_foreground: Some(rgba(0xdfe2f1ff).into()),
+                        editor_background: Some(rgba(0x202746ff).into()),
+                        editor_gutter_background: Some(rgba(0x202746ff).into()),
+                        editor_line_number: Some(rgba(0xf5f7ff59).into()),
+                        editor_active_line_number: Some(rgba(0xf5f7ffff).into()),
+                        editor_wrap_guide: Some(rgba(0xf5f7ff0d).into()),
+                        editor_active_wrap_guide: Some(rgba(0xf5f7ff1a).into()),
+                        terminal_background: Some(rgba(0x202746ff).into()),
+                        terminal_ansi_bright_black: Some(rgba(0x697192ff).into()),
+                        terminal_ansi_bright_red: Some(rgba(0x6d2616ff).into()),
+                        terminal_ansi_bright_green: Some(rgba(0x534921ff).into()),
+                        terminal_ansi_bright_yellow: Some(rgba(0x63441eff).into()),
+                        terminal_ansi_bright_blue: Some(rgba(0x274664ff).into()),
+                        terminal_ansi_bright_magenta: Some(rgba(0x4c333dff).into()),
+                        terminal_ansi_bright_cyan: Some(rgba(0x214e5fff).into()),
+                        terminal_ansi_bright_white: Some(rgba(0xf5f7ffff).into()),
+                        terminal_ansi_black: Some(rgba(0x202746ff).into()),
+                        terminal_ansi_red: Some(rgba(0xc94923ff).into()),
+                        terminal_ansi_green: Some(rgba(0xac973aff).into()),
+                        terminal_ansi_yellow: Some(rgba(0xc08b31ff).into()),
+                        terminal_ansi_blue: Some(rgba(0x3e8fd0ff).into()),
+                        terminal_ansi_magenta: Some(rgba(0x9c637aff).into()),
+                        terminal_ansi_cyan: Some(rgba(0x25a2c9ff).into()),
+                        terminal_ansi_white: Some(rgba(0xf5f7ffff).into()),
+                        ..Default::default()
+                    },
+                    status: StatusColorsRefinement {
+                        created: Some(rgba(0xac973aff).into()),
+                        deleted: Some(rgba(0xa33a1eff).into()),
+                        error: Some(rgba(0xc94923ff).into()),
+                        modified: Some(rgba(0xc08b31ff).into()),
+                        success: Some(rgba(0xf5f7ffff).into()),
+                        warning: Some(rgba(0xc08b31ff).into()),
+                        ..Default::default()
+                    },
+                    syntax: Some(UserSyntaxTheme {
+                        highlights: vec![
+                            (
+                                "attribute".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x3e8fd0ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "boolean".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xac973aff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "comment".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x6b7394ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "comment.doc".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x979db4ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "constant".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xac973aff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "constructor".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x3e8fd0ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "embedded".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xf5f7ffff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "emphasis".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x3e8fd0ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "emphasis.strong".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x3e8fd0ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "enum".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xc76b2aff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x3d8fd1ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function.method".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x3d8fd1ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function.special.definition".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xc08b30ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "hint".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x6d82a6ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "keyword".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x6679ccff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "label".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x3e8fd0ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "link_text".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xc76b2aff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "link_uri".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xac973aff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "number".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xc76b29ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "operator".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x979db4ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "predictive".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x58709aff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "preproc".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xf5f7ffff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "primary".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xdfe2f1ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "property".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xc94922ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xdfe2f1ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.bracket".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x979db4ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.delimiter".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x979db4ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.list_marker".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xdfe2f1ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x9c637aff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xac9739ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.escape".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x979db4ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.regex".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x22a2c9ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x9c637aff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.special.symbol".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xac9739ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "tag".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x3e8fd0ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "text.literal".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xc76b2aff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "title".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xf5f7ffff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "type".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xc08b30ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variable".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xdfe2f1ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variable.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x6679ccff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variant".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xc08b30ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                        ],
+                    }),
+                },
+            },
+            UserTheme {
+                name: "Atelier Sulphurpool Light".into(),
+                appearance: Appearance::Light,
+                styles: UserThemeStylesRefinement {
+                    colors: ThemeColorsRefinement {
+                        border: Some(rgba(0x9a9fb6ff).into()),
+                        border_variant: Some(rgba(0x9a9fb6ff).into()),
+                        elevated_surface_background: Some(rgba(0xc2c6d9ff).into()),
+                        background: Some(rgba(0xc2c6d9ff).into()),
+                        panel_background: Some(rgba(0xe5e8f5ff).into()),
+                        element_hover: Some(rgba(0x9a9fb680).into()),
+                        element_selected: Some(rgba(0x8e94aa80).into()),
+                        text: Some(rgba(0x606889ff).into()),
+                        text_muted: Some(rgba(0x898fa5ff).into()),
+                        status_bar_background: Some(rgba(0xc2c6d9ff).into()),
+                        title_bar_background: Some(rgba(0xc2c6d9ff).into()),
+                        toolbar_background: Some(rgba(0xf5f7ffff).into()),
+                        tab_bar_background: Some(rgba(0xe5e8f5ff).into()),
+                        tab_inactive_background: Some(rgba(0xe5e8f5ff).into()),
+                        tab_active_background: Some(rgba(0xf5f7ffff).into()),
+                        scrollbar_thumb_background: Some(rgba(0x2027464d).into()),
+                        scrollbar_thumb_hover_background: Some(rgba(0x2027464d).into()),
+                        scrollbar_thumb_border: Some(rgba(0xe9ebf7ff).into()),
+                        scrollbar_track_border: Some(rgba(0xe9ebf7ff).into()),
+                        editor_foreground: Some(rgba(0x293256ff).into()),
+                        editor_background: Some(rgba(0xf5f7ffff).into()),
+                        editor_gutter_background: Some(rgba(0xf5f7ffff).into()),
+                        editor_line_number: Some(rgba(0x20274659).into()),
+                        editor_active_line_number: Some(rgba(0x202746ff).into()),
+                        editor_wrap_guide: Some(rgba(0x2027460d).into()),
+                        editor_active_wrap_guide: Some(rgba(0x2027461a).into()),
+                        terminal_background: Some(rgba(0xf5f7ffff).into()),
+                        terminal_ansi_bright_black: Some(rgba(0x8b91a7ff).into()),
+                        terminal_ansi_bright_red: Some(rgba(0xefa58cff).into()),
+                        terminal_ansi_bright_green: Some(rgba(0xd9ca9bff).into()),
+                        terminal_ansi_bright_yellow: Some(rgba(0xe5c497ff).into()),
+                        terminal_ansi_bright_blue: Some(rgba(0xa9c6e8ff).into()),
+                        terminal_ansi_bright_magenta: Some(rgba(0xcfafbbff).into()),
+                        terminal_ansi_bright_cyan: Some(rgba(0xa4d0e4ff).into()),
+                        terminal_ansi_bright_white: Some(rgba(0x202746ff).into()),
+                        terminal_ansi_black: Some(rgba(0xf5f7ffff).into()),
+                        terminal_ansi_red: Some(rgba(0xc94a23ff).into()),
+                        terminal_ansi_green: Some(rgba(0xac973aff).into()),
+                        terminal_ansi_yellow: Some(rgba(0xc08b31ff).into()),
+                        terminal_ansi_blue: Some(rgba(0x3f8fd0ff).into()),
+                        terminal_ansi_magenta: Some(rgba(0x9c637aff).into()),
+                        terminal_ansi_cyan: Some(rgba(0x25a2c9ff).into()),
+                        terminal_ansi_white: Some(rgba(0x202746ff).into()),
+                        ..Default::default()
+                    },
+                    status: StatusColorsRefinement {
+                        created: Some(rgba(0xbfab61ff).into()),
+                        deleted: Some(rgba(0xc94a23ff).into()),
+                        error: Some(rgba(0xc94a23ff).into()),
+                        modified: Some(rgba(0xc08b31ff).into()),
+                        success: Some(rgba(0x202746ff).into()),
+                        warning: Some(rgba(0xc08b31ff).into()),
+                        ..Default::default()
+                    },
+                    syntax: Some(UserSyntaxTheme {
+                        highlights: vec![
+                            (
+                                "attribute".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x3f8fd0ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "boolean".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xac973aff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "comment".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x898ea4ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "comment.doc".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x5e6687ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "constant".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xac973aff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "constructor".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x3f8fd0ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "embedded".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x202746ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "emphasis".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x3f8fd0ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "emphasis.strong".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x3f8fd0ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "enum".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xc76b2aff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x3d8fd1ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function.method".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x3d8fd1ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function.special.definition".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xc08b30ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "hint".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7087b2ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "keyword".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x6679ccff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "label".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x3f8fd0ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "link_text".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xc76b2aff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "link_uri".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xac973aff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "number".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xc76b29ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "operator".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x5e6687ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "predictive".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x8599beff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "preproc".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x202746ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "primary".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x293256ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "property".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xc94922ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x293256ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.bracket".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x5e6687ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.delimiter".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x5e6687ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.list_marker".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x293256ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x9c637aff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xac9739ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.escape".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x5e6687ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.regex".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x22a2c9ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x9c637aff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.special.symbol".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xac9739ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "tag".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x3f8fd0ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "text.literal".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xc76b2aff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "title".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x202746ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "type".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xc08b30ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variable".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x293256ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variable.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x6679ccff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variant".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xc08b30ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                        ],
+                    }),
+                },
+            },
+            UserTheme {
+                name: "Atelier Dune Dark".into(),
+                appearance: Appearance::Dark,
+                styles: UserThemeStylesRefinement {
+                    colors: ThemeColorsRefinement {
+                        border: Some(rgba(0x6c695cff).into()),
+                        border_variant: Some(rgba(0x6c695cff).into()),
+                        elevated_surface_background: Some(rgba(0x45433bff).into()),
+                        background: Some(rgba(0x45433bff).into()),
+                        panel_background: Some(rgba(0x262622ff).into()),
+                        element_hover: Some(rgba(0x6c695c80).into()),
+                        element_selected: Some(rgba(0x77746480).into()),
+                        text: Some(rgba(0xa4a08bff).into()),
+                        text_muted: Some(rgba(0x7c7968ff).into()),
+                        status_bar_background: Some(rgba(0x45433bff).into()),
+                        title_bar_background: Some(rgba(0x45433bff).into()),
+                        toolbar_background: Some(rgba(0x20201dff).into()),
+                        tab_bar_background: Some(rgba(0x262622ff).into()),
+                        tab_inactive_background: Some(rgba(0x262622ff).into()),
+                        tab_active_background: Some(rgba(0x20201dff).into()),
+                        scrollbar_thumb_background: Some(rgba(0xfefbec4d).into()),
+                        scrollbar_thumb_hover_background: Some(rgba(0xfefbec4d).into()),
+                        scrollbar_thumb_border: Some(rgba(0x252521ff).into()),
+                        scrollbar_track_border: Some(rgba(0x252521ff).into()),
+                        editor_foreground: Some(rgba(0xe8e4cfff).into()),
+                        editor_background: Some(rgba(0x20201dff).into()),
+                        editor_gutter_background: Some(rgba(0x20201dff).into()),
+                        editor_line_number: Some(rgba(0xfefbec59).into()),
+                        editor_active_line_number: Some(rgba(0xfefbecff).into()),
+                        editor_wrap_guide: Some(rgba(0xfefbec0d).into()),
+                        editor_active_wrap_guide: Some(rgba(0xfefbec1a).into()),
+                        terminal_background: Some(rgba(0x20201dff).into()),
+                        terminal_ansi_bright_black: Some(rgba(0x7a7766ff).into()),
+                        terminal_ansi_bright_red: Some(rgba(0x781c1fff).into()),
+                        terminal_ansi_bright_green: Some(rgba(0x335322ff).into()),
+                        terminal_ansi_bright_yellow: Some(rgba(0x574815ff).into()),
+                        terminal_ansi_bright_blue: Some(rgba(0x334173ff).into()),
+                        terminal_ansi_bright_magenta: Some(rgba(0x721d2bff).into()),
+                        terminal_ansi_bright_cyan: Some(rgba(0x1e5341ff).into()),
+                        terminal_ansi_bright_white: Some(rgba(0xfefbecff).into()),
+                        terminal_ansi_black: Some(rgba(0x20201dff).into()),
+                        terminal_ansi_red: Some(rgba(0xd73837ff).into()),
+                        terminal_ansi_green: Some(rgba(0x60ac3aff).into()),
+                        terminal_ansi_yellow: Some(rgba(0xae9515ff).into()),
+                        terminal_ansi_blue: Some(rgba(0x6684e0ff).into()),
+                        terminal_ansi_magenta: Some(rgba(0xd43652ff).into()),
+                        terminal_ansi_cyan: Some(rgba(0x21ad83ff).into()),
+                        terminal_ansi_white: Some(rgba(0xfefbecff).into()),
+                        ..Default::default()
+                    },
+                    status: StatusColorsRefinement {
+                        created: Some(rgba(0x60ac3aff).into()),
+                        deleted: Some(rgba(0xaf2c2eff).into()),
+                        error: Some(rgba(0xd73837ff).into()),
+                        modified: Some(rgba(0xae9515ff).into()),
+                        success: Some(rgba(0xfefbecff).into()),
+                        warning: Some(rgba(0xae9515ff).into()),
+                        ..Default::default()
+                    },
+                    syntax: Some(UserSyntaxTheme {
+                        highlights: vec![
+                            (
+                                "attribute".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x6684e0ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "boolean".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x60ac3aff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "comment".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7d7a68ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "comment.doc".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xa6a28cff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "constant".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x60ac3aff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "constructor".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x6684e0ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "embedded".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xfefbecff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "emphasis".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x6684e0ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "emphasis.strong".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x6684e0ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "enum".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xb65612ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x6684e1ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function.method".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x6684e1ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function.special.definition".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xae9513ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "hint".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xb17272ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "keyword".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xb854d4ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "label".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x6684e0ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "link_text".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xb65612ff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "link_uri".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x60ac3aff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "number".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xb65611ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "operator".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xa6a28cff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "predictive".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x9c6262ff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "preproc".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xfefbecff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "primary".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xe8e4cfff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "property".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xd73737ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xe8e4cfff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.bracket".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xa6a28cff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.delimiter".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xa6a28cff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.list_marker".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xe8e4cfff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xd43552ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x60ac39ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.escape".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xa6a28cff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.regex".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x1fad83ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xd43552ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.special.symbol".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x60ac39ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "tag".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x6684e0ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "text.literal".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xb65612ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "title".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xfefbecff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "type".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xae9513ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variable".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xe8e4cfff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variable.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xb854d4ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variant".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xae9513ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                        ],
+                    }),
+                },
+            },
+            UserTheme {
+                name: "Atelier Seaside Dark".into(),
+                appearance: Appearance::Dark,
+                styles: UserThemeStylesRefinement {
+                    colors: ThemeColorsRefinement {
+                        border: Some(rgba(0x5c6c5cff).into()),
+                        border_variant: Some(rgba(0x5c6c5cff).into()),
+                        elevated_surface_background: Some(rgba(0x3b453bff).into()),
+                        background: Some(rgba(0x3b453bff).into()),
+                        panel_background: Some(rgba(0x1f231fff).into()),
+                        element_hover: Some(rgba(0x5c6c5c80).into()),
+                        element_selected: Some(rgba(0x64776480).into()),
+                        text: Some(rgba(0x8ba48bff).into()),
+                        text_muted: Some(rgba(0x687c68ff).into()),
+                        status_bar_background: Some(rgba(0x3b453bff).into()),
+                        title_bar_background: Some(rgba(0x3b453bff).into()),
+                        toolbar_background: Some(rgba(0x131513ff).into()),
+                        tab_bar_background: Some(rgba(0x1f231fff).into()),
+                        tab_inactive_background: Some(rgba(0x1f231fff).into()),
+                        tab_active_background: Some(rgba(0x131513ff).into()),
+                        scrollbar_thumb_background: Some(rgba(0xf4fbf44d).into()),
+                        scrollbar_thumb_hover_background: Some(rgba(0xf4fbf44d).into()),
+                        scrollbar_thumb_border: Some(rgba(0x1d201dff).into()),
+                        scrollbar_track_border: Some(rgba(0x1d201dff).into()),
+                        editor_foreground: Some(rgba(0xcfe8cfff).into()),
+                        editor_background: Some(rgba(0x131513ff).into()),
+                        editor_gutter_background: Some(rgba(0x131513ff).into()),
+                        editor_line_number: Some(rgba(0xf4fbf459).into()),
+                        editor_active_line_number: Some(rgba(0xf4fbf4ff).into()),
+                        editor_wrap_guide: Some(rgba(0xf4fbf40d).into()),
+                        editor_active_wrap_guide: Some(rgba(0xf4fbf41a).into()),
+                        terminal_background: Some(rgba(0x131513ff).into()),
+                        terminal_ansi_bright_black: Some(rgba(0x667a66ff).into()),
+                        terminal_ansi_bright_red: Some(rgba(0x840b21ff).into()),
+                        terminal_ansi_bright_green: Some(rgba(0x204f1bff).into()),
+                        terminal_ansi_bright_yellow: Some(rgba(0x4b4a17ff).into()),
+                        terminal_ansi_bright_blue: Some(rgba(0x193385ff).into()),
+                        terminal_ansi_bright_magenta: Some(rgba(0x810e60ff).into()),
+                        terminal_ansi_bright_cyan: Some(rgba(0x1d4a56ff).into()),
+                        terminal_ansi_bright_white: Some(rgba(0xf4fbf4ff).into()),
+                        terminal_ansi_black: Some(rgba(0x131513ff).into()),
+                        terminal_ansi_red: Some(rgba(0xe61c3cff).into()),
+                        terminal_ansi_green: Some(rgba(0x2ba32aff).into()),
+                        terminal_ansi_yellow: Some(rgba(0x98981cff).into()),
+                        terminal_ansi_blue: Some(rgba(0x3e62f4ff).into()),
+                        terminal_ansi_magenta: Some(rgba(0xe61cc3ff).into()),
+                        terminal_ansi_cyan: Some(rgba(0x1c99b3ff).into()),
+                        terminal_ansi_white: Some(rgba(0xf4fbf4ff).into()),
+                        ..Default::default()
+                    },
+                    status: StatusColorsRefinement {
+                        created: Some(rgba(0x2ba32aff).into()),
+                        deleted: Some(rgba(0xbd1331ff).into()),
+                        error: Some(rgba(0xe61c3cff).into()),
+                        modified: Some(rgba(0x98981cff).into()),
+                        success: Some(rgba(0xf4fbf4ff).into()),
+                        warning: Some(rgba(0x98981cff).into()),
+                        ..Default::default()
+                    },
+                    syntax: Some(UserSyntaxTheme {
+                        highlights: vec![
+                            (
+                                "attribute".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x3e62f4ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "boolean".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x2ba32aff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "comment".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x687d68ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "comment.doc".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x8ca68cff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "constant".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x2ba32aff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "constructor".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x3e62f4ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "embedded".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xf4fbf4ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "emphasis".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x3e62f4ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "emphasis.strong".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x3e62f4ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "enum".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x87711eff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x3d62f5ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function.method".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x3d62f5ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function.special.definition".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x98981bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "hint".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x008b9fff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "keyword".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xad2beeff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "label".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x3e62f4ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "link_text".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x87711eff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "link_uri".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x2ba32aff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "number".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x87711dff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "operator".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x8ca68cff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "predictive".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x00788bff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "preproc".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xf4fbf4ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "primary".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xcfe8cfff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "property".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xe6193cff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xcfe8cfff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.bracket".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x8ca68cff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.delimiter".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x8ca68cff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.list_marker".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xcfe8cfff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xe619c3ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x29a329ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.escape".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x8ca68cff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.regex".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x1999b3ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xe619c3ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.special.symbol".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x29a329ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "tag".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x3e62f4ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "text.literal".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x87711eff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "title".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xf4fbf4ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "type".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x98981bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variable".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xcfe8cfff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variable.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xad2beeff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variant".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x98981bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                        ],
+                    }),
+                },
+            },
+            UserTheme {
+                name: "Atelier Cave Light".into(),
+                appearance: Appearance::Light,
+                styles: UserThemeStylesRefinement {
+                    colors: ThemeColorsRefinement {
+                        border: Some(rgba(0x8f8b96ff).into()),
+                        border_variant: Some(rgba(0x8f8b96ff).into()),
+                        elevated_surface_background: Some(rgba(0xbfbcc5ff).into()),
+                        background: Some(rgba(0xbfbcc5ff).into()),
+                        panel_background: Some(rgba(0xe6e3ebff).into()),
+                        element_hover: Some(rgba(0x8f8b9680).into()),
+                        element_selected: Some(rgba(0x837e8b80).into()),
+                        text: Some(rgba(0x5a5462ff).into()),
+                        text_muted: Some(rgba(0x7e7987ff).into()),
+                        status_bar_background: Some(rgba(0xbfbcc5ff).into()),
+                        title_bar_background: Some(rgba(0xbfbcc5ff).into()),
+                        toolbar_background: Some(rgba(0xefecf4ff).into()),
+                        tab_bar_background: Some(rgba(0xe6e3ebff).into()),
+                        tab_inactive_background: Some(rgba(0xe6e3ebff).into()),
+                        tab_active_background: Some(rgba(0xefecf4ff).into()),
+                        scrollbar_thumb_background: Some(rgba(0x19171c4d).into()),
+                        scrollbar_thumb_hover_background: Some(rgba(0x19171c4d).into()),
+                        scrollbar_thumb_border: Some(rgba(0xe8e5edff).into()),
+                        scrollbar_track_border: Some(rgba(0xe8e5edff).into()),
+                        editor_foreground: Some(rgba(0x26232aff).into()),
+                        editor_background: Some(rgba(0xefecf4ff).into()),
+                        editor_gutter_background: Some(rgba(0xefecf4ff).into()),
+                        editor_line_number: Some(rgba(0x19171c59).into()),
+                        editor_active_line_number: Some(rgba(0x19171cff).into()),
+                        editor_wrap_guide: Some(rgba(0x19171c0d).into()),
+                        editor_active_wrap_guide: Some(rgba(0x19171c1a).into()),
+                        terminal_background: Some(rgba(0xefecf4ff).into()),
+                        terminal_ansi_bright_black: Some(rgba(0x807b89ff).into()),
+                        terminal_ansi_bright_red: Some(rgba(0xe3a4b9ff).into()),
+                        terminal_ansi_bright_green: Some(rgba(0x9dc8c8ff).into()),
+                        terminal_ansi_bright_yellow: Some(rgba(0xd4b499ff).into()),
+                        terminal_ansi_bright_blue: Some(rgba(0xb3b3eeff).into()),
+                        terminal_ansi_bright_magenta: Some(rgba(0xe3a4dfff).into()),
+                        terminal_ansi_bright_cyan: Some(rgba(0xa6c4e3ff).into()),
+                        terminal_ansi_bright_white: Some(rgba(0x19171cff).into()),
+                        terminal_ansi_black: Some(rgba(0xefecf4ff).into()),
+                        terminal_ansi_red: Some(rgba(0xbe4778ff).into()),
+                        terminal_ansi_green: Some(rgba(0x2c9292ff).into()),
+                        terminal_ansi_yellow: Some(rgba(0xa06e3cff).into()),
+                        terminal_ansi_blue: Some(rgba(0x586ddaff).into()),
+                        terminal_ansi_magenta: Some(rgba(0xbf41bfff).into()),
+                        terminal_ansi_cyan: Some(rgba(0x3b8bc6ff).into()),
+                        terminal_ansi_white: Some(rgba(0x19171cff).into()),
+                        ..Default::default()
+                    },
+                    status: StatusColorsRefinement {
+                        created: Some(rgba(0x5fa8a7ff).into()),
+                        deleted: Some(rgba(0xbe4778ff).into()),
+                        error: Some(rgba(0xbe4778ff).into()),
+                        modified: Some(rgba(0xa06e3cff).into()),
+                        success: Some(rgba(0x19171cff).into()),
+                        warning: Some(rgba(0xa06e3cff).into()),
+                        ..Default::default()
+                    },
+                    syntax: Some(UserSyntaxTheme {
+                        highlights: vec![
+                            (
+                                "attribute".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x586ddaff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "boolean".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x2c9292ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "comment".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7e7887ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "comment.doc".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x585260ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "constant".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x2c9292ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "constructor".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x586ddaff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "embedded".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x19171cff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "emphasis".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x586ddaff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "emphasis.strong".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x586ddaff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "enum".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xaa583dff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x576ddbff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function.method".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x576ddbff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function.special.definition".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xa06e3bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "hint".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x786e9dff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "keyword".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x955ae7ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "label".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x586ddaff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "link_text".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xaa583dff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "link_uri".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x2c9292ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "number".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xaa573cff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "operator".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x585260ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "predictive".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x887fafff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "preproc".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x19171cff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "primary".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x26232aff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "property".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xbe4678ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x26232aff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.bracket".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x585260ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.delimiter".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x585260ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.list_marker".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x26232aff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xbf40bfff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x2a9292ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.escape".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x585260ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.regex".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x398bc6ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xbf40bfff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.special.symbol".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x2a9292ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "tag".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x586ddaff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "text.literal".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xaa583dff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "title".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x19171cff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "type".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xa06e3bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variable".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x26232aff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variable.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x955ae7ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variant".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xa06e3bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                        ],
+                    }),
+                },
+            },
+            UserTheme {
+                name: "Atelier Plateau Dark".into(),
+                appearance: Appearance::Dark,
+                styles: UserThemeStylesRefinement {
+                    colors: ThemeColorsRefinement {
+                        border: Some(rgba(0x564e4eff).into()),
+                        border_variant: Some(rgba(0x564e4eff).into()),
+                        elevated_surface_background: Some(rgba(0x3b3535ff).into()),
+                        background: Some(rgba(0x3b3535ff).into()),
+                        panel_background: Some(rgba(0x252020ff).into()),
+                        element_hover: Some(rgba(0x564e4e80).into()),
+                        element_selected: Some(rgba(0x60585880).into()),
+                        text: Some(rgba(0x898383ff).into()),
+                        text_muted: Some(rgba(0x655d5dff).into()),
+                        status_bar_background: Some(rgba(0x3b3535ff).into()),
+                        title_bar_background: Some(rgba(0x3b3535ff).into()),
+                        toolbar_background: Some(rgba(0x1b1818ff).into()),
+                        tab_bar_background: Some(rgba(0x252020ff).into()),
+                        tab_inactive_background: Some(rgba(0x252020ff).into()),
+                        tab_active_background: Some(rgba(0x1b1818ff).into()),
+                        scrollbar_thumb_background: Some(rgba(0xf4ecec4d).into()),
+                        scrollbar_thumb_hover_background: Some(rgba(0xf4ecec4d).into()),
+                        scrollbar_thumb_border: Some(rgba(0x231f1fff).into()),
+                        scrollbar_track_border: Some(rgba(0x231f1fff).into()),
+                        editor_foreground: Some(rgba(0xe7dfdfff).into()),
+                        editor_background: Some(rgba(0x1b1818ff).into()),
+                        editor_gutter_background: Some(rgba(0x1b1818ff).into()),
+                        editor_line_number: Some(rgba(0xf4ecec59).into()),
+                        editor_active_line_number: Some(rgba(0xf4ececff).into()),
+                        editor_wrap_guide: Some(rgba(0xf4ecec0d).into()),
+                        editor_active_wrap_guide: Some(rgba(0xf4ecec1a).into()),
+                        terminal_background: Some(rgba(0x1b1818ff).into()),
+                        terminal_ansi_bright_black: Some(rgba(0x635b5bff).into()),
+                        terminal_ansi_bright_red: Some(rgba(0x692727ff).into()),
+                        terminal_ansi_bright_green: Some(rgba(0x2a4444ff).into()),
+                        terminal_ansi_bright_yellow: Some(rgba(0x4e3821ff).into()),
+                        terminal_ansi_bright_blue: Some(rgba(0x3b3960ff).into()),
+                        terminal_ansi_bright_magenta: Some(rgba(0x5b2c42ff).into()),
+                        terminal_ansi_bright_cyan: Some(rgba(0x2e4257ff).into()),
+                        terminal_ansi_bright_white: Some(rgba(0xf4ececff).into()),
+                        terminal_ansi_black: Some(rgba(0x1b1818ff).into()),
+                        terminal_ansi_red: Some(rgba(0xca4949ff).into()),
+                        terminal_ansi_green: Some(rgba(0x4b8b8bff).into()),
+                        terminal_ansi_yellow: Some(rgba(0xa06e3bff).into()),
+                        terminal_ansi_blue: Some(rgba(0x7272caff).into()),
+                        terminal_ansi_magenta: Some(rgba(0xbd5187ff).into()),
+                        terminal_ansi_cyan: Some(rgba(0x5485b6ff).into()),
+                        terminal_ansi_white: Some(rgba(0xf4ececff).into()),
+                        ..Default::default()
+                    },
+                    status: StatusColorsRefinement {
+                        created: Some(rgba(0x4b8b8bff).into()),
+                        deleted: Some(rgba(0xa23b3bff).into()),
+                        error: Some(rgba(0xca4949ff).into()),
+                        modified: Some(rgba(0xa06e3bff).into()),
+                        success: Some(rgba(0xf4ececff).into()),
+                        warning: Some(rgba(0xa06e3bff).into()),
+                        ..Default::default()
+                    },
+                    syntax: Some(UserSyntaxTheme {
+                        highlights: vec![
+                            (
+                                "attribute".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7272caff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "boolean".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x4b8b8bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "comment".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x655d5dff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "comment.doc".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x8a8585ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "constant".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x4b8b8bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "constructor".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7272caff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "embedded".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xf4ececff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "emphasis".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7272caff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "emphasis.strong".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7272caff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "enum".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xb45a3cff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7272caff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function.method".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7272caff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function.special.definition".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xa06e3bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "hint".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x8a647aff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "keyword".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x8464c4ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "label".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7272caff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "link_text".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xb45a3cff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "link_uri".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x4b8b8bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "number".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xb45a3cff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "operator".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x8a8585ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "predictive".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x795369ff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "preproc".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xf4ececff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "primary".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xe7dfdfff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "property".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xca4949ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xe7dfdfff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.bracket".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x8a8585ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.delimiter".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x8a8585ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.list_marker".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xe7dfdfff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xbd5187ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x4b8b8bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.escape".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x8a8585ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.regex".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x5485b6ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xbd5187ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.special.symbol".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x4b8b8bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "tag".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7272caff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "text.literal".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xb45a3cff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "title".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xf4ececff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "type".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xa06e3bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variable".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xe7dfdfff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variable.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x8464c4ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variant".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xa06e3bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                        ],
+                    }),
+                },
+            },
+            UserTheme {
+                name: "Atelier Heath Dark".into(),
+                appearance: Appearance::Dark,
+                styles: UserThemeStylesRefinement {
+                    colors: ThemeColorsRefinement {
+                        border: Some(rgba(0x675b67ff).into()),
+                        border_variant: Some(rgba(0x675b67ff).into()),
+                        elevated_surface_background: Some(rgba(0x433a43ff).into()),
+                        background: Some(rgba(0x433a43ff).into()),
+                        panel_background: Some(rgba(0x252025ff).into()),
+                        element_hover: Some(rgba(0x675b6780).into()),
+                        element_selected: Some(rgba(0x72647280).into()),
+                        text: Some(rgba(0xa99aa9ff).into()),
+                        text_muted: Some(rgba(0x776977ff).into()),
+                        status_bar_background: Some(rgba(0x433a43ff).into()),
+                        title_bar_background: Some(rgba(0x433a43ff).into()),
+                        toolbar_background: Some(rgba(0x1b181bff).into()),
+                        tab_bar_background: Some(rgba(0x252025ff).into()),
+                        tab_inactive_background: Some(rgba(0x252025ff).into()),
+                        tab_active_background: Some(rgba(0x1b181bff).into()),
+                        scrollbar_thumb_background: Some(rgba(0xf7f3f74d).into()),
+                        scrollbar_thumb_hover_background: Some(rgba(0xf7f3f74d).into()),
+                        scrollbar_thumb_border: Some(rgba(0x231e23ff).into()),
+                        scrollbar_track_border: Some(rgba(0x231e23ff).into()),
+                        editor_foreground: Some(rgba(0xd8cad8ff).into()),
+                        editor_background: Some(rgba(0x1b181bff).into()),
+                        editor_gutter_background: Some(rgba(0x1b181bff).into()),
+                        editor_line_number: Some(rgba(0xf7f3f759).into()),
+                        editor_active_line_number: Some(rgba(0xf7f3f7ff).into()),
+                        editor_wrap_guide: Some(rgba(0xf7f3f70d).into()),
+                        editor_active_wrap_guide: Some(rgba(0xf7f3f71a).into()),
+                        terminal_background: Some(rgba(0x1b181bff).into()),
+                        terminal_ansi_bright_black: Some(rgba(0x756775ff).into()),
+                        terminal_ansi_bright_red: Some(rgba(0x6d221aff).into()),
+                        terminal_ansi_bright_green: Some(rgba(0x474422ff).into()),
+                        terminal_ansi_bright_yellow: Some(rgba(0x5e441fff).into()),
+                        terminal_ansi_bright_blue: Some(rgba(0x26367eff).into()),
+                        terminal_ansi_bright_magenta: Some(rgba(0x6c1e67ff).into()),
+                        terminal_ansi_bright_cyan: Some(rgba(0x1a4848ff).into()),
+                        terminal_ansi_bright_white: Some(rgba(0xf7f3f7ff).into()),
+                        terminal_ansi_black: Some(rgba(0x1b181bff).into()),
+                        terminal_ansi_red: Some(rgba(0xca402cff).into()),
+                        terminal_ansi_green: Some(rgba(0x918b3bff).into()),
+                        terminal_ansi_yellow: Some(rgba(0xbb8a36ff).into()),
+                        terminal_ansi_blue: Some(rgba(0x526aebff).into()),
+                        terminal_ansi_magenta: Some(rgba(0xcc34ccff).into()),
+                        terminal_ansi_cyan: Some(rgba(0x189393ff).into()),
+                        terminal_ansi_white: Some(rgba(0xf7f3f7ff).into()),
+                        ..Default::default()
+                    },
+                    status: StatusColorsRefinement {
+                        created: Some(rgba(0x918b3bff).into()),
+                        deleted: Some(rgba(0xa43424ff).into()),
+                        error: Some(rgba(0xca402cff).into()),
+                        modified: Some(rgba(0xbb8a36ff).into()),
+                        success: Some(rgba(0xf7f3f7ff).into()),
+                        warning: Some(rgba(0xbb8a36ff).into()),
+                        ..Default::default()
+                    },
+                    syntax: Some(UserSyntaxTheme {
+                        highlights: vec![
+                            (
+                                "attribute".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x526aebff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "boolean".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x918b3bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "comment".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x776977ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "comment.doc".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xab9babff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "constant".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x918b3bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "constructor".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x526aebff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "embedded".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xf7f3f7ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "emphasis".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x526aebff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "emphasis.strong".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x526aebff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "enum".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xa65927ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x516aecff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function.method".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x516aecff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function.special.definition".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xbb8a35ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "hint".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x8d70a8ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "keyword".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7b59c0ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "label".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x526aebff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "link_text".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xa65927ff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "link_uri".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x918b3bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "number".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xa65926ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "operator".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xab9babff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "predictive".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x765990ff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "preproc".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xf7f3f7ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "primary".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xd8cad8ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "property".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xca402bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xd8cad8ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.bracket".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xab9babff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.delimiter".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xab9babff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.list_marker".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xd8cad8ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xcc33ccff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x918b3bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.escape".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xab9babff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.regex".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x159393ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xcc33ccff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.special.symbol".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x918b3bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "tag".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x526aebff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "text.literal".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xa65927ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "title".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xf7f3f7ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "type".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xbb8a35ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variable".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xd8cad8ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variable.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7b59c0ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variant".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xbb8a35ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                        ],
+                    }),
+                },
+            },
+            UserTheme {
+                name: "Atelier Lakeside Dark".into(),
+                appearance: Appearance::Dark,
+                styles: UserThemeStylesRefinement {
+                    colors: ThemeColorsRefinement {
+                        border: Some(rgba(0x4f6b78ff).into()),
+                        border_variant: Some(rgba(0x4f6b78ff).into()),
+                        elevated_surface_background: Some(rgba(0x33444dff).into()),
+                        background: Some(rgba(0x33444dff).into()),
+                        panel_background: Some(rgba(0x1c2529ff).into()),
+                        element_hover: Some(rgba(0x4f6b7880).into()),
+                        element_selected: Some(rgba(0x57768580).into()),
+                        text: Some(rgba(0x7ca0b3ff).into()),
+                        text_muted: Some(rgba(0x5a7b8bff).into()),
+                        status_bar_background: Some(rgba(0x33444dff).into()),
+                        title_bar_background: Some(rgba(0x33444dff).into()),
+                        toolbar_background: Some(rgba(0x161b1dff).into()),
+                        tab_bar_background: Some(rgba(0x1c2529ff).into()),
+                        tab_inactive_background: Some(rgba(0x1c2529ff).into()),
+                        tab_active_background: Some(rgba(0x161b1dff).into()),
+                        scrollbar_thumb_background: Some(rgba(0xebf8ff4d).into()),
+                        scrollbar_thumb_hover_background: Some(rgba(0xebf8ff4d).into()),
+                        scrollbar_thumb_border: Some(rgba(0x1b2327ff).into()),
+                        scrollbar_track_border: Some(rgba(0x1b2327ff).into()),
+                        editor_foreground: Some(rgba(0xc1e4f6ff).into()),
+                        editor_background: Some(rgba(0x161b1dff).into()),
+                        editor_gutter_background: Some(rgba(0x161b1dff).into()),
+                        editor_line_number: Some(rgba(0xebf8ff59).into()),
+                        editor_active_line_number: Some(rgba(0xebf8ffff).into()),
+                        editor_wrap_guide: Some(rgba(0xebf8ff0d).into()),
+                        editor_active_wrap_guide: Some(rgba(0xebf8ff1a).into()),
+                        terminal_background: Some(rgba(0x161b1dff).into()),
+                        terminal_ansi_bright_black: Some(rgba(0x587989ff).into()),
+                        terminal_ansi_bright_red: Some(rgba(0x6f1c3aff).into()),
+                        terminal_ansi_bright_green: Some(rgba(0x2e4522ff).into()),
+                        terminal_ansi_bright_yellow: Some(rgba(0x454413ff).into()),
+                        terminal_ansi_bright_blue: Some(rgba(0x1e3f53ff).into()),
+                        terminal_ansi_bright_magenta: Some(rgba(0x5c1e6bff).into()),
+                        terminal_ansi_bright_cyan: Some(rgba(0x1f4638ff).into()),
+                        terminal_ansi_bright_white: Some(rgba(0xebf8ffff).into()),
+                        terminal_ansi_black: Some(rgba(0x161b1dff).into()),
+                        terminal_ansi_red: Some(rgba(0xd22e72ff).into()),
+                        terminal_ansi_green: Some(rgba(0x568c3bff).into()),
+                        terminal_ansi_yellow: Some(rgba(0x8a8a11ff).into()),
+                        terminal_ansi_blue: Some(rgba(0x277fadff).into()),
+                        terminal_ansi_magenta: Some(rgba(0xb72ed2ff).into()),
+                        terminal_ansi_cyan: Some(rgba(0x2e8f6fff).into()),
+                        terminal_ansi_white: Some(rgba(0xebf8ffff).into()),
+                        ..Default::default()
+                    },
+                    status: StatusColorsRefinement {
+                        created: Some(rgba(0x568c3bff).into()),
+                        deleted: Some(rgba(0xa9275aff).into()),
+                        error: Some(rgba(0xd22e72ff).into()),
+                        modified: Some(rgba(0x8a8a11ff).into()),
+                        success: Some(rgba(0xebf8ffff).into()),
+                        warning: Some(rgba(0x8a8a11ff).into()),
+                        ..Default::default()
+                    },
+                    syntax: Some(UserSyntaxTheme {
+                        highlights: vec![
+                            (
+                                "attribute".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x277fadff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "boolean".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x568c3bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "comment".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x5a7b8cff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "comment.doc".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7ea2b4ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "constant".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x568c3bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "constructor".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x277fadff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "embedded".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xebf8ffff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "emphasis".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x277fadff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "emphasis.strong".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x277fadff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "enum".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x935c26ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x257fadff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function.method".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x257fadff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function.special.definition".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x8a8a0fff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "hint".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x52809aff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "keyword".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x6b6bb8ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "label".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x277fadff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "link_text".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x935c26ff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "link_uri".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x568c3bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "number".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x935c25ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "operator".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7ea2b4ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "predictive".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x427088ff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "preproc".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xebf8ffff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "primary".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xc1e4f6ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "property".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xd22d72ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xc1e4f6ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.bracket".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7ea2b4ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.delimiter".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7ea2b4ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.list_marker".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xc1e4f6ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xb72dd2ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x568c3bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.escape".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7ea2b4ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.regex".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x2d8f6fff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xb72dd2ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.special.symbol".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x568c3bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "tag".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x277fadff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "text.literal".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x935c26ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "title".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xebf8ffff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "type".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x8a8a0fff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variable".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xc1e4f6ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variable.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x6b6bb8ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variant".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x8a8a0fff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                        ],
+                    }),
+                },
+            },
+            UserTheme {
+                name: "Atelier Forest Light".into(),
+                appearance: Appearance::Light,
+                styles: UserThemeStylesRefinement {
+                    colors: ThemeColorsRefinement {
+                        border: Some(rgba(0xaaa3a1ff).into()),
+                        border_variant: Some(rgba(0xaaa3a1ff).into()),
+                        elevated_surface_background: Some(rgba(0xcdc8c6ff).into()),
+                        background: Some(rgba(0xcdc8c6ff).into()),
+                        panel_background: Some(rgba(0xe9e6e4ff).into()),
+                        element_hover: Some(rgba(0xaaa3a180).into()),
+                        element_selected: Some(rgba(0xa1999680).into()),
+                        text: Some(rgba(0x6a6360ff).into()),
+                        text_muted: Some(rgba(0x9c9491ff).into()),
+                        status_bar_background: Some(rgba(0xcdc8c6ff).into()),
+                        title_bar_background: Some(rgba(0xcdc8c6ff).into()),
+                        toolbar_background: Some(rgba(0xf1efeeff).into()),
+                        tab_bar_background: Some(rgba(0xe9e6e4ff).into()),
+                        tab_inactive_background: Some(rgba(0xe9e6e4ff).into()),
+                        tab_active_background: Some(rgba(0xf1efeeff).into()),
+                        scrollbar_thumb_background: Some(rgba(0x1b19184d).into()),
+                        scrollbar_thumb_hover_background: Some(rgba(0x1b19184d).into()),
+                        scrollbar_thumb_border: Some(rgba(0xebe8e6ff).into()),
+                        scrollbar_track_border: Some(rgba(0xebe8e6ff).into()),
+                        editor_foreground: Some(rgba(0x2c2421ff).into()),
+                        editor_background: Some(rgba(0xf1efeeff).into()),
+                        editor_gutter_background: Some(rgba(0xf1efeeff).into()),
+                        editor_line_number: Some(rgba(0x1b191859).into()),
+                        editor_active_line_number: Some(rgba(0x1b1918ff).into()),
+                        editor_wrap_guide: Some(rgba(0x1b19180d).into()),
+                        editor_active_wrap_guide: Some(rgba(0x1b19181a).into()),
+                        terminal_background: Some(rgba(0xf1efeeff).into()),
+                        terminal_ansi_bright_black: Some(rgba(0x9e9693ff).into()),
+                        terminal_ansi_bright_red: Some(rgba(0xffa29aff).into()),
+                        terminal_ansi_bright_green: Some(rgba(0xbfca93ff).into()),
+                        terminal_ansi_bright_yellow: Some(rgba(0xe9c08eff).into()),
+                        terminal_ansi_bright_blue: Some(rgba(0xaebcf4ff).into()),
+                        terminal_ansi_bright_magenta: Some(rgba(0xe7a6fbff).into()),
+                        terminal_ansi_bright_cyan: Some(rgba(0xa6cadbff).into()),
+                        terminal_ansi_bright_white: Some(rgba(0x1b1918ff).into()),
+                        terminal_ansi_black: Some(rgba(0xf1efeeff).into()),
+                        terminal_ansi_red: Some(rgba(0xf22e41ff).into()),
+                        terminal_ansi_green: Some(rgba(0x7b9728ff).into()),
+                        terminal_ansi_yellow: Some(rgba(0xc3841aff).into()),
+                        terminal_ansi_blue: Some(rgba(0x417ee6ff).into()),
+                        terminal_ansi_magenta: Some(rgba(0xc340f2ff).into()),
+                        terminal_ansi_cyan: Some(rgba(0x3f97b8ff).into()),
+                        terminal_ansi_white: Some(rgba(0x1b1918ff).into()),
+                        ..Default::default()
+                    },
+                    status: StatusColorsRefinement {
+                        created: Some(rgba(0x97ab54ff).into()),
+                        deleted: Some(rgba(0xf22e41ff).into()),
+                        error: Some(rgba(0xf22e41ff).into()),
+                        modified: Some(rgba(0xc3841aff).into()),
+                        success: Some(rgba(0x1b1918ff).into()),
+                        warning: Some(rgba(0xc3841aff).into()),
+                        ..Default::default()
+                    },
+                    syntax: Some(UserSyntaxTheme {
+                        highlights: vec![
+                            (
+                                "attribute".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x417ee6ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "boolean".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7b9728ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "comment".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x9c9491ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "comment.doc".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x68615eff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "constant".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7b9728ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "constructor".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x417ee6ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "embedded".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x1b1918ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "emphasis".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x417ee6ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "emphasis.strong".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x417ee6ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "enum".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xdf5421ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x407ee7ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function.method".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x407ee7ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function.special.definition".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xc38418ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "hint".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xa67287ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "keyword".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x6666eaff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "label".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x417ee6ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "link_text".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xdf5421ff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "link_uri".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7b9728ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "number".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xdf5320ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "operator".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x68615eff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "predictive".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xbe899eff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "preproc".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x1b1918ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "primary".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x2c2421ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "property".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xf22c40ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x2c2421ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.bracket".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x68615eff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.delimiter".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x68615eff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.list_marker".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x2c2421ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xc33ff3ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7b9726ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.escape".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x68615eff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.regex".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x3d97b8ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xc33ff3ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.special.symbol".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7b9726ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "tag".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x417ee6ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "text.literal".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xdf5421ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "title".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x1b1918ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "type".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xc38418ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variable".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x2c2421ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variable.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x6666eaff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variant".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xc38418ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                        ],
+                    }),
+                },
+            },
+            UserTheme {
+                name: "Atelier Dune Light".into(),
+                appearance: Appearance::Light,
+                styles: UserThemeStylesRefinement {
+                    colors: ThemeColorsRefinement {
+                        border: Some(rgba(0xa8a48eff).into()),
+                        border_variant: Some(rgba(0xa8a48eff).into()),
+                        elevated_surface_background: Some(rgba(0xcecab4ff).into()),
+                        background: Some(rgba(0xcecab4ff).into()),
+                        panel_background: Some(rgba(0xeeebd7ff).into()),
+                        element_hover: Some(rgba(0xa8a48e80).into()),
+                        element_selected: Some(rgba(0x9e9a8580).into()),
+                        text: Some(rgba(0x706d5fff).into()),
+                        text_muted: Some(rgba(0x999580ff).into()),
+                        status_bar_background: Some(rgba(0xcecab4ff).into()),
+                        title_bar_background: Some(rgba(0xcecab4ff).into()),
+                        toolbar_background: Some(rgba(0xfefbecff).into()),
+                        tab_bar_background: Some(rgba(0xeeebd7ff).into()),
+                        tab_inactive_background: Some(rgba(0xeeebd7ff).into()),
+                        tab_active_background: Some(rgba(0xfefbecff).into()),
+                        scrollbar_thumb_background: Some(rgba(0x20201d4d).into()),
+                        scrollbar_thumb_hover_background: Some(rgba(0x20201d4d).into()),
+                        scrollbar_thumb_border: Some(rgba(0xf2eedcff).into()),
+                        scrollbar_track_border: Some(rgba(0xf2eedcff).into()),
+                        editor_foreground: Some(rgba(0x292824ff).into()),
+                        editor_background: Some(rgba(0xfefbecff).into()),
+                        editor_gutter_background: Some(rgba(0xfefbecff).into()),
+                        editor_line_number: Some(rgba(0x20201d59).into()),
+                        editor_active_line_number: Some(rgba(0x20201dff).into()),
+                        editor_wrap_guide: Some(rgba(0x20201d0d).into()),
+                        editor_active_wrap_guide: Some(rgba(0x20201d1a).into()),
+                        terminal_background: Some(rgba(0xfefbecff).into()),
+                        terminal_ansi_bright_black: Some(rgba(0x9b9782ff).into()),
+                        terminal_ansi_bright_red: Some(rgba(0xf7a195ff).into()),
+                        terminal_ansi_bright_green: Some(rgba(0xb3d69cff).into()),
+                        terminal_ansi_bright_yellow: Some(rgba(0xdcc98eff).into()),
+                        terminal_ansi_bright_blue: Some(rgba(0xb8c0f1ff).into()),
+                        terminal_ansi_bright_magenta: Some(rgba(0xf3a0a4ff).into()),
+                        terminal_ansi_bright_cyan: Some(rgba(0x9ed7c0ff).into()),
+                        terminal_ansi_bright_white: Some(rgba(0x20201dff).into()),
+                        terminal_ansi_black: Some(rgba(0xfefbecff).into()),
+                        terminal_ansi_red: Some(rgba(0xd73838ff).into()),
+                        terminal_ansi_green: Some(rgba(0x61ac3aff).into()),
+                        terminal_ansi_yellow: Some(rgba(0xae9515ff).into()),
+                        terminal_ansi_blue: Some(rgba(0x6784e0ff).into()),
+                        terminal_ansi_magenta: Some(rgba(0xd43753ff).into()),
+                        terminal_ansi_cyan: Some(rgba(0x22ad83ff).into()),
+                        terminal_ansi_white: Some(rgba(0x20201dff).into()),
+                        ..Default::default()
+                    },
+                    status: StatusColorsRefinement {
+                        created: Some(rgba(0x83bd62ff).into()),
+                        deleted: Some(rgba(0xd73838ff).into()),
+                        error: Some(rgba(0xd73838ff).into()),
+                        modified: Some(rgba(0xae9515ff).into()),
+                        success: Some(rgba(0x20201dff).into()),
+                        warning: Some(rgba(0xae9515ff).into()),
+                        ..Default::default()
+                    },
+                    syntax: Some(UserSyntaxTheme {
+                        highlights: vec![
+                            (
+                                "attribute".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x6784e0ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "boolean".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x61ac3aff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "comment".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x999580ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "comment.doc".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x6e6b5eff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "constant".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x61ac3aff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "constructor".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x6784e0ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "embedded".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x20201dff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "emphasis".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x6784e0ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "emphasis.strong".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x6784e0ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "enum".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xb65713ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x6684e1ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function.method".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x6684e1ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function.special.definition".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xae9513ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "hint".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xb37979ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "keyword".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xb854d4ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "label".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x6784e0ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "link_text".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xb65713ff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "link_uri".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x61ac3aff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "number".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xb65611ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "operator".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x6e6b5eff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "predictive".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xc88a8aff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "preproc".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x20201dff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "primary".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x292824ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "property".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xd73737ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x292824ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.bracket".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x6e6b5eff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.delimiter".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x6e6b5eff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.list_marker".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x292824ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xd43552ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x60ac39ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.escape".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x6e6b5eff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.regex".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x1fad83ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xd43552ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.special.symbol".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x60ac39ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "tag".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x6784e0ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "text.literal".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xb65713ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "title".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x20201dff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "type".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xae9513ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variable".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x292824ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variable.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xb854d4ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variant".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xae9513ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                        ],
+                    }),
+                },
+            },
+            UserTheme {
+                name: "Atelier Plateau Light".into(),
+                appearance: Appearance::Light,
+                styles: UserThemeStylesRefinement {
+                    colors: ThemeColorsRefinement {
+                        border: Some(rgba(0x8e8989ff).into()),
+                        border_variant: Some(rgba(0x8e8989ff).into()),
+                        elevated_surface_background: Some(rgba(0xc1bbbbff).into()),
+                        background: Some(rgba(0xc1bbbbff).into()),
+                        panel_background: Some(rgba(0xebe3e3ff).into()),
+                        element_hover: Some(rgba(0x8e898980).into()),
+                        element_selected: Some(rgba(0x837c7c80).into()),
+                        text: Some(rgba(0x5a5252ff).into()),
+                        text_muted: Some(rgba(0x7e7777ff).into()),
+                        status_bar_background: Some(rgba(0xc1bbbbff).into()),
+                        title_bar_background: Some(rgba(0xc1bbbbff).into()),
+                        toolbar_background: Some(rgba(0xf4ececff).into()),
+                        tab_bar_background: Some(rgba(0xebe3e3ff).into()),
+                        tab_inactive_background: Some(rgba(0xebe3e3ff).into()),
+                        tab_active_background: Some(rgba(0xf4ececff).into()),
+                        scrollbar_thumb_background: Some(rgba(0x1b18184d).into()),
+                        scrollbar_thumb_hover_background: Some(rgba(0x1b18184d).into()),
+                        scrollbar_thumb_border: Some(rgba(0xede5e5ff).into()),
+                        scrollbar_track_border: Some(rgba(0xede5e5ff).into()),
+                        editor_foreground: Some(rgba(0x292424ff).into()),
+                        editor_background: Some(rgba(0xf4ececff).into()),
+                        editor_gutter_background: Some(rgba(0xf4ececff).into()),
+                        editor_line_number: Some(rgba(0x1b181859).into()),
+                        editor_active_line_number: Some(rgba(0x1b1818ff).into()),
+                        editor_wrap_guide: Some(rgba(0x1b18180d).into()),
+                        editor_active_wrap_guide: Some(rgba(0x1b18181a).into()),
+                        terminal_background: Some(rgba(0xf4ececff).into()),
+                        terminal_ansi_bright_black: Some(rgba(0x807979ff).into()),
+                        terminal_ansi_bright_red: Some(rgba(0xeda69fff).into()),
+                        terminal_ansi_bright_green: Some(rgba(0xa6c4c4ff).into()),
+                        terminal_ansi_bright_yellow: Some(rgba(0xd4b499ff).into()),
+                        terminal_ansi_bright_blue: Some(rgba(0xbbb6e5ff).into()),
+                        terminal_ansi_bright_magenta: Some(rgba(0xe2a9c2ff).into()),
+                        terminal_ansi_bright_cyan: Some(rgba(0xacc0daff).into()),
+                        terminal_ansi_bright_white: Some(rgba(0x1b1818ff).into()),
+                        terminal_ansi_black: Some(rgba(0xf4ececff).into()),
+                        terminal_ansi_red: Some(rgba(0xca4a4aff).into()),
+                        terminal_ansi_green: Some(rgba(0x4c8b8bff).into()),
+                        terminal_ansi_yellow: Some(rgba(0xa06e3cff).into()),
+                        terminal_ansi_blue: Some(rgba(0x7372caff).into()),
+                        terminal_ansi_magenta: Some(rgba(0xbd5287ff).into()),
+                        terminal_ansi_cyan: Some(rgba(0x5585b6ff).into()),
+                        terminal_ansi_white: Some(rgba(0x1b1818ff).into()),
+                        ..Default::default()
+                    },
+                    status: StatusColorsRefinement {
+                        created: Some(rgba(0x70a2a1ff).into()),
+                        deleted: Some(rgba(0xca4a4aff).into()),
+                        error: Some(rgba(0xca4a4aff).into()),
+                        modified: Some(rgba(0xa06e3cff).into()),
+                        success: Some(rgba(0x1b1818ff).into()),
+                        warning: Some(rgba(0xa06e3cff).into()),
+                        ..Default::default()
+                    },
+                    syntax: Some(UserSyntaxTheme {
+                        highlights: vec![
+                            (
+                                "attribute".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7372caff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "boolean".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x4c8b8bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "comment".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7e7777ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "comment.doc".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x585050ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "constant".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x4c8b8bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "constructor".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7372caff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "embedded".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x1b1818ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "emphasis".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7372caff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "emphasis.strong".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7372caff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "enum".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xb45b3dff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7272caff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function.method".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7272caff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function.special.definition".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xa06e3bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "hint".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x916a80ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "keyword".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x8464c4ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "label".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7372caff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "link_text".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xb45b3dff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "link_uri".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x4c8b8bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "number".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xb45a3cff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "operator".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x585050ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "predictive".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xa27a91ff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "preproc".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x1b1818ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "primary".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x292424ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "property".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xca4949ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x292424ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.bracket".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x585050ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.delimiter".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x585050ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.list_marker".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x292424ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xbd5187ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x4b8b8bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.escape".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x585050ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.regex".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x5485b6ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xbd5187ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.special.symbol".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x4b8b8bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "tag".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7372caff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "text.literal".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xb45b3dff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "title".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x1b1818ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "type".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xa06e3bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variable".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x292424ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variable.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x8464c4ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variant".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xa06e3bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                        ],
+                    }),
+                },
+            },
+            UserTheme {
+                name: "Atelier Seaside Light".into(),
+                appearance: Appearance::Light,
+                styles: UserThemeStylesRefinement {
+                    colors: ThemeColorsRefinement {
+                        border: Some(rgba(0x8ea88eff).into()),
+                        border_variant: Some(rgba(0x8ea88eff).into()),
+                        elevated_surface_background: Some(rgba(0xb4ceb4ff).into()),
+                        background: Some(rgba(0xb4ceb4ff).into()),
+                        panel_background: Some(rgba(0xdaeedaff).into()),
+                        element_hover: Some(rgba(0x8ea88e80).into()),
+                        element_selected: Some(rgba(0x859e8580).into()),
+                        text: Some(rgba(0x5f705fff).into()),
+                        text_muted: Some(rgba(0x809980ff).into()),
+                        status_bar_background: Some(rgba(0xb4ceb4ff).into()),
+                        title_bar_background: Some(rgba(0xb4ceb4ff).into()),
+                        toolbar_background: Some(rgba(0xf4fbf4ff).into()),
+                        tab_bar_background: Some(rgba(0xdaeedaff).into()),
+                        tab_inactive_background: Some(rgba(0xdaeedaff).into()),
+                        tab_active_background: Some(rgba(0xf4fbf4ff).into()),
+                        scrollbar_thumb_background: Some(rgba(0x1315134d).into()),
+                        scrollbar_thumb_hover_background: Some(rgba(0x1315134d).into()),
+                        scrollbar_thumb_border: Some(rgba(0xdff0dfff).into()),
+                        scrollbar_track_border: Some(rgba(0xdff0dfff).into()),
+                        editor_foreground: Some(rgba(0x242924ff).into()),
+                        editor_background: Some(rgba(0xf4fbf4ff).into()),
+                        editor_gutter_background: Some(rgba(0xf4fbf4ff).into()),
+                        editor_line_number: Some(rgba(0x13151359).into()),
+                        editor_active_line_number: Some(rgba(0x131513ff).into()),
+                        editor_wrap_guide: Some(rgba(0x1315130d).into()),
+                        editor_active_wrap_guide: Some(rgba(0x1315131a).into()),
+                        terminal_background: Some(rgba(0xf4fbf4ff).into()),
+                        terminal_ansi_bright_black: Some(rgba(0x829b82ff).into()),
+                        terminal_ansi_bright_red: Some(rgba(0xff9d98ff).into()),
+                        terminal_ansi_bright_green: Some(rgba(0xa0d294ff).into()),
+                        terminal_ansi_bright_yellow: Some(rgba(0xd0ca90ff).into()),
+                        terminal_ansi_bright_blue: Some(rgba(0xb1adfcff).into()),
+                        terminal_ansi_bright_magenta: Some(rgba(0xf9a1e1ff).into()),
+                        terminal_ansi_bright_cyan: Some(rgba(0x9fccd9ff).into()),
+                        terminal_ansi_bright_white: Some(rgba(0x131513ff).into()),
+                        terminal_ansi_black: Some(rgba(0xf4fbf4ff).into()),
+                        terminal_ansi_red: Some(rgba(0xe61c3dff).into()),
+                        terminal_ansi_green: Some(rgba(0x2ba32bff).into()),
+                        terminal_ansi_yellow: Some(rgba(0x98981dff).into()),
+                        terminal_ansi_blue: Some(rgba(0x3f62f4ff).into()),
+                        terminal_ansi_magenta: Some(rgba(0xe61dc3ff).into()),
+                        terminal_ansi_cyan: Some(rgba(0x1d99b3ff).into()),
+                        terminal_ansi_white: Some(rgba(0x131513ff).into()),
+                        ..Default::default()
+                    },
+                    status: StatusColorsRefinement {
+                        created: Some(rgba(0x61b656ff).into()),
+                        deleted: Some(rgba(0xe61c3dff).into()),
+                        error: Some(rgba(0xe61c3dff).into()),
+                        modified: Some(rgba(0x98981dff).into()),
+                        success: Some(rgba(0x131513ff).into()),
+                        warning: Some(rgba(0x98981dff).into()),
+                        ..Default::default()
+                    },
+                    syntax: Some(UserSyntaxTheme {
+                        highlights: vec![
+                            (
+                                "attribute".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x3f62f4ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "boolean".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x2ba32bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "comment".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x809980ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "comment.doc".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x5e6e5eff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "constant".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x2ba32bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "constructor".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x3f62f4ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "embedded".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x131513ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "emphasis".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x3f62f4ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "emphasis.strong".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x3f62f4ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "enum".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x87711fff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x3d62f5ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function.method".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x3d62f5ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function.special.definition".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x98981bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "hint".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x008fa1ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "keyword".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xad2beeff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "label".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x3f62f4ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "link_text".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x87711fff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "link_uri".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x2ba32bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "number".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x87711dff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "operator".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x5e6e5eff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "predictive".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x00a2b5ff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "preproc".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x131513ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "primary".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x242924ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "property".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xe6193cff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x242924ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.bracket".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x5e6e5eff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.delimiter".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x5e6e5eff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.list_marker".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x242924ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xe619c3ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x29a329ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.escape".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x5e6e5eff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.regex".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x1999b3ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xe619c3ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.special.symbol".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x29a329ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "tag".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x3f62f4ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "text.literal".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x87711fff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "title".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x131513ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "type".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x98981bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variable".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x242924ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variable.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xad2beeff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variant".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x98981bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                        ],
+                    }),
+                },
+            },
+            UserTheme {
+                name: "Atelier Savanna Dark".into(),
+                appearance: Appearance::Dark,
+                styles: UserThemeStylesRefinement {
+                    colors: ThemeColorsRefinement {
+                        border: Some(rgba(0x505e55ff).into()),
+                        border_variant: Some(rgba(0x505e55ff).into()),
+                        elevated_surface_background: Some(rgba(0x353f39ff).into()),
+                        background: Some(rgba(0x353f39ff).into()),
+                        panel_background: Some(rgba(0x1f2621ff).into()),
+                        element_hover: Some(rgba(0x505e5580).into()),
+                        element_selected: Some(rgba(0x5a685f80).into()),
+                        text: Some(rgba(0x859188ff).into()),
+                        text_muted: Some(rgba(0x5f6d64ff).into()),
+                        status_bar_background: Some(rgba(0x353f39ff).into()),
+                        title_bar_background: Some(rgba(0x353f39ff).into()),
+                        toolbar_background: Some(rgba(0x171c19ff).into()),
+                        tab_bar_background: Some(rgba(0x1f2621ff).into()),
+                        tab_inactive_background: Some(rgba(0x1f2621ff).into()),
+                        tab_active_background: Some(rgba(0x171c19ff).into()),
+                        scrollbar_thumb_background: Some(rgba(0xecf4ee4d).into()),
+                        scrollbar_thumb_hover_background: Some(rgba(0xecf4ee4d).into()),
+                        scrollbar_thumb_border: Some(rgba(0x1e2420ff).into()),
+                        scrollbar_track_border: Some(rgba(0x1e2420ff).into()),
+                        editor_foreground: Some(rgba(0xdfe7e2ff).into()),
+                        editor_background: Some(rgba(0x171c19ff).into()),
+                        editor_gutter_background: Some(rgba(0x171c19ff).into()),
+                        editor_line_number: Some(rgba(0xecf4ee59).into()),
+                        editor_active_line_number: Some(rgba(0xecf4eeff).into()),
+                        editor_wrap_guide: Some(rgba(0xecf4ee0d).into()),
+                        editor_active_wrap_guide: Some(rgba(0xecf4ee1a).into()),
+                        terminal_background: Some(rgba(0x171c19ff).into()),
+                        terminal_ansi_bright_black: Some(rgba(0x5d6b62ff).into()),
+                        terminal_ansi_bright_red: Some(rgba(0x563220ff).into()),
+                        terminal_ansi_bright_green: Some(rgba(0x294a33ff).into()),
+                        terminal_ansi_bright_yellow: Some(rgba(0x4e3f22ff).into()),
+                        terminal_ansi_bright_blue: Some(rgba(0x284546ff).into()),
+                        terminal_ansi_bright_magenta: Some(rgba(0x423a36ff).into()),
+                        terminal_ansi_bright_cyan: Some(rgba(0x1d4b4dff).into()),
+                        terminal_ansi_bright_white: Some(rgba(0xecf4eeff).into()),
+                        terminal_ansi_black: Some(rgba(0x171c19ff).into()),
+                        terminal_ansi_red: Some(rgba(0xb16139ff).into()),
+                        terminal_ansi_green: Some(rgba(0x489963ff).into()),
+                        terminal_ansi_yellow: Some(rgba(0xa07e3bff).into()),
+                        terminal_ansi_blue: Some(rgba(0x478c90ff).into()),
+                        terminal_ansi_magenta: Some(rgba(0x867469ff).into()),
+                        terminal_ansi_cyan: Some(rgba(0x1e9aa0ff).into()),
+                        terminal_ansi_white: Some(rgba(0xecf4eeff).into()),
+                        ..Default::default()
+                    },
+                    status: StatusColorsRefinement {
+                        created: Some(rgba(0x489963ff).into()),
+                        deleted: Some(rgba(0x8b4d2fff).into()),
+                        error: Some(rgba(0xb16139ff).into()),
+                        modified: Some(rgba(0xa07e3bff).into()),
+                        success: Some(rgba(0xecf4eeff).into()),
+                        warning: Some(rgba(0xa07e3bff).into()),
+                        ..Default::default()
+                    },
+                    syntax: Some(UserSyntaxTheme {
+                        highlights: vec![
+                            (
+                                "attribute".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x478c90ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "boolean".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x489963ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "comment".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x5f6d64ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "comment.doc".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x87928aff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "constant".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x489963ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "constructor".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x478c90ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "embedded".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xecf4eeff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "emphasis".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x478c90ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "emphasis.strong".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x478c90ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "enum".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x9f713cff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x478c90ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function.method".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x478c90ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function.special.definition".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xa07e3bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "hint".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x607e76ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "keyword".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x55859bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "label".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x478c90ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "link_text".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x9f713cff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "link_uri".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x489963ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "number".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x9f713cff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "operator".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x87928aff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "predictive".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x506d66ff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "preproc".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xecf4eeff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "primary".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xdfe7e2ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "property".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xb16139ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xdfe7e2ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.bracket".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x87928aff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.delimiter".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x87928aff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.list_marker".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xdfe7e2ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x867469ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x489963ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.escape".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x87928aff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.regex".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x1c9aa0ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x867469ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.special.symbol".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x489963ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "tag".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x478c90ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "text.literal".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x9f713cff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "title".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xecf4eeff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "type".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xa07e3bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variable".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xdfe7e2ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variable.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x55859bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variant".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xa07e3bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                        ],
+                    }),
+                },
+            },
+            UserTheme {
+                name: "Atelier Heath Light".into(),
+                appearance: Appearance::Light,
+                styles: UserThemeStylesRefinement {
+                    colors: ThemeColorsRefinement {
+                        border: Some(rgba(0xad9dadff).into()),
+                        border_variant: Some(rgba(0xad9dadff).into()),
+                        elevated_surface_background: Some(rgba(0xc6b8c6ff).into()),
+                        background: Some(rgba(0xc6b8c6ff).into()),
+                        panel_background: Some(rgba(0xe1d6e1ff).into()),
+                        element_hover: Some(rgba(0xad9dad80).into()),
+                        element_selected: Some(rgba(0xa394a380).into()),
+                        text: Some(rgba(0x6b5e6bff).into()),
+                        text_muted: Some(rgba(0x9e8f9eff).into()),
+                        status_bar_background: Some(rgba(0xc6b8c6ff).into()),
+                        title_bar_background: Some(rgba(0xc6b8c6ff).into()),
+                        toolbar_background: Some(rgba(0xf7f3f7ff).into()),
+                        tab_bar_background: Some(rgba(0xe1d6e1ff).into()),
+                        tab_inactive_background: Some(rgba(0xe1d6e1ff).into()),
+                        tab_active_background: Some(rgba(0xf7f3f7ff).into()),
+                        scrollbar_thumb_background: Some(rgba(0x1b181b4d).into()),
+                        scrollbar_thumb_hover_background: Some(rgba(0x1b181b4d).into()),
+                        scrollbar_thumb_border: Some(rgba(0xe5dce5ff).into()),
+                        scrollbar_track_border: Some(rgba(0xe5dce5ff).into()),
+                        editor_foreground: Some(rgba(0x292329ff).into()),
+                        editor_background: Some(rgba(0xf7f3f7ff).into()),
+                        editor_gutter_background: Some(rgba(0xf7f3f7ff).into()),
+                        editor_line_number: Some(rgba(0x1b181b59).into()),
+                        editor_active_line_number: Some(rgba(0x1b181bff).into()),
+                        editor_wrap_guide: Some(rgba(0x1b181b0d).into()),
+                        editor_active_wrap_guide: Some(rgba(0x1b181b1a).into()),
+                        terminal_background: Some(rgba(0xf7f3f7ff).into()),
+                        terminal_ansi_bright_black: Some(rgba(0xa091a0ff).into()),
+                        terminal_ansi_bright_red: Some(rgba(0xf0a28fff).into()),
+                        terminal_ansi_bright_green: Some(rgba(0xcac49aff).into()),
+                        terminal_ansi_bright_yellow: Some(rgba(0xe2c398ff).into()),
+                        terminal_ansi_bright_blue: Some(rgba(0xb4b2f7ff).into()),
+                        terminal_ansi_bright_magenta: Some(rgba(0xeba2e6ff).into()),
+                        terminal_ansi_bright_cyan: Some(rgba(0x9ac9c8ff).into()),
+                        terminal_ansi_bright_white: Some(rgba(0x1b181bff).into()),
+                        terminal_ansi_black: Some(rgba(0xf7f3f7ff).into()),
+                        terminal_ansi_red: Some(rgba(0xca412cff).into()),
+                        terminal_ansi_green: Some(rgba(0x918b3cff).into()),
+                        terminal_ansi_yellow: Some(rgba(0xbb8a36ff).into()),
+                        terminal_ansi_blue: Some(rgba(0x526aebff).into()),
+                        terminal_ansi_magenta: Some(rgba(0xcc35ccff).into()),
+                        terminal_ansi_cyan: Some(rgba(0x199393ff).into()),
+                        terminal_ansi_white: Some(rgba(0x1b181bff).into()),
+                        ..Default::default()
+                    },
+                    status: StatusColorsRefinement {
+                        created: Some(rgba(0xa8a161ff).into()),
+                        deleted: Some(rgba(0xca412cff).into()),
+                        error: Some(rgba(0xca412cff).into()),
+                        modified: Some(rgba(0xbb8a36ff).into()),
+                        success: Some(rgba(0x1b181bff).into()),
+                        warning: Some(rgba(0xbb8a36ff).into()),
+                        ..Default::default()
+                    },
+                    syntax: Some(UserSyntaxTheme {
+                        highlights: vec![
+                            (
+                                "attribute".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x526aebff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "boolean".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x918b3cff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "comment".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x9e8f9eff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "comment.doc".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x695d69ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "constant".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x918b3cff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "constructor".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x526aebff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "embedded".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x1b181bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "emphasis".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x526aebff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "emphasis.strong".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x526aebff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "enum".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xa65a27ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x516aecff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function.method".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x516aecff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function.special.definition".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xbb8a35ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "hint".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x8c70a6ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "keyword".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7b59c0ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "label".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x526aebff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "link_text".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xa65a27ff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "link_uri".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x918b3cff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "number".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xa65926ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "operator".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x695d69ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "predictive".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xa587bfff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "preproc".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x1b181bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "primary".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x292329ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "property".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xca402bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x292329ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.bracket".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x695d69ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.delimiter".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x695d69ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.list_marker".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x292329ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xcc33ccff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x918b3bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.escape".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x695d69ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.regex".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x159393ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xcc33ccff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.special.symbol".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x918b3bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "tag".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x526aebff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "text.literal".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xa65a27ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "title".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x1b181bff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "type".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xbb8a35ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variable".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x292329ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variable.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7b59c0ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variant".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xbb8a35ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                        ],
+                    }),
+                },
+            },
+            UserTheme {
+                name: "Atelier Lakeside Light".into(),
+                appearance: Appearance::Light,
+                styles: UserThemeStylesRefinement {
+                    colors: ThemeColorsRefinement {
+                        border: Some(rgba(0x80a4b6ff).into()),
+                        border_variant: Some(rgba(0x80a4b6ff).into()),
+                        elevated_surface_background: Some(rgba(0xa6cadcff).into()),
+                        background: Some(rgba(0xa6cadcff).into()),
+                        panel_background: Some(rgba(0xcdeaf9ff).into()),
+                        element_hover: Some(rgba(0x80a4b680).into()),
+                        element_selected: Some(rgba(0x769aad80).into()),
+                        text: Some(rgba(0x526f7dff).into()),
+                        text_muted: Some(rgba(0x7195a8ff).into()),
+                        status_bar_background: Some(rgba(0xa6cadcff).into()),
+                        title_bar_background: Some(rgba(0xa6cadcff).into()),
+                        toolbar_background: Some(rgba(0xebf8ffff).into()),
+                        tab_bar_background: Some(rgba(0xcdeaf9ff).into()),
+                        tab_inactive_background: Some(rgba(0xcdeaf9ff).into()),
+                        tab_active_background: Some(rgba(0xebf8ffff).into()),
+                        scrollbar_thumb_background: Some(rgba(0x161b1d4d).into()),
+                        scrollbar_thumb_hover_background: Some(rgba(0x161b1d4d).into()),
+                        scrollbar_thumb_border: Some(rgba(0xd3edfaff).into()),
+                        scrollbar_track_border: Some(rgba(0xd3edfaff).into()),
+                        editor_foreground: Some(rgba(0x1f292eff).into()),
+                        editor_background: Some(rgba(0xebf8ffff).into()),
+                        editor_gutter_background: Some(rgba(0xebf8ffff).into()),
+                        editor_line_number: Some(rgba(0x161b1d59).into()),
+                        editor_active_line_number: Some(rgba(0x161b1dff).into()),
+                        editor_wrap_guide: Some(rgba(0x161b1d0d).into()),
+                        editor_active_wrap_guide: Some(rgba(0x161b1d1a).into()),
+                        terminal_background: Some(rgba(0xebf8ffff).into()),
+                        terminal_ansi_bright_black: Some(rgba(0x7397aaff).into()),
+                        terminal_ansi_bright_red: Some(rgba(0xf09fb6ff).into()),
+                        terminal_ansi_bright_green: Some(rgba(0xabc59aff).into()),
+                        terminal_ansi_bright_yellow: Some(rgba(0xc8c38bff).into()),
+                        terminal_ansi_bright_blue: Some(rgba(0x9ebdd6ff).into()),
+                        terminal_ansi_bright_magenta: Some(rgba(0xe09fe9ff).into()),
+                        terminal_ansi_bright_cyan: Some(rgba(0x9bc7b5ff).into()),
+                        terminal_ansi_bright_white: Some(rgba(0x161b1dff).into()),
+                        terminal_ansi_black: Some(rgba(0xebf8ffff).into()),
+                        terminal_ansi_red: Some(rgba(0xd22f72ff).into()),
+                        terminal_ansi_green: Some(rgba(0x578c3cff).into()),
+                        terminal_ansi_yellow: Some(rgba(0x8a8a11ff).into()),
+                        terminal_ansi_blue: Some(rgba(0x277fadff).into()),
+                        terminal_ansi_magenta: Some(rgba(0xb72fd2ff).into()),
+                        terminal_ansi_cyan: Some(rgba(0x2f8f6fff).into()),
+                        terminal_ansi_white: Some(rgba(0x161b1dff).into()),
+                        ..Default::default()
+                    },
+                    status: StatusColorsRefinement {
+                        created: Some(rgba(0x78a361ff).into()),
+                        deleted: Some(rgba(0xd22f72ff).into()),
+                        error: Some(rgba(0xd22f72ff).into()),
+                        modified: Some(rgba(0x8a8a11ff).into()),
+                        success: Some(rgba(0x161b1dff).into()),
+                        warning: Some(rgba(0x8a8a11ff).into()),
+                        ..Default::default()
+                    },
+                    syntax: Some(UserSyntaxTheme {
+                        highlights: vec![
+                            (
+                                "attribute".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x277fadff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "boolean".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x578c3cff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "comment".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7195a8ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "comment.doc".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x516d7bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "constant".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x578c3cff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "constructor".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x277fadff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "embedded".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x161b1dff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "emphasis".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x277fadff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "emphasis.strong".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x277fadff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "enum".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x935d26ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x257fadff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function.method".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x257fadff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function.special.definition".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x8a8a0fff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "hint".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x5a87a0ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "keyword".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x6b6bb8ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "label".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x277fadff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "link_text".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x935d26ff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "link_uri".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x578c3cff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "number".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x935c25ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "operator".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x516d7bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "predictive".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x6a97b2ff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "preproc".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x161b1dff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "primary".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x1f292eff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "property".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xd22d72ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x1f292eff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.bracket".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x516d7bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.delimiter".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x516d7bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.list_marker".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x1f292eff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xb72dd2ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x568c3bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.escape".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x516d7bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.regex".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x2d8f6fff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xb72dd2ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "string.special.symbol".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x568c3bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "tag".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x277fadff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "text.literal".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x935d26ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "title".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x161b1dff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "type".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x8a8a0fff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variable".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x1f292eff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variable.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x6b6bb8ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variant".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x8a8a0fff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                        ],
+                    }),
+                },
+            },
+        ],
+    }
+}

crates/theme2/src/themes/ayu.rs πŸ”—

@@ -12,75 +12,65 @@ use crate::{
 pub fn ayu() -> UserThemeFamily {
     UserThemeFamily {
         name: "Ayu".into(),
-        author: "dempfi (Ike Ku)".into(),
+        author: "Zed Industries".into(),
         themes: vec![
             UserTheme {
-                name: "Ayu Light".into(),
-                appearance: Appearance::Light,
+                name: "Ayu Dark".into(),
+                appearance: Appearance::Dark,
                 styles: UserThemeStylesRefinement {
                     colors: ThemeColorsRefinement {
-                        border: Some(rgba(0x6b7d8f1f).into()),
-                        border_variant: Some(rgba(0x6b7d8f1f).into()),
-                        border_focused: Some(rgba(0xffaa33b3).into()),
-                        border_selected: Some(rgba(0x6b7d8f1f).into()),
-                        border_transparent: Some(rgba(0x6b7d8f1f).into()),
-                        border_disabled: Some(rgba(0x6b7d8f1f).into()),
-                        elevated_surface_background: Some(rgba(0xfcfcfcff).into()),
-                        surface_background: Some(rgba(0xf8f9faff).into()),
-                        background: Some(rgba(0xf8f9faff).into()),
-                        element_background: Some(rgba(0xffaa33ff).into()),
-                        element_hover: Some(rgba(0x56728f1f).into()),
-                        element_selected: Some(rgba(0x56728f1f).into()),
-                        ghost_element_hover: Some(rgba(0x56728f1f).into()),
-                        ghost_element_selected: Some(rgba(0x56728f1f).into()),
-                        text: Some(rgba(0x8a9199ff).into()),
-                        text_muted: Some(rgba(0x8a9199ff).into()),
-                        status_bar_background: Some(rgba(0xf8f9faff).into()),
-                        title_bar_background: Some(rgba(0xf8f9faff).into()),
-                        toolbar_background: Some(rgba(0xf8f9faff).into()),
-                        tab_bar_background: Some(rgba(0xf8f9faff).into()),
-                        tab_inactive_background: Some(rgba(0xf8f9faff).into()),
-                        tab_active_background: Some(rgba(0xf8f9faff).into()),
-                        scrollbar_thumb_background: Some(rgba(0x8a919966).into()),
-                        scrollbar_thumb_hover_background: Some(rgba(0x8a919999).into()),
-                        scrollbar_thumb_border: Some(rgba(0x8a919966).into()),
-                        scrollbar_track_background: Some(rgba(0xf8f9faff).into()),
-                        scrollbar_track_border: Some(rgba(0x6b7d8f1f).into()),
-                        editor_foreground: Some(rgba(0x5c6166ff).into()),
-                        editor_background: Some(rgba(0xf8f9faff).into()),
-                        editor_gutter_background: Some(rgba(0xf8f9faff).into()),
-                        editor_line_number: Some(rgba(0x8a919966).into()),
-                        editor_active_line_number: Some(rgba(0x5c6166ff).into()),
-                        editor_wrap_guide: Some(rgba(0x6b7d8f1f).into()),
-                        editor_active_wrap_guide: Some(rgba(0x6b7d8f1f).into()),
-                        terminal_background: Some(rgba(0xf8f9faff).into()),
-                        terminal_ansi_bright_black: Some(rgba(0x686868ff).into()),
-                        terminal_ansi_bright_red: Some(rgba(0xf07171ff).into()),
-                        terminal_ansi_bright_green: Some(rgba(0x86b300ff).into()),
-                        terminal_ansi_bright_yellow: Some(rgba(0xf2ae49ff).into()),
-                        terminal_ansi_bright_blue: Some(rgba(0x399ee6ff).into()),
-                        terminal_ansi_bright_magenta: Some(rgba(0xa37accff).into()),
-                        terminal_ansi_bright_cyan: Some(rgba(0x4cbf99ff).into()),
-                        terminal_ansi_bright_white: Some(rgba(0xd1d1d1ff).into()),
-                        terminal_ansi_black: Some(rgba(0x000000ff).into()),
-                        terminal_ansi_red: Some(rgba(0xea6c6dff).into()),
-                        terminal_ansi_green: Some(rgba(0x6cbf43ff).into()),
-                        terminal_ansi_yellow: Some(rgba(0xeca944ff).into()),
-                        terminal_ansi_blue: Some(rgba(0x3199e1ff).into()),
-                        terminal_ansi_magenta: Some(rgba(0x9e75c7ff).into()),
-                        terminal_ansi_cyan: Some(rgba(0x46ba94ff).into()),
-                        terminal_ansi_white: Some(rgba(0xc7c7c7ff).into()),
-                        link_text_hover: Some(rgba(0xffaa33ff).into()),
+                        border: Some(rgba(0x3f4043ff).into()),
+                        border_variant: Some(rgba(0x3f4043ff).into()),
+                        elevated_surface_background: Some(rgba(0x313337ff).into()),
+                        background: Some(rgba(0x313337ff).into()),
+                        panel_background: Some(rgba(0x1f2127ff).into()),
+                        element_hover: Some(rgba(0x3f404380).into()),
+                        element_selected: Some(rgba(0x50515280).into()),
+                        text: Some(rgba(0x8a8986ff).into()),
+                        text_muted: Some(rgba(0x58595aff).into()),
+                        status_bar_background: Some(rgba(0x313337ff).into()),
+                        title_bar_background: Some(rgba(0x313337ff).into()),
+                        toolbar_background: Some(rgba(0x0d1017ff).into()),
+                        tab_bar_background: Some(rgba(0x1f2127ff).into()),
+                        tab_inactive_background: Some(rgba(0x1f2127ff).into()),
+                        tab_active_background: Some(rgba(0x0d1017ff).into()),
+                        scrollbar_thumb_background: Some(rgba(0xbfbdb64d).into()),
+                        scrollbar_thumb_hover_background: Some(rgba(0xbfbdb64d).into()),
+                        scrollbar_thumb_border: Some(rgba(0x1b1e24ff).into()),
+                        scrollbar_track_border: Some(rgba(0x1b1e24ff).into()),
+                        editor_foreground: Some(rgba(0xbfbdb6ff).into()),
+                        editor_background: Some(rgba(0x0d1017ff).into()),
+                        editor_gutter_background: Some(rgba(0x0d1017ff).into()),
+                        editor_line_number: Some(rgba(0xbfbdb659).into()),
+                        editor_active_line_number: Some(rgba(0xbfbdb6ff).into()),
+                        editor_wrap_guide: Some(rgba(0xbfbdb60d).into()),
+                        editor_active_wrap_guide: Some(rgba(0xbfbdb61a).into()),
+                        terminal_background: Some(rgba(0x0d1017ff).into()),
+                        terminal_ansi_bright_black: Some(rgba(0x545557ff).into()),
+                        terminal_ansi_bright_red: Some(rgba(0x83363cff).into()),
+                        terminal_ansi_bright_green: Some(rgba(0x567627ff).into()),
+                        terminal_ansi_bright_yellow: Some(rgba(0x92592cff).into()),
+                        terminal_ansi_bright_blue: Some(rgba(0x28628cff).into()),
+                        terminal_ansi_bright_magenta: Some(rgba(0x205b78ff).into()),
+                        terminal_ansi_bright_cyan: Some(rgba(0x4c806fff).into()),
+                        terminal_ansi_bright_white: Some(rgba(0xbfbdb6ff).into()),
+                        terminal_ansi_black: Some(rgba(0x0d1017ff).into()),
+                        terminal_ansi_red: Some(rgba(0xef7178ff).into()),
+                        terminal_ansi_green: Some(rgba(0xaad84cff).into()),
+                        terminal_ansi_yellow: Some(rgba(0xfeb454ff).into()),
+                        terminal_ansi_blue: Some(rgba(0x5ac2feff).into()),
+                        terminal_ansi_magenta: Some(rgba(0x3abae5ff).into()),
+                        terminal_ansi_cyan: Some(rgba(0x95e5cbff).into()),
+                        terminal_ansi_white: Some(rgba(0xbfbdb6ff).into()),
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
-                        created: Some(rgba(0x6cbf43cc).into()),
-                        deleted: Some(rgba(0xff7383cc).into()),
-                        error: Some(rgba(0xe65050ff).into()),
-                        hidden: Some(rgba(0x8a9199ff).into()),
-                        hint: Some(rgba(0x969696ff).into()),
-                        ignored: Some(rgba(0x8a919980).into()),
-                        modified: Some(rgba(0x478acccc).into()),
+                        created: Some(rgba(0xaad84cff).into()),
+                        deleted: Some(rgba(0xc3595fff).into()),
+                        error: Some(rgba(0xef7178ff).into()),
+                        modified: Some(rgba(0xfeb454ff).into()),
+                        success: Some(rgba(0xbfbdb6ff).into()),
+                        warning: Some(rgba(0xfeb454ff).into()),
                         ..Default::default()
                     },
                     syntax: Some(UserSyntaxTheme {
@@ -88,235 +78,271 @@ pub fn ayu() -> UserThemeFamily {
                             (
                                 "attribute".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xf2ae49ff).into()),
+                                    color: Some(rgba(0x5ac2feff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "boolean".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xa37accff).into()),
+                                    color: Some(rgba(0xd2a6ffff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "comment".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x787b8099).into()),
-                                    font_style: Some(UserFontStyle::Italic),
+                                    color: Some(rgba(0xacb6bf8c).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "comment.doc".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x787b8099).into()),
-                                    font_style: Some(UserFontStyle::Italic),
+                                    color: Some(rgba(0x8c8b88ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "constant".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xa37accff).into()),
+                                    color: Some(rgba(0xd2a6ffff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "constructor".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x55b4d4ff).into()),
+                                    color: Some(rgba(0x5ac2feff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "embedded".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x5c6166ff).into()),
+                                    color: Some(rgba(0xbfbdb6ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "emphasis".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xf07171ff).into()),
-                                    font_style: Some(UserFontStyle::Italic),
+                                    color: Some(rgba(0x5ac2feff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "emphasis.strong".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xf07171ff).into()),
+                                    color: Some(rgba(0x5ac2feff).into()),
                                     font_weight: Some(UserFontWeight(700.0)),
                                     ..Default::default()
                                 },
                             ),
+                            (
+                                "enum".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xfe8f40ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
                             (
                                 "function".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xf2ae49ff).into()),
+                                    color: Some(rgba(0xffb454ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "hint".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x638c81ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "keyword".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xfa8d3eff).into()),
+                                    color: Some(rgba(0xff8f40ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "label".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x86b300ff).into()),
+                                    color: Some(rgba(0x5ac2feff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "link_text".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x55b4d4ff).into()),
+                                    color: Some(rgba(0xfe8f40ff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "link_uri".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x55b4d4ff).into()),
+                                    color: Some(rgba(0xaad84cff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "number".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xa37accff).into()),
+                                    color: Some(rgba(0xd2a6ffff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "operator".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xed9366ff).into()),
+                                    color: Some(rgba(0xf29668ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "predictive".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x5b728cff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "preproc".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xbfbdb6ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "primary".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xbfbdb6ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "property".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xf07171ff).into()),
+                                    color: Some(rgba(0x5ac2feff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x5c6166ff).into()),
+                                    color: Some(rgba(0xa6a5a0ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation.bracket".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x55b4d480).into()),
+                                    color: Some(rgba(0xa6a5a0ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation.delimiter".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x5c6166b3).into()),
+                                    color: Some(rgba(0xa6a5a0ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation.list_marker".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xf2ae49ff).into()),
+                                    color: Some(rgba(0xa6a5a0ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation.special".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x5c6166ff).into()),
+                                    color: Some(rgba(0xd2a6ffff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x86b300ff).into()),
+                                    color: Some(rgba(0xaad94cff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string.escape".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x4cbf99ff).into()),
+                                    color: Some(rgba(0x8c8b88ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string.regex".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x86b300ff).into()),
+                                    color: Some(rgba(0x95e6cbff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string.special".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x86b300ff).into()),
+                                    color: Some(rgba(0xe6b673ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string.special.symbol".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x86b300ff).into()),
+                                    color: Some(rgba(0xfe8f40ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "tag".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x55b4d4ff).into()),
+                                    color: Some(rgba(0x5ac2feff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "text.literal".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x86b300ff).into()),
+                                    color: Some(rgba(0xfe8f40ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "title".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x399ee6ff).into()),
+                                    color: Some(rgba(0xbfbdb6ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "type".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x55b4d4ff).into()),
+                                    color: Some(rgba(0x59c2ffff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "variable".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x5c6166ff).into()),
+                                    color: Some(rgba(0xbfbdb6ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
-                                "variable.special".into(),
+                                "variant".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xf07171ff).into()),
+                                    color: Some(rgba(0x5ac2feff).into()),
                                     ..Default::default()
                                 },
                             ),
@@ -325,72 +351,62 @@ pub fn ayu() -> UserThemeFamily {
                 },
             },
             UserTheme {
-                name: "Ayu Mirage".into(),
-                appearance: Appearance::Dark,
+                name: "Ayu Light".into(),
+                appearance: Appearance::Light,
                 styles: UserThemeStylesRefinement {
                     colors: ThemeColorsRefinement {
-                        border: Some(rgba(0x171b24ff).into()),
-                        border_variant: Some(rgba(0x171b24ff).into()),
-                        border_focused: Some(rgba(0xffcc66b3).into()),
-                        border_selected: Some(rgba(0x171b24ff).into()),
-                        border_transparent: Some(rgba(0x171b24ff).into()),
-                        border_disabled: Some(rgba(0x171b24ff).into()),
-                        elevated_surface_background: Some(rgba(0x242936ff).into()),
-                        surface_background: Some(rgba(0x1f2430ff).into()),
-                        background: Some(rgba(0x1f2430ff).into()),
-                        element_background: Some(rgba(0xffcc66ff).into()),
-                        element_hover: Some(rgba(0x63759926).into()),
-                        element_selected: Some(rgba(0x63759926).into()),
-                        ghost_element_hover: Some(rgba(0x63759926).into()),
-                        ghost_element_selected: Some(rgba(0x63759926).into()),
-                        text: Some(rgba(0x707a8cff).into()),
-                        text_muted: Some(rgba(0x707a8cff).into()),
-                        status_bar_background: Some(rgba(0x1f2430ff).into()),
-                        title_bar_background: Some(rgba(0x1f2430ff).into()),
-                        toolbar_background: Some(rgba(0x1f2430ff).into()),
-                        tab_bar_background: Some(rgba(0x1f2430ff).into()),
-                        tab_inactive_background: Some(rgba(0x1f2430ff).into()),
-                        tab_active_background: Some(rgba(0x1f2430ff).into()),
-                        scrollbar_thumb_background: Some(rgba(0x707a8c66).into()),
-                        scrollbar_thumb_hover_background: Some(rgba(0x707a8c99).into()),
-                        scrollbar_thumb_border: Some(rgba(0x707a8c66).into()),
-                        scrollbar_track_background: Some(rgba(0x1f2430ff).into()),
-                        scrollbar_track_border: Some(rgba(0x171b24ff).into()),
-                        editor_foreground: Some(rgba(0xcccac2ff).into()),
-                        editor_background: Some(rgba(0x1f2430ff).into()),
-                        editor_gutter_background: Some(rgba(0x1f2430ff).into()),
-                        editor_line_number: Some(rgba(0x8a919966).into()),
-                        editor_active_line_number: Some(rgba(0xcccac2ff).into()),
-                        editor_wrap_guide: Some(rgba(0x171b24ff).into()),
-                        editor_active_wrap_guide: Some(rgba(0x171b24ff).into()),
-                        terminal_background: Some(rgba(0x1f2430ff).into()),
-                        terminal_ansi_bright_black: Some(rgba(0x686868ff).into()),
-                        terminal_ansi_bright_red: Some(rgba(0xf28779ff).into()),
-                        terminal_ansi_bright_green: Some(rgba(0xd5ff80ff).into()),
-                        terminal_ansi_bright_yellow: Some(rgba(0xffd173ff).into()),
-                        terminal_ansi_bright_blue: Some(rgba(0x73d0ffff).into()),
-                        terminal_ansi_bright_magenta: Some(rgba(0xdfbfffff).into()),
-                        terminal_ansi_bright_cyan: Some(rgba(0x95e6cbff).into()),
-                        terminal_ansi_bright_white: Some(rgba(0xffffffff).into()),
-                        terminal_ansi_black: Some(rgba(0x171b24ff).into()),
-                        terminal_ansi_red: Some(rgba(0xed8274ff).into()),
-                        terminal_ansi_green: Some(rgba(0x87d96cff).into()),
-                        terminal_ansi_yellow: Some(rgba(0xfacc6eff).into()),
-                        terminal_ansi_blue: Some(rgba(0x6dcbfaff).into()),
-                        terminal_ansi_magenta: Some(rgba(0xdabafaff).into()),
-                        terminal_ansi_cyan: Some(rgba(0x90e1c6ff).into()),
-                        terminal_ansi_white: Some(rgba(0xc7c7c7ff).into()),
-                        link_text_hover: Some(rgba(0xffcc66ff).into()),
+                        border: Some(rgba(0xcfd1d2ff).into()),
+                        border_variant: Some(rgba(0xcfd1d2ff).into()),
+                        elevated_surface_background: Some(rgba(0xdcdddeff).into()),
+                        background: Some(rgba(0xdcdddeff).into()),
+                        panel_background: Some(rgba(0xececedff).into()),
+                        element_hover: Some(rgba(0xcfd1d280).into()),
+                        element_selected: Some(rgba(0xc0c2c480).into()),
+                        text: Some(rgba(0x8c8f93ff).into()),
+                        text_muted: Some(rgba(0xb9bbbdff).into()),
+                        status_bar_background: Some(rgba(0xdcdddeff).into()),
+                        title_bar_background: Some(rgba(0xdcdddeff).into()),
+                        toolbar_background: Some(rgba(0xfcfcfcff).into()),
+                        tab_bar_background: Some(rgba(0xececedff).into()),
+                        tab_inactive_background: Some(rgba(0xececedff).into()),
+                        tab_active_background: Some(rgba(0xfcfcfcff).into()),
+                        scrollbar_thumb_background: Some(rgba(0x5c61664d).into()),
+                        scrollbar_thumb_hover_background: Some(rgba(0x5c61664d).into()),
+                        scrollbar_thumb_border: Some(rgba(0xefeff0ff).into()),
+                        scrollbar_track_border: Some(rgba(0xefeff0ff).into()),
+                        editor_foreground: Some(rgba(0x5c6166ff).into()),
+                        editor_background: Some(rgba(0xfcfcfcff).into()),
+                        editor_gutter_background: Some(rgba(0xfcfcfcff).into()),
+                        editor_line_number: Some(rgba(0x5c616659).into()),
+                        editor_active_line_number: Some(rgba(0x5c6166ff).into()),
+                        editor_wrap_guide: Some(rgba(0x5c61660d).into()),
+                        editor_active_wrap_guide: Some(rgba(0x5c61661a).into()),
+                        terminal_background: Some(rgba(0xfcfcfcff).into()),
+                        terminal_ansi_bright_black: Some(rgba(0xbcbec0ff).into()),
+                        terminal_ansi_bright_red: Some(rgba(0xfebab6ff).into()),
+                        terminal_ansi_bright_green: Some(rgba(0xc7d98fff).into()),
+                        terminal_ansi_bright_yellow: Some(rgba(0xffd6a4ff).into()),
+                        terminal_ansi_bright_blue: Some(rgba(0xaccef3ff).into()),
+                        terminal_ansi_bright_magenta: Some(rgba(0xb2d9e9ff).into()),
+                        terminal_ansi_bright_cyan: Some(rgba(0xace0cbff).into()),
+                        terminal_ansi_bright_white: Some(rgba(0x5c6166ff).into()),
+                        terminal_ansi_black: Some(rgba(0xfcfcfcff).into()),
+                        terminal_ansi_red: Some(rgba(0xef7271ff).into()),
+                        terminal_ansi_green: Some(rgba(0x86b305ff).into()),
+                        terminal_ansi_yellow: Some(rgba(0xf1ae4aff).into()),
+                        terminal_ansi_blue: Some(rgba(0x3b9ee5ff).into()),
+                        terminal_ansi_magenta: Some(rgba(0x56b4d3ff).into()),
+                        terminal_ansi_cyan: Some(rgba(0x4dbf99ff).into()),
+                        terminal_ansi_white: Some(rgba(0x5c6166ff).into()),
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
-                        created: Some(rgba(0x87d96ccc).into()),
-                        deleted: Some(rgba(0xf27983cc).into()),
-                        error: Some(rgba(0xff6666ff).into()),
-                        hidden: Some(rgba(0x707a8cff).into()),
-                        hint: Some(rgba(0x969696ff).into()),
-                        ignored: Some(rgba(0x707a8c80).into()),
-                        modified: Some(rgba(0x80bfffcc).into()),
+                        created: Some(rgba(0xa1c24bff).into()),
+                        deleted: Some(rgba(0xef7271ff).into()),
+                        error: Some(rgba(0xef7271ff).into()),
+                        modified: Some(rgba(0xf1ae4aff).into()),
+                        success: Some(rgba(0x5c6166ff).into()),
+                        warning: Some(rgba(0xf1ae4aff).into()),
                         ..Default::default()
                     },
                     syntax: Some(UserSyntaxTheme {
@@ -398,235 +414,271 @@ pub fn ayu() -> UserThemeFamily {
                             (
                                 "attribute".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xffd173ff).into()),
+                                    color: Some(rgba(0x3b9ee5ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "boolean".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xdfbfffff).into()),
+                                    color: Some(rgba(0xa37accff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "comment".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xb8cfe680).into()),
-                                    font_style: Some(UserFontStyle::Italic),
+                                    color: Some(rgba(0x787b8099).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "comment.doc".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xb8cfe680).into()),
-                                    font_style: Some(UserFontStyle::Italic),
+                                    color: Some(rgba(0x8a8e91ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "constant".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xdfbfffff).into()),
+                                    color: Some(rgba(0xa37accff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "constructor".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x5ccfe6ff).into()),
+                                    color: Some(rgba(0x3b9ee5ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "embedded".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xcccac2ff).into()),
+                                    color: Some(rgba(0x5c6166ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "emphasis".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xf28779ff).into()),
-                                    font_style: Some(UserFontStyle::Italic),
+                                    color: Some(rgba(0x3b9ee5ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "emphasis.strong".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xf28779ff).into()),
+                                    color: Some(rgba(0x3b9ee5ff).into()),
                                     font_weight: Some(UserFontWeight(700.0)),
                                     ..Default::default()
                                 },
                             ),
+                            (
+                                "enum".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xf98d3fff).into()),
+                                    ..Default::default()
+                                },
+                            ),
                             (
                                 "function".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xffd173ff).into()),
+                                    color: Some(rgba(0xf2ae49ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "hint".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x8ca7c2ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "keyword".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xffad66ff).into()),
+                                    color: Some(rgba(0xfa8d3eff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "label".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xd5ff80ff).into()),
+                                    color: Some(rgba(0x3b9ee5ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "link_text".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x5ccfe6ff).into()),
+                                    color: Some(rgba(0xf98d3fff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "link_uri".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x5ccfe6ff).into()),
+                                    color: Some(rgba(0x86b305ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "number".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xdfbfffff).into()),
+                                    color: Some(rgba(0xa37accff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "operator".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xf29e74ff).into()),
+                                    color: Some(rgba(0xed9366ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "predictive".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x9eb9d3ff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "preproc".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x5c6166ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "primary".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x5c6166ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "property".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xf28779ff).into()),
+                                    color: Some(rgba(0x3b9ee5ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xcccac2ff).into()),
+                                    color: Some(rgba(0x73777bff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation.bracket".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x5ccfe680).into()),
+                                    color: Some(rgba(0x73777bff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation.delimiter".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xcccac2b3).into()),
+                                    color: Some(rgba(0x73777bff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation.list_marker".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xffd173ff).into()),
+                                    color: Some(rgba(0x73777bff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation.special".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xcccac2ff).into()),
+                                    color: Some(rgba(0xa37accff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xd5ff80ff).into()),
+                                    color: Some(rgba(0x86b300ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string.escape".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x95e6cbff).into()),
+                                    color: Some(rgba(0x8a8e91ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string.regex".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xd5ff80ff).into()),
+                                    color: Some(rgba(0x4cbf99ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string.special".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xd5ff80ff).into()),
+                                    color: Some(rgba(0xe6ba7eff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string.special.symbol".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xd5ff80ff).into()),
+                                    color: Some(rgba(0xf98d3fff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "tag".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x5ccfe6ff).into()),
+                                    color: Some(rgba(0x3b9ee5ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "text.literal".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xd5ff80ff).into()),
+                                    color: Some(rgba(0xf98d3fff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "title".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x73d0ffff).into()),
+                                    color: Some(rgba(0x5c6166ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "type".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x5ccfe6ff).into()),
+                                    color: Some(rgba(0x399ee6ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "variable".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xcccac2ff).into()),
+                                    color: Some(rgba(0x5c6166ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
-                                "variable.special".into(),
+                                "variant".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xf28779ff).into()),
+                                    color: Some(rgba(0x3b9ee5ff).into()),
                                     ..Default::default()
                                 },
                             ),
@@ -635,72 +687,62 @@ pub fn ayu() -> UserThemeFamily {
                 },
             },
             UserTheme {
-                name: "Ayu Dark".into(),
+                name: "Ayu Mirage".into(),
                 appearance: Appearance::Dark,
                 styles: UserThemeStylesRefinement {
                     colors: ThemeColorsRefinement {
-                        border: Some(rgba(0x1e232bff).into()),
-                        border_variant: Some(rgba(0x1e232bff).into()),
-                        border_focused: Some(rgba(0xe6b450b3).into()),
-                        border_selected: Some(rgba(0x1e232bff).into()),
-                        border_transparent: Some(rgba(0x1e232bff).into()),
-                        border_disabled: Some(rgba(0x1e232bff).into()),
-                        elevated_surface_background: Some(rgba(0x0d1017ff).into()),
-                        surface_background: Some(rgba(0x0b0e14ff).into()),
-                        background: Some(rgba(0x0b0e14ff).into()),
-                        element_background: Some(rgba(0xe6b450ff).into()),
-                        element_hover: Some(rgba(0x47526640).into()),
-                        element_selected: Some(rgba(0x47526640).into()),
-                        ghost_element_hover: Some(rgba(0x47526640).into()),
-                        ghost_element_selected: Some(rgba(0x47526640).into()),
-                        text: Some(rgba(0x565b66ff).into()),
-                        text_muted: Some(rgba(0x565b66ff).into()),
-                        status_bar_background: Some(rgba(0x0b0e14ff).into()),
-                        title_bar_background: Some(rgba(0x0b0e14ff).into()),
-                        toolbar_background: Some(rgba(0x0b0e14ff).into()),
-                        tab_bar_background: Some(rgba(0x0b0e14ff).into()),
-                        tab_inactive_background: Some(rgba(0x0b0e14ff).into()),
-                        tab_active_background: Some(rgba(0x0b0e14ff).into()),
-                        scrollbar_thumb_background: Some(rgba(0x565b6666).into()),
-                        scrollbar_thumb_hover_background: Some(rgba(0x565b6699).into()),
-                        scrollbar_thumb_border: Some(rgba(0x565b6666).into()),
-                        scrollbar_track_background: Some(rgba(0x0b0e14ff).into()),
-                        scrollbar_track_border: Some(rgba(0x1e232bff).into()),
-                        editor_foreground: Some(rgba(0xbfbdb6ff).into()),
-                        editor_background: Some(rgba(0x0b0e14ff).into()),
-                        editor_gutter_background: Some(rgba(0x0b0e14ff).into()),
-                        editor_line_number: Some(rgba(0x6c738099).into()),
-                        editor_active_line_number: Some(rgba(0xbfbdb6ff).into()),
-                        editor_wrap_guide: Some(rgba(0x1e232bff).into()),
-                        editor_active_wrap_guide: Some(rgba(0x1e232bff).into()),
-                        terminal_background: Some(rgba(0x0b0e14ff).into()),
-                        terminal_ansi_bright_black: Some(rgba(0x686868ff).into()),
-                        terminal_ansi_bright_red: Some(rgba(0xf07178ff).into()),
-                        terminal_ansi_bright_green: Some(rgba(0xaad94cff).into()),
-                        terminal_ansi_bright_yellow: Some(rgba(0xffb454ff).into()),
-                        terminal_ansi_bright_blue: Some(rgba(0x59c2ffff).into()),
-                        terminal_ansi_bright_magenta: Some(rgba(0xd2a6ffff).into()),
-                        terminal_ansi_bright_cyan: Some(rgba(0x95e6cbff).into()),
-                        terminal_ansi_bright_white: Some(rgba(0xffffffff).into()),
-                        terminal_ansi_black: Some(rgba(0x1e232bff).into()),
-                        terminal_ansi_red: Some(rgba(0xea6c73ff).into()),
-                        terminal_ansi_green: Some(rgba(0x7fd962ff).into()),
-                        terminal_ansi_yellow: Some(rgba(0xf9af4fff).into()),
-                        terminal_ansi_blue: Some(rgba(0x53bdfaff).into()),
-                        terminal_ansi_magenta: Some(rgba(0xcda1faff).into()),
-                        terminal_ansi_cyan: Some(rgba(0x90e1c6ff).into()),
-                        terminal_ansi_white: Some(rgba(0xc7c7c7ff).into()),
-                        link_text_hover: Some(rgba(0xe6b450ff).into()),
+                        border: Some(rgba(0x53565dff).into()),
+                        border_variant: Some(rgba(0x53565dff).into()),
+                        elevated_surface_background: Some(rgba(0x464a52ff).into()),
+                        background: Some(rgba(0x464a52ff).into()),
+                        panel_background: Some(rgba(0x353944ff).into()),
+                        element_hover: Some(rgba(0x53565d80).into()),
+                        element_selected: Some(rgba(0x63656a80).into()),
+                        text: Some(rgba(0x9a9a98ff).into()),
+                        text_muted: Some(rgba(0x6b6d71ff).into()),
+                        status_bar_background: Some(rgba(0x464a52ff).into()),
+                        title_bar_background: Some(rgba(0x464a52ff).into()),
+                        toolbar_background: Some(rgba(0x242936ff).into()),
+                        tab_bar_background: Some(rgba(0x353944ff).into()),
+                        tab_inactive_background: Some(rgba(0x353944ff).into()),
+                        tab_active_background: Some(rgba(0x242936ff).into()),
+                        scrollbar_thumb_background: Some(rgba(0xcccac24d).into()),
+                        scrollbar_thumb_hover_background: Some(rgba(0xcccac24d).into()),
+                        scrollbar_thumb_border: Some(rgba(0x323641ff).into()),
+                        scrollbar_track_border: Some(rgba(0x323641ff).into()),
+                        editor_foreground: Some(rgba(0xcccac2ff).into()),
+                        editor_background: Some(rgba(0x242936ff).into()),
+                        editor_gutter_background: Some(rgba(0x242936ff).into()),
+                        editor_line_number: Some(rgba(0xcccac259).into()),
+                        editor_active_line_number: Some(rgba(0xcccac2ff).into()),
+                        editor_wrap_guide: Some(rgba(0xcccac20d).into()),
+                        editor_active_wrap_guide: Some(rgba(0xcccac21a).into()),
+                        terminal_background: Some(rgba(0x242936ff).into()),
+                        terminal_ansi_bright_black: Some(rgba(0x67696eff).into()),
+                        terminal_ansi_bright_red: Some(rgba(0x83403dff).into()),
+                        terminal_ansi_bright_green: Some(rgba(0x76993dff).into()),
+                        terminal_ansi_bright_yellow: Some(rgba(0x937238ff).into()),
+                        terminal_ansi_bright_blue: Some(rgba(0x346e8dff).into()),
+                        terminal_ansi_bright_magenta: Some(rgba(0x2b6c7bff).into()),
+                        terminal_ansi_bright_cyan: Some(rgba(0x4c806fff).into()),
+                        terminal_ansi_bright_white: Some(rgba(0xcccac2ff).into()),
+                        terminal_ansi_black: Some(rgba(0x242936ff).into()),
+                        terminal_ansi_red: Some(rgba(0xf18779ff).into()),
+                        terminal_ansi_green: Some(rgba(0xd5fe80ff).into()),
+                        terminal_ansi_yellow: Some(rgba(0xfed073ff).into()),
+                        terminal_ansi_blue: Some(rgba(0x73cffeff).into()),
+                        terminal_ansi_magenta: Some(rgba(0x5ccee5ff).into()),
+                        terminal_ansi_cyan: Some(rgba(0x95e5cbff).into()),
+                        terminal_ansi_white: Some(rgba(0xcccac2ff).into()),
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
-                        created: Some(rgba(0x7fd962cc).into()),
-                        deleted: Some(rgba(0xf26d78cc).into()),
-                        error: Some(rgba(0xd95757ff).into()),
-                        hidden: Some(rgba(0x565b66ff).into()),
-                        hint: Some(rgba(0x969696ff).into()),
-                        ignored: Some(rgba(0x565b6680).into()),
-                        modified: Some(rgba(0x73b8ffcc).into()),
+                        created: Some(rgba(0xd5fe80ff).into()),
+                        deleted: Some(rgba(0xc46a60ff).into()),
+                        error: Some(rgba(0xf18779ff).into()),
+                        modified: Some(rgba(0xfed073ff).into()),
+                        success: Some(rgba(0xcccac2ff).into()),
+                        warning: Some(rgba(0xfed073ff).into()),
                         ..Default::default()
                     },
                     syntax: Some(UserSyntaxTheme {
@@ -708,235 +750,271 @@ pub fn ayu() -> UserThemeFamily {
                             (
                                 "attribute".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xffb454ff).into()),
+                                    color: Some(rgba(0x73cffeff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "boolean".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xd2a6ffff).into()),
+                                    color: Some(rgba(0xdfbfffff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "comment".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xacb6bf8c).into()),
-                                    font_style: Some(UserFontStyle::Italic),
+                                    color: Some(rgba(0xb8cfe680).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "comment.doc".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xacb6bf8c).into()),
-                                    font_style: Some(UserFontStyle::Italic),
+                                    color: Some(rgba(0x9b9b99ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "constant".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xd2a6ffff).into()),
+                                    color: Some(rgba(0xdfbfffff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "constructor".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x39bae6ff).into()),
+                                    color: Some(rgba(0x73cffeff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "embedded".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xbfbdb6ff).into()),
+                                    color: Some(rgba(0xcccac2ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "emphasis".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xf07178ff).into()),
-                                    font_style: Some(UserFontStyle::Italic),
+                                    color: Some(rgba(0x73cffeff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "emphasis.strong".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xf07178ff).into()),
+                                    color: Some(rgba(0x73cffeff).into()),
                                     font_weight: Some(UserFontWeight(700.0)),
                                     ..Default::default()
                                 },
                             ),
+                            (
+                                "enum".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xfead66ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
                             (
                                 "function".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xffb454ff).into()),
+                                    color: Some(rgba(0xffd173ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "hint".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7399a3ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "keyword".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xff8f40ff).into()),
+                                    color: Some(rgba(0xffad66ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "label".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xaad94cff).into()),
+                                    color: Some(rgba(0x73cffeff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "link_text".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x39bae6ff).into()),
+                                    color: Some(rgba(0xfead66ff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "link_uri".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x39bae6ff).into()),
+                                    color: Some(rgba(0xd5fe80ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "number".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xd2a6ffff).into()),
+                                    color: Some(rgba(0xdfbfffff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "operator".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xf29668ff).into()),
+                                    color: Some(rgba(0xf29e74ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "predictive".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x6d839bff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "preproc".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xcccac2ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "primary".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xcccac2ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "property".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xf07178ff).into()),
+                                    color: Some(rgba(0x73cffeff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xbfbdb6ff).into()),
+                                    color: Some(rgba(0xb4b3aeff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation.bracket".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x39bae680).into()),
+                                    color: Some(rgba(0xb4b3aeff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation.delimiter".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xbfbdb6b3).into()),
+                                    color: Some(rgba(0xb4b3aeff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation.list_marker".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xffb454ff).into()),
+                                    color: Some(rgba(0xb4b3aeff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation.special".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xbfbdb6ff).into()),
+                                    color: Some(rgba(0xdfbfffff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xaad94cff).into()),
+                                    color: Some(rgba(0xd5ff80ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string.escape".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x95e6cbff).into()),
+                                    color: Some(rgba(0x9b9b99ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string.regex".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xaad94cff).into()),
+                                    color: Some(rgba(0x95e6cbff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string.special".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xaad94cff).into()),
+                                    color: Some(rgba(0xffdfb3ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string.special.symbol".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xaad94cff).into()),
+                                    color: Some(rgba(0xfead66ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "tag".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x39bae6ff).into()),
+                                    color: Some(rgba(0x73cffeff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "text.literal".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xaad94cff).into()),
+                                    color: Some(rgba(0xfead66ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "title".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x59c2ffff).into()),
+                                    color: Some(rgba(0xcccac2ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "type".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x39bae6ff).into()),
+                                    color: Some(rgba(0x73d0ffff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "variable".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xbfbdb6ff).into()),
+                                    color: Some(rgba(0xcccac2ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
-                                "variable.special".into(),
+                                "variant".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xf07178ff).into()),
+                                    color: Some(rgba(0x73cffeff).into()),
                                     ..Default::default()
                                 },
                             ),

crates/theme2/src/themes/dracula.rs πŸ”—

@@ -1,250 +0,0 @@
-// This file was generated by the `theme_importer`.
-// Be careful when modifying it by hand.
-
-use gpui::rgba;
-
-#[allow(unused)]
-use crate::{
-    Appearance, StatusColorsRefinement, ThemeColorsRefinement, UserFontStyle, UserFontWeight,
-    UserHighlightStyle, UserSyntaxTheme, UserTheme, UserThemeFamily, UserThemeStylesRefinement,
-};
-
-pub fn dracula() -> UserThemeFamily {
-    UserThemeFamily {
-        name: "Dracula".into(),
-        author: "Zeno Rocha".into(),
-        themes: vec![UserTheme {
-            name: "Dracula".into(),
-            appearance: Appearance::Dark,
-            styles: UserThemeStylesRefinement {
-                colors: ThemeColorsRefinement {
-                    border: Some(rgba(0xbd93f9ff).into()),
-                    border_variant: Some(rgba(0xbd93f9ff).into()),
-                    border_focused: Some(rgba(0x6272a4ff).into()),
-                    border_selected: Some(rgba(0xbd93f9ff).into()),
-                    border_transparent: Some(rgba(0xbd93f9ff).into()),
-                    border_disabled: Some(rgba(0xbd93f9ff).into()),
-                    elevated_surface_background: Some(rgba(0x343746ff).into()),
-                    surface_background: Some(rgba(0x282a36ff).into()),
-                    background: Some(rgba(0x282a36ff).into()),
-                    element_background: Some(rgba(0x44475aff).into()),
-                    element_hover: Some(rgba(0x44475a75).into()),
-                    element_selected: Some(rgba(0x44475aff).into()),
-                    drop_target_background: Some(rgba(0x44475aff).into()),
-                    ghost_element_hover: Some(rgba(0x44475a75).into()),
-                    ghost_element_selected: Some(rgba(0x44475aff).into()),
-                    text: Some(rgba(0xf8f8f2ff).into()),
-                    text_muted: Some(rgba(0x6272a4ff).into()),
-                    status_bar_background: Some(rgba(0x191a21ff).into()),
-                    title_bar_background: Some(rgba(0x21222cff).into()),
-                    toolbar_background: Some(rgba(0x282a36ff).into()),
-                    tab_bar_background: Some(rgba(0x191a21ff).into()),
-                    tab_inactive_background: Some(rgba(0x21222cff).into()),
-                    tab_active_background: Some(rgba(0x282a36ff).into()),
-                    scrollbar_track_background: Some(rgba(0x282a36ff).into()),
-                    scrollbar_track_border: Some(rgba(0x191a21ff).into()),
-                    editor_foreground: Some(rgba(0xf8f8f2ff).into()),
-                    editor_background: Some(rgba(0x282a36ff).into()),
-                    editor_gutter_background: Some(rgba(0x282a36ff).into()),
-                    editor_line_number: Some(rgba(0x6272a4ff).into()),
-                    editor_active_line_number: Some(rgba(0xf8f8f2ff).into()),
-                    editor_wrap_guide: Some(rgba(0xbd93f9ff).into()),
-                    editor_active_wrap_guide: Some(rgba(0xbd93f9ff).into()),
-                    terminal_background: Some(rgba(0x282a36ff).into()),
-                    terminal_ansi_bright_black: Some(rgba(0x6272a4ff).into()),
-                    terminal_ansi_bright_red: Some(rgba(0xff6e6eff).into()),
-                    terminal_ansi_bright_green: Some(rgba(0x69ff94ff).into()),
-                    terminal_ansi_bright_yellow: Some(rgba(0xffffa5ff).into()),
-                    terminal_ansi_bright_blue: Some(rgba(0xd6acffff).into()),
-                    terminal_ansi_bright_magenta: Some(rgba(0xff92dfff).into()),
-                    terminal_ansi_bright_cyan: Some(rgba(0xa4ffffff).into()),
-                    terminal_ansi_bright_white: Some(rgba(0xffffffff).into()),
-                    terminal_ansi_black: Some(rgba(0x21222cff).into()),
-                    terminal_ansi_red: Some(rgba(0xff5555ff).into()),
-                    terminal_ansi_green: Some(rgba(0x50fa7bff).into()),
-                    terminal_ansi_yellow: Some(rgba(0xf1fa8cff).into()),
-                    terminal_ansi_blue: Some(rgba(0xbd93f9ff).into()),
-                    terminal_ansi_magenta: Some(rgba(0xff79c6ff).into()),
-                    terminal_ansi_cyan: Some(rgba(0x8be9fdff).into()),
-                    terminal_ansi_white: Some(rgba(0xf8f8f2ff).into()),
-                    ..Default::default()
-                },
-                status: StatusColorsRefinement {
-                    conflict: Some(rgba(0xffb86cff).into()),
-                    created: Some(rgba(0x50fa7b80).into()),
-                    deleted: Some(rgba(0xff555580).into()),
-                    error: Some(rgba(0xff5555ff).into()),
-                    hidden: Some(rgba(0x6272a4ff).into()),
-                    hint: Some(rgba(0x969696ff).into()),
-                    ignored: Some(rgba(0x6272a4ff).into()),
-                    modified: Some(rgba(0x8be9fd80).into()),
-                    warning: Some(rgba(0xffb86cff).into()),
-                    ..Default::default()
-                },
-                syntax: Some(UserSyntaxTheme {
-                    highlights: vec![
-                        (
-                            "attribute".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0x50fa7bff).into()),
-                                font_style: Some(UserFontStyle::Italic),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "comment".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0x6272a4ff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "comment.doc".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0x6272a4ff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "constant".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0xbd93f9ff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "constructor".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0xff79c6ff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "emphasis".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0xf1fa8cff).into()),
-                                font_style: Some(UserFontStyle::Italic),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "emphasis.strong".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0xffb86cff).into()),
-                                font_weight: Some(UserFontWeight(700.0)),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "function".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0x50fa7bff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "keyword".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0xff79c6ff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "link_text".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0x8be9fdff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "link_uri".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0x8be9fdff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "number".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0xbd93f9ff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "string".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0xf1fa8cff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "string.escape".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0xf1fa8cff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "string.regex".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0xf1fa8cff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "string.special".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0xf1fa8cff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "string.special.symbol".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0xf1fa8cff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "tag".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0xff79c6ff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "text.literal".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0xf1fa8cff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "type".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0x8be9fdff).into()),
-                                font_style: Some(UserFontStyle::Italic),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "variable".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0xf8f8f2ff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "variable.special".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0xbd93f9ff).into()),
-                                font_style: Some(UserFontStyle::Italic),
-                                ..Default::default()
-                            },
-                        ),
-                    ],
-                }),
-            },
-        }],
-    }
-}

crates/theme2/src/themes/gruvbox.rs πŸ”—

@@ -12,76 +12,65 @@ use crate::{
 pub fn gruvbox() -> UserThemeFamily {
     UserThemeFamily {
         name: "Gruvbox".into(),
-        author: "morhetz".into(),
+        author: "Zed Industries".into(),
         themes: vec![
             UserTheme {
-                name: "Gruvbox Dark Hard".into(),
-                appearance: Appearance::Dark,
+                name: "Gruvbox Light Hard".into(),
+                appearance: Appearance::Light,
                 styles: UserThemeStylesRefinement {
                     colors: ThemeColorsRefinement {
-                        border: Some(rgba(0x3c3836ff).into()),
-                        border_variant: Some(rgba(0x3c3836ff).into()),
-                        border_focused: Some(rgba(0x3c3836ff).into()),
-                        border_selected: Some(rgba(0x3c3836ff).into()),
-                        border_transparent: Some(rgba(0x3c3836ff).into()),
-                        border_disabled: Some(rgba(0x3c3836ff).into()),
-                        elevated_surface_background: Some(rgba(0x1d2021ff).into()),
-                        background: Some(rgba(0x1d2021ff).into()),
-                        element_background: Some(rgba(0x45858880).into()),
-                        element_hover: Some(rgba(0x3c383680).into()),
-                        element_selected: Some(rgba(0x3c383680).into()),
-                        drop_target_background: Some(rgba(0x3c3836ff).into()),
-                        ghost_element_hover: Some(rgba(0x3c383680).into()),
-                        ghost_element_selected: Some(rgba(0x3c383680).into()),
-                        text: Some(rgba(0xebdbb2ff).into()),
-                        text_muted: Some(rgba(0xa89984ff).into()),
-                        status_bar_background: Some(rgba(0x1d2021ff).into()),
-                        title_bar_background: Some(rgba(0x1d2021ff).into()),
-                        toolbar_background: Some(rgba(0x1d2021ff).into()),
-                        tab_bar_background: Some(rgba(0x1d2021ff).into()),
-                        tab_inactive_background: Some(rgba(0x1d2021ff).into()),
-                        tab_active_background: Some(rgba(0x32302fff).into()),
-                        scrollbar_thumb_background: Some(rgba(0x50494599).into()),
-                        scrollbar_thumb_hover_background: Some(rgba(0x665c54ff).into()),
-                        scrollbar_thumb_border: Some(rgba(0x50494599).into()),
-                        scrollbar_track_background: Some(rgba(0x1d2021ff).into()),
-                        scrollbar_track_border: Some(rgba(0x1d202100).into()),
-                        editor_foreground: Some(rgba(0xebdbb2ff).into()),
-                        editor_background: Some(rgba(0x1d2021ff).into()),
-                        editor_gutter_background: Some(rgba(0x1d2021ff).into()),
-                        editor_line_number: Some(rgba(0x665c54ff).into()),
-                        editor_active_line_number: Some(rgba(0xebdbb2ff).into()),
-                        editor_wrap_guide: Some(rgba(0x3c3836ff).into()),
-                        editor_active_wrap_guide: Some(rgba(0x3c3836ff).into()),
-                        terminal_background: Some(rgba(0x1d2021ff).into()),
-                        terminal_ansi_bright_black: Some(rgba(0x928374ff).into()),
-                        terminal_ansi_bright_red: Some(rgba(0xfb4934ff).into()),
-                        terminal_ansi_bright_green: Some(rgba(0xb8bb26ff).into()),
-                        terminal_ansi_bright_yellow: Some(rgba(0xfabd2fff).into()),
-                        terminal_ansi_bright_blue: Some(rgba(0x83a598ff).into()),
-                        terminal_ansi_bright_magenta: Some(rgba(0xd3869bff).into()),
-                        terminal_ansi_bright_cyan: Some(rgba(0x8ec07cff).into()),
-                        terminal_ansi_bright_white: Some(rgba(0xebdbb2ff).into()),
-                        terminal_ansi_black: Some(rgba(0x3c3836ff).into()),
-                        terminal_ansi_red: Some(rgba(0xcc241dff).into()),
-                        terminal_ansi_green: Some(rgba(0x98971aff).into()),
-                        terminal_ansi_yellow: Some(rgba(0xd79921ff).into()),
-                        terminal_ansi_blue: Some(rgba(0x458588ff).into()),
-                        terminal_ansi_magenta: Some(rgba(0xb16286ff).into()),
-                        terminal_ansi_cyan: Some(rgba(0x689d6aff).into()),
-                        terminal_ansi_white: Some(rgba(0xa89984ff).into()),
-                        link_text_hover: Some(rgba(0x458588ff).into()),
+                        border: Some(rgba(0xc9b99aff).into()),
+                        border_variant: Some(rgba(0xc9b99aff).into()),
+                        elevated_surface_background: Some(rgba(0xd9c8a4ff).into()),
+                        background: Some(rgba(0xd9c8a4ff).into()),
+                        panel_background: Some(rgba(0xecddb5ff).into()),
+                        element_hover: Some(rgba(0xc9b99a80).into()),
+                        element_selected: Some(rgba(0xb5a68e80).into()),
+                        text: Some(rgba(0x5f5650ff).into()),
+                        text_muted: Some(rgba(0xad9e87ff).into()),
+                        status_bar_background: Some(rgba(0xd9c8a4ff).into()),
+                        title_bar_background: Some(rgba(0xd9c8a4ff).into()),
+                        toolbar_background: Some(rgba(0xf9f5d7ff).into()),
+                        tab_bar_background: Some(rgba(0xecddb5ff).into()),
+                        tab_inactive_background: Some(rgba(0xecddb5ff).into()),
+                        tab_active_background: Some(rgba(0xf9f5d7ff).into()),
+                        scrollbar_thumb_background: Some(rgba(0x2828284d).into()),
+                        scrollbar_thumb_hover_background: Some(rgba(0x2828284d).into()),
+                        scrollbar_thumb_border: Some(rgba(0xefe2bcff).into()),
+                        scrollbar_track_border: Some(rgba(0xefe2bcff).into()),
+                        editor_foreground: Some(rgba(0x282828ff).into()),
+                        editor_background: Some(rgba(0xf9f5d7ff).into()),
+                        editor_gutter_background: Some(rgba(0xf9f5d7ff).into()),
+                        editor_line_number: Some(rgba(0x28282859).into()),
+                        editor_active_line_number: Some(rgba(0x282828ff).into()),
+                        editor_wrap_guide: Some(rgba(0x2828280d).into()),
+                        editor_active_wrap_guide: Some(rgba(0x2828281a).into()),
+                        terminal_background: Some(rgba(0xf9f5d7ff).into()),
+                        terminal_ansi_bright_black: Some(rgba(0xb1a28aff).into()),
+                        terminal_ansi_bright_red: Some(rgba(0xdc8c7bff).into()),
+                        terminal_ansi_bright_green: Some(rgba(0xbfb787ff).into()),
+                        terminal_ansi_bright_yellow: Some(rgba(0xe2b88bff).into()),
+                        terminal_ansi_bright_blue: Some(rgba(0x8fb0baff).into()),
+                        terminal_ansi_bright_magenta: Some(rgba(0xbcb5afff).into()),
+                        terminal_ansi_bright_cyan: Some(rgba(0x9fbca8ff).into()),
+                        terminal_ansi_bright_white: Some(rgba(0x282828ff).into()),
+                        terminal_ansi_black: Some(rgba(0xf9f5d7ff).into()),
+                        terminal_ansi_red: Some(rgba(0x9d0408ff).into()),
+                        terminal_ansi_green: Some(rgba(0x797410ff).into()),
+                        terminal_ansi_yellow: Some(rgba(0xb57616ff).into()),
+                        terminal_ansi_blue: Some(rgba(0x0b6678ff).into()),
+                        terminal_ansi_magenta: Some(rgba(0x7c6f64ff).into()),
+                        terminal_ansi_cyan: Some(rgba(0x437b59ff).into()),
+                        terminal_ansi_white: Some(rgba(0x282828ff).into()),
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
-                        conflict: Some(rgba(0xb16286ff).into()),
-                        created: Some(rgba(0xb8bb26ff).into()),
-                        deleted: Some(rgba(0xfb4934ff).into()),
-                        error: Some(rgba(0xfb4934ff).into()),
-                        hidden: Some(rgba(0xa89984ff).into()),
-                        hint: Some(rgba(0x969696ff).into()),
-                        ignored: Some(rgba(0x7c6f64ff).into()),
-                        modified: Some(rgba(0x83a598ff).into()),
+                        created: Some(rgba(0x958e43ff).into()),
+                        deleted: Some(rgba(0x9d0408ff).into()),
+                        error: Some(rgba(0x9d0408ff).into()),
+                        modified: Some(rgba(0xb57616ff).into()),
+                        success: Some(rgba(0x282828ff).into()),
+                        warning: Some(rgba(0xb57616ff).into()),
                         ..Default::default()
                     },
                     syntax: Some(UserSyntaxTheme {
@@ -89,220 +78,278 @@ pub fn gruvbox() -> UserThemeFamily {
                             (
                                 "attribute".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xfabd2fff).into()),
+                                    color: Some(rgba(0x0b6678ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "boolean".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x8f3f71ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "comment".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x928374ff).into()),
-                                    font_style: Some(UserFontStyle::Italic),
+                                    color: Some(rgba(0x7c6f64ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "comment.doc".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x928374ff).into()),
-                                    font_style: Some(UserFontStyle::Italic),
+                                    color: Some(rgba(0x5d544eff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "constant".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xd3869bff).into()),
+                                    color: Some(rgba(0xb57614ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "constructor".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x8ec07cff).into()),
+                                    color: Some(rgba(0x0b6678ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "embedded".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x427b58ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "emphasis".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x0b6678ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "emphasis.strong".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xfe8019ff).into()),
+                                    color: Some(rgba(0x0b6678ff).into()),
                                     font_weight: Some(UserFontWeight(700.0)),
                                     ..Default::default()
                                 },
                             ),
+                            (
+                                "enum".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xaf3a03ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
                             (
                                 "function".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x8ec07cff).into()),
+                                    color: Some(rgba(0x79740eff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function.builtin".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x9d0006ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "hint".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x677562ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "keyword".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xfb4934ff).into()),
+                                    color: Some(rgba(0x9d0006ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "label".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xfabd2fff).into()),
+                                    color: Some(rgba(0x0b6678ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "link_text".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xd3869bff).into()),
+                                    color: Some(rgba(0x427b58ff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "link_uri".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xd3869bff).into()),
+                                    color: Some(rgba(0x8f3f71ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "number".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xd3869bff).into()),
+                                    color: Some(rgba(0x8f3f71ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "operator".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x8ec07cff).into()),
+                                    color: Some(rgba(0x427b58ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "predictive".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7d9881ff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "preproc".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xfe8019ff).into()),
+                                    color: Some(rgba(0x282828ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "primary".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x282828ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "property".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x689d6aff).into()),
+                                    color: Some(rgba(0x282828ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xa89984ff).into()),
+                                    color: Some(rgba(0x3c3836ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation.bracket".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xa89984ff).into()),
+                                    color: Some(rgba(0x665c54ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation.delimiter".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xa89984ff).into()),
+                                    color: Some(rgba(0x413d3aff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation.list_marker".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xa89984ff).into()),
+                                    color: Some(rgba(0x282828ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation.special".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xa89984ff).into()),
+                                    color: Some(rgba(0x413d3aff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xb8bb26ff).into()),
+                                    color: Some(rgba(0x79740eff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string.escape".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xfb4934ff).into()),
+                                    color: Some(rgba(0x5d544eff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string.regex".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xb8bb26ff).into()),
+                                    color: Some(rgba(0xaf3a03ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string.special".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xb8bb26ff).into()),
+                                    color: Some(rgba(0x8f3f71ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string.special.symbol".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xb8bb26ff).into()),
+                                    color: Some(rgba(0x427b58ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "tag".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x8ec07cff).into()),
+                                    color: Some(rgba(0x427b58ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "text.literal".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xb8bb26ff).into()),
+                                    color: Some(rgba(0x076678ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "title".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xfabd2fff).into()),
+                                    color: Some(rgba(0x79740eff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "type".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xfabd2fff).into()),
+                                    color: Some(rgba(0xb57614ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "variable".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x83a598ff).into()),
+                                    color: Some(rgba(0x076678ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
-                                "variable.special".into(),
+                                "variant".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x83a598ff).into()),
+                                    color: Some(rgba(0x0b6678ff).into()),
                                     ..Default::default()
                                 },
                             ),
@@ -311,73 +358,62 @@ pub fn gruvbox() -> UserThemeFamily {
                 },
             },
             UserTheme {
-                name: "Gruvbox Dark Medium".into(),
+                name: "Gruvbox Dark Soft".into(),
                 appearance: Appearance::Dark,
                 styles: UserThemeStylesRefinement {
                     colors: ThemeColorsRefinement {
-                        border: Some(rgba(0x3c3836ff).into()),
-                        border_variant: Some(rgba(0x3c3836ff).into()),
-                        border_focused: Some(rgba(0x3c3836ff).into()),
-                        border_selected: Some(rgba(0x3c3836ff).into()),
-                        border_transparent: Some(rgba(0x3c3836ff).into()),
-                        border_disabled: Some(rgba(0x3c3836ff).into()),
-                        elevated_surface_background: Some(rgba(0x282828ff).into()),
-                        background: Some(rgba(0x282828ff).into()),
-                        element_background: Some(rgba(0x45858880).into()),
-                        element_hover: Some(rgba(0x3c383680).into()),
-                        element_selected: Some(rgba(0x3c383680).into()),
-                        drop_target_background: Some(rgba(0x3c3836ff).into()),
-                        ghost_element_hover: Some(rgba(0x3c383680).into()),
-                        ghost_element_selected: Some(rgba(0x3c383680).into()),
-                        text: Some(rgba(0xebdbb2ff).into()),
-                        text_muted: Some(rgba(0xa89984ff).into()),
-                        status_bar_background: Some(rgba(0x282828ff).into()),
-                        title_bar_background: Some(rgba(0x282828ff).into()),
-                        toolbar_background: Some(rgba(0x282828ff).into()),
-                        tab_bar_background: Some(rgba(0x282828ff).into()),
-                        tab_inactive_background: Some(rgba(0x282828ff).into()),
-                        tab_active_background: Some(rgba(0x3c3836ff).into()),
-                        scrollbar_thumb_background: Some(rgba(0x50494599).into()),
-                        scrollbar_thumb_hover_background: Some(rgba(0x665c54ff).into()),
-                        scrollbar_thumb_border: Some(rgba(0x50494599).into()),
-                        scrollbar_track_background: Some(rgba(0x282828ff).into()),
-                        scrollbar_track_border: Some(rgba(0x28282800).into()),
+                        border: Some(rgba(0x5b534dff).into()),
+                        border_variant: Some(rgba(0x5b534dff).into()),
+                        elevated_surface_background: Some(rgba(0x4c4642ff).into()),
+                        background: Some(rgba(0x4c4642ff).into()),
+                        panel_background: Some(rgba(0x3b3735ff).into()),
+                        element_hover: Some(rgba(0x5b534d80).into()),
+                        element_selected: Some(rgba(0x6e635a80).into()),
+                        text: Some(rgba(0xc5b597ff).into()),
+                        text_muted: Some(rgba(0x776b61ff).into()),
+                        status_bar_background: Some(rgba(0x4c4642ff).into()),
+                        title_bar_background: Some(rgba(0x4c4642ff).into()),
+                        toolbar_background: Some(rgba(0x32302fff).into()),
+                        tab_bar_background: Some(rgba(0x3b3735ff).into()),
+                        tab_inactive_background: Some(rgba(0x3b3735ff).into()),
+                        tab_active_background: Some(rgba(0x32302fff).into()),
+                        scrollbar_thumb_background: Some(rgba(0xfbf1c74d).into()),
+                        scrollbar_thumb_hover_background: Some(rgba(0xfbf1c74d).into()),
+                        scrollbar_thumb_border: Some(rgba(0x393634ff).into()),
+                        scrollbar_track_border: Some(rgba(0x393634ff).into()),
                         editor_foreground: Some(rgba(0xebdbb2ff).into()),
-                        editor_background: Some(rgba(0x282828ff).into()),
-                        editor_gutter_background: Some(rgba(0x282828ff).into()),
-                        editor_line_number: Some(rgba(0x665c54ff).into()),
-                        editor_active_line_number: Some(rgba(0xebdbb2ff).into()),
-                        editor_wrap_guide: Some(rgba(0x3c3836ff).into()),
-                        editor_active_wrap_guide: Some(rgba(0x3c3836ff).into()),
-                        terminal_background: Some(rgba(0x282828ff).into()),
-                        terminal_ansi_bright_black: Some(rgba(0x928374ff).into()),
-                        terminal_ansi_bright_red: Some(rgba(0xfb4934ff).into()),
-                        terminal_ansi_bright_green: Some(rgba(0xb8bb26ff).into()),
-                        terminal_ansi_bright_yellow: Some(rgba(0xfabd2fff).into()),
-                        terminal_ansi_bright_blue: Some(rgba(0x83a598ff).into()),
-                        terminal_ansi_bright_magenta: Some(rgba(0xd3869bff).into()),
-                        terminal_ansi_bright_cyan: Some(rgba(0x8ec07cff).into()),
-                        terminal_ansi_bright_white: Some(rgba(0xebdbb2ff).into()),
-                        terminal_ansi_black: Some(rgba(0x3c3836ff).into()),
-                        terminal_ansi_red: Some(rgba(0xcc241dff).into()),
-                        terminal_ansi_green: Some(rgba(0x98971aff).into()),
-                        terminal_ansi_yellow: Some(rgba(0xd79921ff).into()),
-                        terminal_ansi_blue: Some(rgba(0x458588ff).into()),
-                        terminal_ansi_magenta: Some(rgba(0xb16286ff).into()),
-                        terminal_ansi_cyan: Some(rgba(0x689d6aff).into()),
-                        terminal_ansi_white: Some(rgba(0xa89984ff).into()),
-                        link_text_hover: Some(rgba(0x458588ff).into()),
+                        editor_background: Some(rgba(0x32302fff).into()),
+                        editor_gutter_background: Some(rgba(0x32302fff).into()),
+                        editor_line_number: Some(rgba(0xfbf1c759).into()),
+                        editor_active_line_number: Some(rgba(0xfbf1c7ff).into()),
+                        editor_wrap_guide: Some(rgba(0xfbf1c70d).into()),
+                        editor_active_wrap_guide: Some(rgba(0xfbf1c71a).into()),
+                        terminal_background: Some(rgba(0x32302fff).into()),
+                        terminal_ansi_bright_black: Some(rgba(0x73675eff).into()),
+                        terminal_ansi_bright_red: Some(rgba(0x93211eff).into()),
+                        terminal_ansi_bright_green: Some(rgba(0x615d1bff).into()),
+                        terminal_ansi_bright_yellow: Some(rgba(0x91611cff).into()),
+                        terminal_ansi_bright_blue: Some(rgba(0x414f4aff).into()),
+                        terminal_ansi_bright_magenta: Some(rgba(0x514a41ff).into()),
+                        terminal_ansi_bright_cyan: Some(rgba(0x45603eff).into()),
+                        terminal_ansi_bright_white: Some(rgba(0xfbf1c7ff).into()),
+                        terminal_ansi_black: Some(rgba(0x32302fff).into()),
+                        terminal_ansi_red: Some(rgba(0xfb4a35ff).into()),
+                        terminal_ansi_green: Some(rgba(0xb8bb27ff).into()),
+                        terminal_ansi_yellow: Some(rgba(0xf9bd30ff).into()),
+                        terminal_ansi_blue: Some(rgba(0x83a598ff).into()),
+                        terminal_ansi_magenta: Some(rgba(0xa89984ff).into()),
+                        terminal_ansi_cyan: Some(rgba(0x8ec07cff).into()),
+                        terminal_ansi_white: Some(rgba(0xfbf1c7ff).into()),
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
-                        conflict: Some(rgba(0xb16286ff).into()),
-                        created: Some(rgba(0xb8bb26ff).into()),
-                        deleted: Some(rgba(0xfb4934ff).into()),
-                        error: Some(rgba(0xfb4934ff).into()),
-                        hidden: Some(rgba(0xa89984ff).into()),
-                        hint: Some(rgba(0x969696ff).into()),
-                        ignored: Some(rgba(0x7c6f64ff).into()),
-                        modified: Some(rgba(0x83a598ff).into()),
+                        created: Some(rgba(0xb8bb27ff).into()),
+                        deleted: Some(rgba(0xd0382bff).into()),
+                        error: Some(rgba(0xfb4a35ff).into()),
+                        modified: Some(rgba(0xf9bd30ff).into()),
+                        success: Some(rgba(0xfbf1c7ff).into()),
+                        warning: Some(rgba(0xf9bd30ff).into()),
                         ..Default::default()
                     },
                     syntax: Some(UserSyntaxTheme {
@@ -385,52 +421,93 @@ pub fn gruvbox() -> UserThemeFamily {
                             (
                                 "attribute".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xfabd2fff).into()),
+                                    color: Some(rgba(0x83a598ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "boolean".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xd3869bff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "comment".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x928374ff).into()),
-                                    font_style: Some(UserFontStyle::Italic),
+                                    color: Some(rgba(0xa89984ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "comment.doc".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x928374ff).into()),
-                                    font_style: Some(UserFontStyle::Italic),
+                                    color: Some(rgba(0xc7b798ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "constant".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xd3869bff).into()),
+                                    color: Some(rgba(0xfabd2fff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "constructor".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x83a598ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "embedded".into(),
                                 UserHighlightStyle {
                                     color: Some(rgba(0x8ec07cff).into()),
                                     ..Default::default()
                                 },
                             ),
+                            (
+                                "emphasis".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x83a598ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
                             (
                                 "emphasis.strong".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xfe8019ff).into()),
+                                    color: Some(rgba(0x83a598ff).into()),
                                     font_weight: Some(UserFontWeight(700.0)),
                                     ..Default::default()
                                 },
                             ),
+                            (
+                                "enum".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xfe8019ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
                             (
                                 "function".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x8ec07cff).into()),
+                                    color: Some(rgba(0xb8bb26ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function.builtin".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xfb4934ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "hint".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x8d957eff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
                                     ..Default::default()
                                 },
                             ),
@@ -444,14 +521,15 @@ pub fn gruvbox() -> UserThemeFamily {
                             (
                                 "label".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xfabd2fff).into()),
+                                    color: Some(rgba(0x83a598ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "link_text".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xd3869bff).into()),
+                                    color: Some(rgba(0x8ec07cff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
                                     ..Default::default()
                                 },
                             ),
@@ -476,24 +554,39 @@ pub fn gruvbox() -> UserThemeFamily {
                                     ..Default::default()
                                 },
                             ),
+                            (
+                                "predictive".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x717363ff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
+                                    ..Default::default()
+                                },
+                            ),
                             (
                                 "preproc".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xfe8019ff).into()),
+                                    color: Some(rgba(0xfbf1c7ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "primary".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xebdbb2ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "property".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x689d6aff).into()),
+                                    color: Some(rgba(0xebdbb2ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xa89984ff).into()),
+                                    color: Some(rgba(0xd5c4a1ff).into()),
                                     ..Default::default()
                                 },
                             ),
@@ -507,21 +600,21 @@ pub fn gruvbox() -> UserThemeFamily {
                             (
                                 "punctuation.delimiter".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xa89984ff).into()),
+                                    color: Some(rgba(0xe5d5adff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation.list_marker".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xa89984ff).into()),
+                                    color: Some(rgba(0xebdbb2ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation.special".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xa89984ff).into()),
+                                    color: Some(rgba(0xe5d5adff).into()),
                                     ..Default::default()
                                 },
                             ),
@@ -535,28 +628,28 @@ pub fn gruvbox() -> UserThemeFamily {
                             (
                                 "string.escape".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xfb4934ff).into()),
+                                    color: Some(rgba(0xc7b798ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string.regex".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xb8bb26ff).into()),
+                                    color: Some(rgba(0xfe8019ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string.special".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xb8bb26ff).into()),
+                                    color: Some(rgba(0xd3869bff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string.special.symbol".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xb8bb26ff).into()),
+                                    color: Some(rgba(0x8ec07cff).into()),
                                     ..Default::default()
                                 },
                             ),
@@ -570,14 +663,15 @@ pub fn gruvbox() -> UserThemeFamily {
                             (
                                 "text.literal".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xb8bb26ff).into()),
+                                    color: Some(rgba(0x83a598ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "title".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xfabd2fff).into()),
+                                    color: Some(rgba(0xb8bb26ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
                                     ..Default::default()
                                 },
                             ),
@@ -596,7 +690,7 @@ pub fn gruvbox() -> UserThemeFamily {
                                 },
                             ),
                             (
-                                "variable.special".into(),
+                                "variant".into(),
                                 UserHighlightStyle {
                                     color: Some(rgba(0x83a598ff).into()),
                                     ..Default::default()
@@ -607,73 +701,62 @@ pub fn gruvbox() -> UserThemeFamily {
                 },
             },
             UserTheme {
-                name: "Gruvbox Dark Soft".into(),
-                appearance: Appearance::Dark,
+                name: "Gruvbox Light".into(),
+                appearance: Appearance::Light,
                 styles: UserThemeStylesRefinement {
                     colors: ThemeColorsRefinement {
-                        border: Some(rgba(0x3c3836ff).into()),
-                        border_variant: Some(rgba(0x3c3836ff).into()),
-                        border_focused: Some(rgba(0x3c3836ff).into()),
-                        border_selected: Some(rgba(0x3c3836ff).into()),
-                        border_transparent: Some(rgba(0x3c3836ff).into()),
-                        border_disabled: Some(rgba(0x3c3836ff).into()),
-                        elevated_surface_background: Some(rgba(0x32302fff).into()),
-                        background: Some(rgba(0x32302fff).into()),
-                        element_background: Some(rgba(0x45858880).into()),
-                        element_hover: Some(rgba(0x3c383680).into()),
-                        element_selected: Some(rgba(0x3c383680).into()),
-                        drop_target_background: Some(rgba(0x3c3836ff).into()),
-                        ghost_element_hover: Some(rgba(0x3c383680).into()),
-                        ghost_element_selected: Some(rgba(0x3c383680).into()),
-                        text: Some(rgba(0xebdbb2ff).into()),
-                        text_muted: Some(rgba(0xa89984ff).into()),
-                        status_bar_background: Some(rgba(0x32302fff).into()),
-                        title_bar_background: Some(rgba(0x32302fff).into()),
-                        toolbar_background: Some(rgba(0x32302fff).into()),
-                        tab_bar_background: Some(rgba(0x32302fff).into()),
-                        tab_inactive_background: Some(rgba(0x32302fff).into()),
-                        tab_active_background: Some(rgba(0x504945ff).into()),
-                        scrollbar_thumb_background: Some(rgba(0x50494599).into()),
-                        scrollbar_thumb_hover_background: Some(rgba(0x665c54ff).into()),
-                        scrollbar_thumb_border: Some(rgba(0x50494599).into()),
-                        scrollbar_track_background: Some(rgba(0x32302fff).into()),
-                        scrollbar_track_border: Some(rgba(0x32302f00).into()),
-                        editor_foreground: Some(rgba(0xebdbb2ff).into()),
-                        editor_background: Some(rgba(0x32302fff).into()),
-                        editor_gutter_background: Some(rgba(0x32302fff).into()),
-                        editor_line_number: Some(rgba(0x665c54ff).into()),
-                        editor_active_line_number: Some(rgba(0xebdbb2ff).into()),
-                        editor_wrap_guide: Some(rgba(0x3c3836ff).into()),
-                        editor_active_wrap_guide: Some(rgba(0x3c3836ff).into()),
-                        terminal_background: Some(rgba(0x32302fff).into()),
-                        terminal_ansi_bright_black: Some(rgba(0x928374ff).into()),
-                        terminal_ansi_bright_red: Some(rgba(0xfb4934ff).into()),
-                        terminal_ansi_bright_green: Some(rgba(0xb8bb26ff).into()),
-                        terminal_ansi_bright_yellow: Some(rgba(0xfabd2fff).into()),
-                        terminal_ansi_bright_blue: Some(rgba(0x83a598ff).into()),
-                        terminal_ansi_bright_magenta: Some(rgba(0xd3869bff).into()),
-                        terminal_ansi_bright_cyan: Some(rgba(0x8ec07cff).into()),
-                        terminal_ansi_bright_white: Some(rgba(0xebdbb2ff).into()),
-                        terminal_ansi_black: Some(rgba(0x3c3836ff).into()),
-                        terminal_ansi_red: Some(rgba(0xcc241dff).into()),
-                        terminal_ansi_green: Some(rgba(0x98971aff).into()),
-                        terminal_ansi_yellow: Some(rgba(0xd79921ff).into()),
-                        terminal_ansi_blue: Some(rgba(0x458588ff).into()),
-                        terminal_ansi_magenta: Some(rgba(0xb16286ff).into()),
-                        terminal_ansi_cyan: Some(rgba(0x689d6aff).into()),
-                        terminal_ansi_white: Some(rgba(0xa89984ff).into()),
-                        link_text_hover: Some(rgba(0x458588ff).into()),
+                        border: Some(rgba(0xc9b99aff).into()),
+                        border_variant: Some(rgba(0xc9b99aff).into()),
+                        elevated_surface_background: Some(rgba(0xd9c8a4ff).into()),
+                        background: Some(rgba(0xd9c8a4ff).into()),
+                        panel_background: Some(rgba(0xecddb4ff).into()),
+                        element_hover: Some(rgba(0xc9b99a80).into()),
+                        element_selected: Some(rgba(0xb5a68e80).into()),
+                        text: Some(rgba(0x5f5650ff).into()),
+                        text_muted: Some(rgba(0xad9e87ff).into()),
+                        status_bar_background: Some(rgba(0xd9c8a4ff).into()),
+                        title_bar_background: Some(rgba(0xd9c8a4ff).into()),
+                        toolbar_background: Some(rgba(0xfbf1c7ff).into()),
+                        tab_bar_background: Some(rgba(0xecddb4ff).into()),
+                        tab_inactive_background: Some(rgba(0xecddb4ff).into()),
+                        tab_active_background: Some(rgba(0xfbf1c7ff).into()),
+                        scrollbar_thumb_background: Some(rgba(0x2828284d).into()),
+                        scrollbar_thumb_hover_background: Some(rgba(0x2828284d).into()),
+                        scrollbar_thumb_border: Some(rgba(0xefe1b8ff).into()),
+                        scrollbar_track_border: Some(rgba(0xefe1b8ff).into()),
+                        editor_foreground: Some(rgba(0x282828ff).into()),
+                        editor_background: Some(rgba(0xfbf1c7ff).into()),
+                        editor_gutter_background: Some(rgba(0xfbf1c7ff).into()),
+                        editor_line_number: Some(rgba(0x28282859).into()),
+                        editor_active_line_number: Some(rgba(0x282828ff).into()),
+                        editor_wrap_guide: Some(rgba(0x2828280d).into()),
+                        editor_active_wrap_guide: Some(rgba(0x2828281a).into()),
+                        terminal_background: Some(rgba(0xfbf1c7ff).into()),
+                        terminal_ansi_bright_black: Some(rgba(0xb1a28aff).into()),
+                        terminal_ansi_bright_red: Some(rgba(0xdc8c7bff).into()),
+                        terminal_ansi_bright_green: Some(rgba(0xbfb787ff).into()),
+                        terminal_ansi_bright_yellow: Some(rgba(0xe2b88bff).into()),
+                        terminal_ansi_bright_blue: Some(rgba(0x8fb0baff).into()),
+                        terminal_ansi_bright_magenta: Some(rgba(0xbcb5afff).into()),
+                        terminal_ansi_bright_cyan: Some(rgba(0x9fbca8ff).into()),
+                        terminal_ansi_bright_white: Some(rgba(0x282828ff).into()),
+                        terminal_ansi_black: Some(rgba(0xfbf1c7ff).into()),
+                        terminal_ansi_red: Some(rgba(0x9d0408ff).into()),
+                        terminal_ansi_green: Some(rgba(0x797410ff).into()),
+                        terminal_ansi_yellow: Some(rgba(0xb57616ff).into()),
+                        terminal_ansi_blue: Some(rgba(0x0b6678ff).into()),
+                        terminal_ansi_magenta: Some(rgba(0x7c6f64ff).into()),
+                        terminal_ansi_cyan: Some(rgba(0x437b59ff).into()),
+                        terminal_ansi_white: Some(rgba(0x282828ff).into()),
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
-                        conflict: Some(rgba(0xb16286ff).into()),
-                        created: Some(rgba(0xb8bb26ff).into()),
-                        deleted: Some(rgba(0xfb4934ff).into()),
-                        error: Some(rgba(0xfb4934ff).into()),
-                        hidden: Some(rgba(0xa89984ff).into()),
-                        hint: Some(rgba(0x969696ff).into()),
-                        ignored: Some(rgba(0x7c6f64ff).into()),
-                        modified: Some(rgba(0x83a598ff).into()),
+                        created: Some(rgba(0x958e43ff).into()),
+                        deleted: Some(rgba(0x9d0408ff).into()),
+                        error: Some(rgba(0x9d0408ff).into()),
+                        modified: Some(rgba(0xb57616ff).into()),
+                        success: Some(rgba(0x282828ff).into()),
+                        warning: Some(rgba(0xb57616ff).into()),
                         ..Default::default()
                     },
                     syntax: Some(UserSyntaxTheme {
@@ -681,220 +764,278 @@ pub fn gruvbox() -> UserThemeFamily {
                             (
                                 "attribute".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xfabd2fff).into()),
+                                    color: Some(rgba(0x0b6678ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "boolean".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x8f3f71ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "comment".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x928374ff).into()),
-                                    font_style: Some(UserFontStyle::Italic),
+                                    color: Some(rgba(0x7c6f64ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "comment.doc".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x928374ff).into()),
-                                    font_style: Some(UserFontStyle::Italic),
+                                    color: Some(rgba(0x5d544eff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "constant".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xd3869bff).into()),
+                                    color: Some(rgba(0xb57614ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "constructor".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x8ec07cff).into()),
+                                    color: Some(rgba(0x0b6678ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "embedded".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x427b58ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "emphasis".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x0b6678ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "emphasis.strong".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xfe8019ff).into()),
+                                    color: Some(rgba(0x0b6678ff).into()),
                                     font_weight: Some(UserFontWeight(700.0)),
                                     ..Default::default()
                                 },
                             ),
+                            (
+                                "enum".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xaf3a03ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
                             (
                                 "function".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x8ec07cff).into()),
+                                    color: Some(rgba(0x79740eff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function.builtin".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x9d0006ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "hint".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x677562ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "keyword".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xfb4934ff).into()),
+                                    color: Some(rgba(0x9d0006ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "label".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xfabd2fff).into()),
+                                    color: Some(rgba(0x0b6678ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "link_text".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xd3869bff).into()),
+                                    color: Some(rgba(0x427b58ff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "link_uri".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xd3869bff).into()),
+                                    color: Some(rgba(0x8f3f71ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "number".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xd3869bff).into()),
+                                    color: Some(rgba(0x8f3f71ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "operator".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x8ec07cff).into()),
+                                    color: Some(rgba(0x427b58ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "predictive".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7d9881ff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "preproc".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xfe8019ff).into()),
+                                    color: Some(rgba(0x282828ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "primary".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x282828ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "property".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x689d6aff).into()),
+                                    color: Some(rgba(0x282828ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xa89984ff).into()),
+                                    color: Some(rgba(0x3c3836ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation.bracket".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xa89984ff).into()),
+                                    color: Some(rgba(0x665c54ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation.delimiter".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xa89984ff).into()),
+                                    color: Some(rgba(0x413d3aff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation.list_marker".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xa89984ff).into()),
+                                    color: Some(rgba(0x282828ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation.special".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xa89984ff).into()),
+                                    color: Some(rgba(0x413d3aff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xb8bb26ff).into()),
+                                    color: Some(rgba(0x79740eff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string.escape".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xfb4934ff).into()),
+                                    color: Some(rgba(0x5d544eff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string.regex".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xb8bb26ff).into()),
+                                    color: Some(rgba(0xaf3a03ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string.special".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xb8bb26ff).into()),
+                                    color: Some(rgba(0x8f3f71ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string.special.symbol".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xb8bb26ff).into()),
+                                    color: Some(rgba(0x427b58ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "tag".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x8ec07cff).into()),
+                                    color: Some(rgba(0x427b58ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "text.literal".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xb8bb26ff).into()),
+                                    color: Some(rgba(0x076678ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "title".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xfabd2fff).into()),
+                                    color: Some(rgba(0x79740eff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "type".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xfabd2fff).into()),
+                                    color: Some(rgba(0xb57614ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "variable".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x83a598ff).into()),
+                                    color: Some(rgba(0x076678ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
-                                "variable.special".into(),
+                                "variant".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x83a598ff).into()),
+                                    color: Some(rgba(0x0b6678ff).into()),
                                     ..Default::default()
                                 },
                             ),

crates/theme2/src/themes/mod.rs πŸ”—

@@ -2,43 +2,37 @@
 // Be careful when modifying it by hand.
 
 mod andromeda;
+mod atelier;
 mod ayu;
-mod dracula;
 mod gruvbox;
-mod night_owl;
-mod noctis;
-mod nord;
-mod palenight;
+mod one;
 mod rose_pine;
+mod sandcastle;
 mod solarized;
-mod synthwave_84;
+mod summercamp;
 
 pub use andromeda::*;
+pub use atelier::*;
 pub use ayu::*;
-pub use dracula::*;
 pub use gruvbox::*;
-pub use night_owl::*;
-pub use noctis::*;
-pub use nord::*;
-pub use palenight::*;
+pub use one::*;
 pub use rose_pine::*;
+pub use sandcastle::*;
 pub use solarized::*;
-pub use synthwave_84::*;
+pub use summercamp::*;
 
 use crate::UserThemeFamily;
 
 pub(crate) fn all_user_themes() -> Vec<UserThemeFamily> {
     vec![
         andromeda(),
+        atelier(),
         ayu(),
-        dracula(),
         gruvbox(),
-        night_owl(),
-        noctis(),
-        nord(),
-        palenight(),
+        one(),
         rose_pine(),
+        sandcastle(),
         solarized(),
-        synthwave_84(),
+        summercamp(),
     ]
 }

crates/theme2/src/themes/night_owl.rs πŸ”—

@@ -1,547 +0,0 @@
-// This file was generated by the `theme_importer`.
-// Be careful when modifying it by hand.
-
-use gpui::rgba;
-
-#[allow(unused)]
-use crate::{
-    Appearance, StatusColorsRefinement, ThemeColorsRefinement, UserFontStyle, UserFontWeight,
-    UserHighlightStyle, UserSyntaxTheme, UserTheme, UserThemeFamily, UserThemeStylesRefinement,
-};
-
-pub fn night_owl() -> UserThemeFamily {
-    UserThemeFamily {
-        name: "Night Owl".into(),
-        author: "Sarah Drasner (sdras)".into(),
-        themes: vec![
-            UserTheme {
-                name: "Night Owl".into(),
-                appearance: Appearance::Dark,
-                styles: UserThemeStylesRefinement {
-                    colors: ThemeColorsRefinement {
-                        border: Some(rgba(0x5f7e97ff).into()),
-                        border_variant: Some(rgba(0x5f7e97ff).into()),
-                        border_focused: Some(rgba(0x122d42ff).into()),
-                        border_selected: Some(rgba(0x5f7e97ff).into()),
-                        border_transparent: Some(rgba(0x5f7e97ff).into()),
-                        border_disabled: Some(rgba(0x5f7e97ff).into()),
-                        elevated_surface_background: Some(rgba(0x011627ff).into()),
-                        surface_background: Some(rgba(0x011627ff).into()),
-                        background: Some(rgba(0x011627ff).into()),
-                        element_background: Some(rgba(0x7e57c2cc).into()),
-                        element_hover: Some(rgba(0x011627ff).into()),
-                        element_selected: Some(rgba(0x234d708c).into()),
-                        drop_target_background: Some(rgba(0x011627ff).into()),
-                        ghost_element_hover: Some(rgba(0x011627ff).into()),
-                        ghost_element_selected: Some(rgba(0x234d708c).into()),
-                        text: Some(rgba(0xd6deebff).into()),
-                        text_muted: Some(rgba(0x5f7e97ff).into()),
-                        status_bar_background: Some(rgba(0x011627ff).into()),
-                        title_bar_background: Some(rgba(0x011627ff).into()),
-                        toolbar_background: Some(rgba(0x011627ff).into()),
-                        tab_bar_background: Some(rgba(0x011627ff).into()),
-                        tab_inactive_background: Some(rgba(0x01111dff).into()),
-                        tab_active_background: Some(rgba(0x0b2942ff).into()),
-                        scrollbar_thumb_background: Some(rgba(0x084d8180).into()),
-                        scrollbar_thumb_hover_background: Some(rgba(0x084d8180).into()),
-                        scrollbar_thumb_border: Some(rgba(0x084d8180).into()),
-                        scrollbar_track_background: Some(rgba(0x011627ff).into()),
-                        editor_foreground: Some(rgba(0xd6deebff).into()),
-                        editor_background: Some(rgba(0x011627ff).into()),
-                        editor_gutter_background: Some(rgba(0x011627ff).into()),
-                        editor_line_number: Some(rgba(0x4b6479ff).into()),
-                        editor_active_line_number: Some(rgba(0xd6deebff).into()),
-                        editor_wrap_guide: Some(rgba(0x5f7e97ff).into()),
-                        editor_active_wrap_guide: Some(rgba(0x5f7e97ff).into()),
-                        terminal_ansi_bright_black: Some(rgba(0x575656ff).into()),
-                        terminal_ansi_bright_red: Some(rgba(0xef5350ff).into()),
-                        terminal_ansi_bright_green: Some(rgba(0x22da6eff).into()),
-                        terminal_ansi_bright_yellow: Some(rgba(0xffeb95ff).into()),
-                        terminal_ansi_bright_blue: Some(rgba(0x82aaffff).into()),
-                        terminal_ansi_bright_magenta: Some(rgba(0xc792eaff).into()),
-                        terminal_ansi_bright_cyan: Some(rgba(0x7fdbcaff).into()),
-                        terminal_ansi_bright_white: Some(rgba(0xffffffff).into()),
-                        terminal_ansi_black: Some(rgba(0x011627ff).into()),
-                        terminal_ansi_red: Some(rgba(0xef5350ff).into()),
-                        terminal_ansi_green: Some(rgba(0x22da6eff).into()),
-                        terminal_ansi_yellow: Some(rgba(0xc5e478ff).into()),
-                        terminal_ansi_blue: Some(rgba(0x82aaffff).into()),
-                        terminal_ansi_magenta: Some(rgba(0xc792eaff).into()),
-                        terminal_ansi_cyan: Some(rgba(0x21c7a8ff).into()),
-                        terminal_ansi_white: Some(rgba(0xffffffff).into()),
-                        ..Default::default()
-                    },
-                    status: StatusColorsRefinement {
-                        conflict: Some(rgba(0xffeb95cc).into()),
-                        created: Some(rgba(0x9ccc65ff).into()),
-                        deleted: Some(rgba(0xef5350ff).into()),
-                        error: Some(rgba(0xef5350ff).into()),
-                        hidden: Some(rgba(0x5f7e97ff).into()),
-                        hint: Some(rgba(0x969696ff).into()),
-                        ignored: Some(rgba(0x395a75ff).into()),
-                        modified: Some(rgba(0xe2b93dff).into()),
-                        ..Default::default()
-                    },
-                    syntax: Some(UserSyntaxTheme {
-                        highlights: vec![
-                            (
-                                "attribute".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xc5e478ff).into()),
-                                    font_style: Some(UserFontStyle::Italic),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "boolean".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x82aaffff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "comment".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x637777ff).into()),
-                                    font_style: Some(UserFontStyle::Italic),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "comment.doc".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x637777ff).into()),
-                                    font_style: Some(UserFontStyle::Italic),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "constant".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x82aaffff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "constructor".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xcaece6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "function".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x82aaffff).into()),
-                                    font_style: Some(UserFontStyle::Italic),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "keyword".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xc792eaff).into()),
-                                    font_style: Some(UserFontStyle::Italic),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "number".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xf78c6cff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "operator".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x7fdbcaff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "property".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x80cbc4ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xc792eaff).into()),
-                                    font_style: Some(UserFontStyle::Italic),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.bracket".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xc792eaff).into()),
-                                    font_style: Some(UserFontStyle::Italic),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.delimiter".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xc792eaff).into()),
-                                    font_style: Some(UserFontStyle::Italic),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.list_marker".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xc792eaff).into()),
-                                    font_style: Some(UserFontStyle::Italic),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.special".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xc792eaff).into()),
-                                    font_style: Some(UserFontStyle::Italic),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xecc48dff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.escape".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x82aaffff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.regex".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xecc48dff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.special".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xecc48dff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.special.symbol".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xecc48dff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "tag".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xcaece6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "text.literal".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xecc48dff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "type".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xc5e478ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "variable".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xc5e478ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "variable.special".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x7fdbcaff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                        ],
-                    }),
-                },
-            },
-            UserTheme {
-                name: "Night Owl Light".into(),
-                appearance: Appearance::Light,
-                styles: UserThemeStylesRefinement {
-                    colors: ThemeColorsRefinement {
-                        border: Some(rgba(0xd9d9d9ff).into()),
-                        border_variant: Some(rgba(0xd9d9d9ff).into()),
-                        border_focused: Some(rgba(0x93a1a1ff).into()),
-                        border_selected: Some(rgba(0xd9d9d9ff).into()),
-                        border_transparent: Some(rgba(0xd9d9d9ff).into()),
-                        border_disabled: Some(rgba(0xd9d9d9ff).into()),
-                        elevated_surface_background: Some(rgba(0xf0f0f0ff).into()),
-                        surface_background: Some(rgba(0xf0f0f0ff).into()),
-                        background: Some(rgba(0xfbfbfbff).into()),
-                        element_background: Some(rgba(0x2aa298ff).into()),
-                        element_hover: Some(rgba(0xd3e8f8ff).into()),
-                        element_selected: Some(rgba(0xd3e8f8ff).into()),
-                        ghost_element_hover: Some(rgba(0xd3e8f8ff).into()),
-                        ghost_element_selected: Some(rgba(0xd3e8f8ff).into()),
-                        text: Some(rgba(0x403f53ff).into()),
-                        text_muted: Some(rgba(0x403f53ff).into()),
-                        status_bar_background: Some(rgba(0xf0f0f0ff).into()),
-                        title_bar_background: Some(rgba(0xf0f0f0ff).into()),
-                        toolbar_background: Some(rgba(0xfbfbfbff).into()),
-                        tab_bar_background: Some(rgba(0xf0f0f0ff).into()),
-                        tab_inactive_background: Some(rgba(0xf0f0f0ff).into()),
-                        tab_active_background: Some(rgba(0xf6f6f6ff).into()),
-                        scrollbar_track_background: Some(rgba(0xfbfbfbff).into()),
-                        editor_foreground: Some(rgba(0x403f53ff).into()),
-                        editor_background: Some(rgba(0xfbfbfbff).into()),
-                        editor_gutter_background: Some(rgba(0xfbfbfbff).into()),
-                        editor_line_number: Some(rgba(0x90a7b2ff).into()),
-                        editor_active_line_number: Some(rgba(0x403f53ff).into()),
-                        editor_wrap_guide: Some(rgba(0xd9d9d9ff).into()),
-                        editor_active_wrap_guide: Some(rgba(0xd9d9d9ff).into()),
-                        terminal_background: Some(rgba(0xf6f6f6ff).into()),
-                        terminal_ansi_bright_black: Some(rgba(0x403f53ff).into()),
-                        terminal_ansi_bright_red: Some(rgba(0xde3d3bff).into()),
-                        terminal_ansi_bright_green: Some(rgba(0x08916aff).into()),
-                        terminal_ansi_bright_yellow: Some(rgba(0xdaaa01ff).into()),
-                        terminal_ansi_bright_blue: Some(rgba(0x288ed7ff).into()),
-                        terminal_ansi_bright_magenta: Some(rgba(0xd6438aff).into()),
-                        terminal_ansi_bright_cyan: Some(rgba(0x2aa298ff).into()),
-                        terminal_ansi_bright_white: Some(rgba(0xf0f0f0ff).into()),
-                        terminal_ansi_black: Some(rgba(0x403f53ff).into()),
-                        terminal_ansi_red: Some(rgba(0xde3d3bff).into()),
-                        terminal_ansi_green: Some(rgba(0x08916aff).into()),
-                        terminal_ansi_yellow: Some(rgba(0xe0af02ff).into()),
-                        terminal_ansi_blue: Some(rgba(0x288ed7ff).into()),
-                        terminal_ansi_magenta: Some(rgba(0xd6438aff).into()),
-                        terminal_ansi_cyan: Some(rgba(0x2aa298ff).into()),
-                        terminal_ansi_white: Some(rgba(0xf0f0f0ff).into()),
-                        ..Default::default()
-                    },
-                    status: StatusColorsRefinement {
-                        created: Some(rgba(0x49d0c5ff).into()),
-                        deleted: Some(rgba(0xf76e6eff).into()),
-                        error: Some(rgba(0x403f53ff).into()),
-                        hidden: Some(rgba(0x403f53ff).into()),
-                        hint: Some(rgba(0x969696ff).into()),
-                        modified: Some(rgba(0x6fbef6ff).into()),
-                        warning: Some(rgba(0xdaaa01ff).into()),
-                        ..Default::default()
-                    },
-                    syntax: Some(UserSyntaxTheme {
-                        highlights: vec![
-                            (
-                                "attribute".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x4876d6ff).into()),
-                                    font_style: Some(UserFontStyle::Italic),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "boolean".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x4876d6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "comment".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x989fb1ff).into()),
-                                    font_style: Some(UserFontStyle::Italic),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "comment.doc".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x989fb1ff).into()),
-                                    font_style: Some(UserFontStyle::Italic),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "constant".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x4876d6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "constructor".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x994cc3ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "function".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x4876d6ff).into()),
-                                    font_style: Some(UserFontStyle::Italic),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "keyword".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x994cc3ff).into()),
-                                    font_style: Some(UserFontStyle::Italic),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "number".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xaa0982ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "operator".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x0c969bff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "property".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x0c969bff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x994cc3ff).into()),
-                                    font_style: Some(UserFontStyle::Italic),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.bracket".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x994cc3ff).into()),
-                                    font_style: Some(UserFontStyle::Italic),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.delimiter".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x994cc3ff).into()),
-                                    font_style: Some(UserFontStyle::Italic),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.list_marker".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x994cc3ff).into()),
-                                    font_style: Some(UserFontStyle::Italic),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.special".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x994cc3ff).into()),
-                                    font_style: Some(UserFontStyle::Italic),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x4876d6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.escape".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x4876d6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.regex".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x4876d6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.special".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x4876d6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.special.symbol".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x4876d6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "tag".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x994cc3ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "text.literal".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x4876d6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "type".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x4876d6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "variable".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x4876d6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "variable.special".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x0c969bff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                        ],
-                    }),
-                },
-            },
-        ],
-    }
-}

crates/theme2/src/themes/noctis.rs πŸ”—

@@ -1,3110 +0,0 @@
-// This file was generated by the `theme_importer`.
-// Be careful when modifying it by hand.
-
-use gpui::rgba;
-
-#[allow(unused)]
-use crate::{
-    Appearance, StatusColorsRefinement, ThemeColorsRefinement, UserFontStyle, UserFontWeight,
-    UserHighlightStyle, UserSyntaxTheme, UserTheme, UserThemeFamily, UserThemeStylesRefinement,
-};
-
-pub fn noctis() -> UserThemeFamily {
-    UserThemeFamily {
-        name: "Noctis".into(),
-        author: "Liviu Schera (liviuschera)".into(),
-        themes: vec![
-            UserTheme {
-                name: "Noctis Azureus".into(),
-                appearance: Appearance::Dark,
-                styles: UserThemeStylesRefinement {
-                    colors: ThemeColorsRefinement {
-                        border: Some(rgba(0x1679b6ff).into()),
-                        border_variant: Some(rgba(0x1679b6ff).into()),
-                        border_focused: Some(rgba(0x09334eff).into()),
-                        border_selected: Some(rgba(0x1679b6ff).into()),
-                        border_transparent: Some(rgba(0x1679b6ff).into()),
-                        border_disabled: Some(rgba(0x1679b6ff).into()),
-                        elevated_surface_background: Some(rgba(0x09334eff).into()),
-                        surface_background: Some(rgba(0x051b29ff).into()),
-                        background: Some(rgba(0x07273bff).into()),
-                        element_background: Some(rgba(0x007f99ff).into()),
-                        element_hover: Some(rgba(0x00558a65).into()),
-                        element_selected: Some(rgba(0x0c3f5fff).into()),
-                        drop_target_background: Some(rgba(0x002a4dff).into()),
-                        ghost_element_hover: Some(rgba(0x00558a65).into()),
-                        ghost_element_selected: Some(rgba(0x0c3f5fff).into()),
-                        text: Some(rgba(0xbecfdaff).into()),
-                        text_muted: Some(rgba(0x9fb6c6ff).into()),
-                        status_bar_background: Some(rgba(0x07273bff).into()),
-                        title_bar_background: Some(rgba(0x07273bff).into()),
-                        toolbar_background: Some(rgba(0x07273bff).into()),
-                        tab_bar_background: Some(rgba(0x09334eff).into()),
-                        tab_inactive_background: Some(rgba(0x09334eff).into()),
-                        tab_active_background: Some(rgba(0x07273bff).into()),
-                        scrollbar_thumb_background: Some(rgba(0x008ee633).into()),
-                        scrollbar_thumb_hover_background: Some(rgba(0x008ee655).into()),
-                        scrollbar_thumb_border: Some(rgba(0x008ee633).into()),
-                        scrollbar_track_background: Some(rgba(0x07273bff).into()),
-                        scrollbar_track_border: Some(rgba(0x07273bff).into()),
-                        editor_foreground: Some(rgba(0xbecfdaff).into()),
-                        editor_background: Some(rgba(0x07273bff).into()),
-                        editor_gutter_background: Some(rgba(0x07273bff).into()),
-                        editor_line_number: Some(rgba(0x4d6c80ff).into()),
-                        editor_active_line_number: Some(rgba(0xbecfdaff).into()),
-                        editor_wrap_guide: Some(rgba(0x1679b6ff).into()),
-                        editor_active_wrap_guide: Some(rgba(0x1679b6ff).into()),
-                        terminal_background: Some(rgba(0x051b29ff).into()),
-                        terminal_ansi_bright_black: Some(rgba(0x475e6cff).into()),
-                        terminal_ansi_bright_red: Some(rgba(0xe97749ff).into()),
-                        terminal_ansi_bright_green: Some(rgba(0x60ebb1ff).into()),
-                        terminal_ansi_bright_yellow: Some(rgba(0xe69533ff).into()),
-                        terminal_ansi_bright_blue: Some(rgba(0x60b6ebff).into()),
-                        terminal_ansi_bright_magenta: Some(rgba(0xe798b3ff).into()),
-                        terminal_ansi_bright_cyan: Some(rgba(0x60dbebff).into()),
-                        terminal_ansi_bright_white: Some(rgba(0xbecfdaff).into()),
-                        terminal_ansi_black: Some(rgba(0x28353eff).into()),
-                        terminal_ansi_red: Some(rgba(0xe66533ff).into()),
-                        terminal_ansi_green: Some(rgba(0x49e9a6ff).into()),
-                        terminal_ansi_yellow: Some(rgba(0xe4b781ff).into()),
-                        terminal_ansi_blue: Some(rgba(0x49ace9ff).into()),
-                        terminal_ansi_magenta: Some(rgba(0xdf769bff).into()),
-                        terminal_ansi_cyan: Some(rgba(0x49d6e9ff).into()),
-                        terminal_ansi_white: Some(rgba(0xaec3d0ff).into()),
-                        link_text_hover: Some(rgba(0x49ace9ff).into()),
-                        ..Default::default()
-                    },
-                    status: StatusColorsRefinement {
-                        conflict: Some(rgba(0xffc180ff).into()),
-                        created: Some(rgba(0x8ce99aff).into()),
-                        deleted: Some(rgba(0xe34e1cff).into()),
-                        error: Some(rgba(0xe34e1cff).into()),
-                        hidden: Some(rgba(0x9fb6c6ff).into()),
-                        hint: Some(rgba(0x969696ff).into()),
-                        ignored: Some(rgba(0x5b788bff).into()),
-                        modified: Some(rgba(0xffc180ff).into()),
-                        warning: Some(rgba(0xffa857ff).into()),
-                        ..Default::default()
-                    },
-                    syntax: Some(UserSyntaxTheme {
-                        highlights: vec![
-                            (
-                                "boolean".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x7060ebff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "comment".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x5988a6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "comment.doc".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x5988a6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "constant".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xd5971aff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "constructor".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xe66533ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "function".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x16a3b6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "keyword".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xe66533ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "label".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49d6e9ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "link_text".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49d6e9ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "link_uri".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49d6e9ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "number".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x7060ebff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "preproc".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xdf769bff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "property".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x16a3b6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xbecfdaff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.bracket".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xbecfdaff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.delimiter".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xbecfdaff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.list_marker".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xbecfdaff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.special".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xbecfdaff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49e9a6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.escape".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xbecfdaff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.regex".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49e9a6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.special".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49e9a6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.special.symbol".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49e9a6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "tag".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xe66533ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "text.literal".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49e9a6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "title".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49d6e9ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "type".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xd67e5cff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "variable".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xe4b781ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "variable.special".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xe66533ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                        ],
-                    }),
-                },
-            },
-            UserTheme {
-                name: "Noctis Bordo".into(),
-                appearance: Appearance::Dark,
-                styles: UserThemeStylesRefinement {
-                    colors: ThemeColorsRefinement {
-                        border: Some(rgba(0x997582ff).into()),
-                        border_variant: Some(rgba(0x997582ff).into()),
-                        border_focused: Some(rgba(0x413036ff).into()),
-                        border_selected: Some(rgba(0x997582ff).into()),
-                        border_transparent: Some(rgba(0x997582ff).into()),
-                        border_disabled: Some(rgba(0x997582ff).into()),
-                        elevated_surface_background: Some(rgba(0x413036ff).into()),
-                        surface_background: Some(rgba(0x272022ff).into()),
-                        background: Some(rgba(0x322a2dff).into()),
-                        element_background: Some(rgba(0x007f99ff).into()),
-                        element_hover: Some(rgba(0x533641ff).into()),
-                        element_selected: Some(rgba(0x5c2e3e99).into()),
-                        drop_target_background: Some(rgba(0x38292eff).into()),
-                        ghost_element_hover: Some(rgba(0x533641ff).into()),
-                        ghost_element_selected: Some(rgba(0x5c2e3e99).into()),
-                        text: Some(rgba(0xcbbec2ff).into()),
-                        text_muted: Some(rgba(0xbbaab0ff).into()),
-                        status_bar_background: Some(rgba(0x322a2dff).into()),
-                        title_bar_background: Some(rgba(0x322a2dff).into()),
-                        toolbar_background: Some(rgba(0x322a2dff).into()),
-                        tab_bar_background: Some(rgba(0x413036ff).into()),
-                        tab_inactive_background: Some(rgba(0x413036ff).into()),
-                        tab_active_background: Some(rgba(0x322a2dff).into()),
-                        scrollbar_thumb_background: Some(rgba(0xeb609133).into()),
-                        scrollbar_thumb_hover_background: Some(rgba(0xeb609144).into()),
-                        scrollbar_thumb_border: Some(rgba(0xeb609133).into()),
-                        scrollbar_track_background: Some(rgba(0x322a2dff).into()),
-                        scrollbar_track_border: Some(rgba(0x322a2dff).into()),
-                        editor_foreground: Some(rgba(0xcbbec2ff).into()),
-                        editor_background: Some(rgba(0x322a2dff).into()),
-                        editor_gutter_background: Some(rgba(0x322a2dff).into()),
-                        editor_line_number: Some(rgba(0x715b63ff).into()),
-                        editor_active_line_number: Some(rgba(0xcbbec2ff).into()),
-                        editor_wrap_guide: Some(rgba(0x997582ff).into()),
-                        editor_active_wrap_guide: Some(rgba(0x997582ff).into()),
-                        terminal_background: Some(rgba(0x272022ff).into()),
-                        terminal_ansi_bright_black: Some(rgba(0x69545bff).into()),
-                        terminal_ansi_bright_red: Some(rgba(0xe97749ff).into()),
-                        terminal_ansi_bright_green: Some(rgba(0x60ebb1ff).into()),
-                        terminal_ansi_bright_yellow: Some(rgba(0xe69533ff).into()),
-                        terminal_ansi_bright_blue: Some(rgba(0x60b6ebff).into()),
-                        terminal_ansi_bright_magenta: Some(rgba(0xe798b3ff).into()),
-                        terminal_ansi_bright_cyan: Some(rgba(0x60dbebff).into()),
-                        terminal_ansi_bright_white: Some(rgba(0xcbbec2ff).into()),
-                        terminal_ansi_black: Some(rgba(0x47393eff).into()),
-                        terminal_ansi_red: Some(rgba(0xe66533ff).into()),
-                        terminal_ansi_green: Some(rgba(0x49e9a6ff).into()),
-                        terminal_ansi_yellow: Some(rgba(0xe4b781ff).into()),
-                        terminal_ansi_blue: Some(rgba(0x49ace9ff).into()),
-                        terminal_ansi_magenta: Some(rgba(0xdf769bff).into()),
-                        terminal_ansi_cyan: Some(rgba(0x49d6e9ff).into()),
-                        terminal_ansi_white: Some(rgba(0xb9acb0ff).into()),
-                        link_text_hover: Some(rgba(0xf18eb0ff).into()),
-                        ..Default::default()
-                    },
-                    status: StatusColorsRefinement {
-                        conflict: Some(rgba(0xffc180ff).into()),
-                        created: Some(rgba(0x8ce99aff).into()),
-                        deleted: Some(rgba(0xe34e1cff).into()),
-                        error: Some(rgba(0xe34e1cff).into()),
-                        hidden: Some(rgba(0xbbaab0ff).into()),
-                        hint: Some(rgba(0x969696ff).into()),
-                        ignored: Some(rgba(0x5b788bff).into()),
-                        modified: Some(rgba(0xffc180ff).into()),
-                        warning: Some(rgba(0xffa857ff).into()),
-                        ..Default::default()
-                    },
-                    syntax: Some(UserSyntaxTheme {
-                        highlights: vec![
-                            (
-                                "boolean".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x7060ebff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "comment".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x8b747cff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "comment.doc".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x8b747cff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "constant".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xd5971aff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "constructor".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xe66533ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "function".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x16a3b6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "keyword".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xe66533ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "label".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49d6e9ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "link_text".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49d6e9ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "link_uri".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49d6e9ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "number".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x7060ebff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "preproc".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xdf769bff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "property".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x16a3b6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xcbbec2ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.bracket".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xcbbec2ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.delimiter".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xcbbec2ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.list_marker".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xcbbec2ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.special".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xcbbec2ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49e9a6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.escape".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xcbbec2ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.regex".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49e9a6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.special".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49e9a6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.special.symbol".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49e9a6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "tag".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xe66533ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "text.literal".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49e9a6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "title".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49d6e9ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "type".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xd67e5cff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "variable".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xe4b781ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "variable.special".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xe66533ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                        ],
-                    }),
-                },
-            },
-            UserTheme {
-                name: "Noctis Hibernus".into(),
-                appearance: Appearance::Light,
-                styles: UserThemeStylesRefinement {
-                    colors: ThemeColorsRefinement {
-                        border: Some(rgba(0x00c6e0ff).into()),
-                        border_variant: Some(rgba(0x00c6e0ff).into()),
-                        border_focused: Some(rgba(0xe0eff1ff).into()),
-                        border_selected: Some(rgba(0x00c6e0ff).into()),
-                        border_transparent: Some(rgba(0x00c6e0ff).into()),
-                        border_disabled: Some(rgba(0x00c6e0ff).into()),
-                        elevated_surface_background: Some(rgba(0xf4f6f6ff).into()),
-                        surface_background: Some(rgba(0xe1eeefff).into()),
-                        background: Some(rgba(0xf4f6f6ff).into()),
-                        element_background: Some(rgba(0x099099ff).into()),
-                        element_hover: Some(rgba(0xd1eafaff).into()),
-                        element_selected: Some(rgba(0xb6e1e7ff).into()),
-                        drop_target_background: Some(rgba(0xb2cacdff).into()),
-                        ghost_element_hover: Some(rgba(0xd1eafaff).into()),
-                        ghost_element_selected: Some(rgba(0xb6e1e7ff).into()),
-                        text: Some(rgba(0x005661ff).into()),
-                        text_muted: Some(rgba(0x71838eff).into()),
-                        status_bar_background: Some(rgba(0xcaedf2ff).into()),
-                        title_bar_background: Some(rgba(0xe7f2f3ff).into()),
-                        toolbar_background: Some(rgba(0xf4f6f6ff).into()),
-                        tab_bar_background: Some(rgba(0xcaedf2ff).into()),
-                        tab_inactive_background: Some(rgba(0xcaedf2ff).into()),
-                        tab_active_background: Some(rgba(0xf4f6f6ff).into()),
-                        scrollbar_thumb_background: Some(rgba(0x6a90955b).into()),
-                        scrollbar_thumb_hover_background: Some(rgba(0x0099ad62).into()),
-                        scrollbar_thumb_border: Some(rgba(0x6a90955b).into()),
-                        scrollbar_track_background: Some(rgba(0xf4f6f6ff).into()),
-                        scrollbar_track_border: Some(rgba(0xf4f6f6ff).into()),
-                        editor_foreground: Some(rgba(0x005661ff).into()),
-                        editor_background: Some(rgba(0xf4f6f6ff).into()),
-                        editor_gutter_background: Some(rgba(0xf4f6f6ff).into()),
-                        editor_line_number: Some(rgba(0xa0abacff).into()),
-                        editor_active_line_number: Some(rgba(0x005661ff).into()),
-                        editor_wrap_guide: Some(rgba(0x00c6e0ff).into()),
-                        editor_active_wrap_guide: Some(rgba(0x00c6e0ff).into()),
-                        terminal_background: Some(rgba(0xe1eeefff).into()),
-                        terminal_ansi_bright_black: Some(rgba(0x004d57ff).into()),
-                        terminal_ansi_bright_red: Some(rgba(0xff4000ff).into()),
-                        terminal_ansi_bright_green: Some(rgba(0x00d17aff).into()),
-                        terminal_ansi_bright_yellow: Some(rgba(0xff8c00ff).into()),
-                        terminal_ansi_bright_blue: Some(rgba(0x0fa3ffff).into()),
-                        terminal_ansi_bright_magenta: Some(rgba(0xff6b9fff).into()),
-                        terminal_ansi_bright_cyan: Some(rgba(0x00cbe6ff).into()),
-                        terminal_ansi_bright_white: Some(rgba(0xbbc3c4ff).into()),
-                        terminal_ansi_black: Some(rgba(0x003b42ff).into()),
-                        terminal_ansi_red: Some(rgba(0xe34e1cff).into()),
-                        terminal_ansi_green: Some(rgba(0x00b368ff).into()),
-                        terminal_ansi_yellow: Some(rgba(0xf49725ff).into()),
-                        terminal_ansi_blue: Some(rgba(0x0094f0ff).into()),
-                        terminal_ansi_magenta: Some(rgba(0xff5792ff).into()),
-                        terminal_ansi_cyan: Some(rgba(0x00bdd6ff).into()),
-                        terminal_ansi_white: Some(rgba(0x8ca6a6ff).into()),
-                        link_text_hover: Some(rgba(0x00c6e0ff).into()),
-                        ..Default::default()
-                    },
-                    status: StatusColorsRefinement {
-                        conflict: Some(rgba(0xe9a149ff).into()),
-                        created: Some(rgba(0x8ce99aff).into()),
-                        deleted: Some(rgba(0xff4000ff).into()),
-                        error: Some(rgba(0xff4000ff).into()),
-                        hidden: Some(rgba(0x71838eff).into()),
-                        hint: Some(rgba(0x969696ff).into()),
-                        ignored: Some(rgba(0xa8a28faa).into()),
-                        modified: Some(rgba(0xe9a149ff).into()),
-                        warning: Some(rgba(0xe07a52ff).into()),
-                        ..Default::default()
-                    },
-                    syntax: Some(UserSyntaxTheme {
-                        highlights: vec![
-                            (
-                                "boolean".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x5842ffff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "comment".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x8ca6a6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "comment.doc".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x8ca6a6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "constant".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xa88c00ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "constructor".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xe64100ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "function".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x0095a8ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "keyword".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xe64100ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "label".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x00bdd6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "link_text".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x00bdd6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "link_uri".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x00bdd6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "number".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x5842ffff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "preproc".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xff5792ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "property".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x0095a8ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x004d57ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.bracket".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x004d57ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.delimiter".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x004d57ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.list_marker".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x004d57ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.special".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x004d57ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x00b368ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.escape".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x004d57ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.regex".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x00b368ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.special".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x00b368ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.special.symbol".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x00b368ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "tag".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xe64100ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "text.literal".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x00b368ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "title".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x00bdd6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "type".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xb3694dff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "variable".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xfa8900ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "variable.special".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xe64100ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                        ],
-                    }),
-                },
-            },
-            UserTheme {
-                name: "Noctis Lilac".into(),
-                appearance: Appearance::Dark,
-                styles: UserThemeStylesRefinement {
-                    colors: ThemeColorsRefinement {
-                        border: Some(rgba(0xaea4f4ff).into()),
-                        border_variant: Some(rgba(0xaea4f4ff).into()),
-                        border_focused: Some(rgba(0xdedbf5ff).into()),
-                        border_selected: Some(rgba(0xaea4f4ff).into()),
-                        border_transparent: Some(rgba(0xaea4f4ff).into()),
-                        border_disabled: Some(rgba(0xaea4f4ff).into()),
-                        elevated_surface_background: Some(rgba(0xf2f1f8ff).into()),
-                        surface_background: Some(rgba(0xe9e7f3ff).into()),
-                        background: Some(rgba(0xf2f1f8ff).into()),
-                        element_background: Some(rgba(0x8e80ffff).into()),
-                        element_hover: Some(rgba(0xd2ccffff).into()),
-                        element_selected: Some(rgba(0xbcb6e7ff).into()),
-                        drop_target_background: Some(rgba(0xafaad4aa).into()),
-                        ghost_element_hover: Some(rgba(0xd2ccffff).into()),
-                        ghost_element_selected: Some(rgba(0xbcb6e7ff).into()),
-                        text: Some(rgba(0x0c006bff).into()),
-                        text_muted: Some(rgba(0x75718eff).into()),
-                        status_bar_background: Some(rgba(0xe2dff6ff).into()),
-                        title_bar_background: Some(rgba(0xedecf8ff).into()),
-                        toolbar_background: Some(rgba(0xf2f1f8ff).into()),
-                        tab_bar_background: Some(rgba(0xe2dff6ff).into()),
-                        tab_inactive_background: Some(rgba(0xe2dff6ff).into()),
-                        tab_active_background: Some(rgba(0xf2f1f8ff).into()),
-                        scrollbar_thumb_background: Some(rgba(0x6a90955b).into()),
-                        scrollbar_thumb_hover_background: Some(rgba(0x7060eb62).into()),
-                        scrollbar_thumb_border: Some(rgba(0x6a90955b).into()),
-                        scrollbar_track_background: Some(rgba(0xf2f1f8ff).into()),
-                        scrollbar_track_border: Some(rgba(0xf2f1f8ff).into()),
-                        editor_foreground: Some(rgba(0x0c006bff).into()),
-                        editor_background: Some(rgba(0xf2f1f8ff).into()),
-                        editor_gutter_background: Some(rgba(0xf2f1f8ff).into()),
-                        editor_line_number: Some(rgba(0x9d9ab1ff).into()),
-                        editor_active_line_number: Some(rgba(0x0c006bff).into()),
-                        editor_wrap_guide: Some(rgba(0xaea4f4ff).into()),
-                        editor_active_wrap_guide: Some(rgba(0xaea4f4ff).into()),
-                        terminal_background: Some(rgba(0xe9e7f3ff).into()),
-                        terminal_ansi_bright_black: Some(rgba(0x0f0080ff).into()),
-                        terminal_ansi_bright_red: Some(rgba(0xff4000ff).into()),
-                        terminal_ansi_bright_green: Some(rgba(0x00d17aff).into()),
-                        terminal_ansi_bright_yellow: Some(rgba(0xff8c00ff).into()),
-                        terminal_ansi_bright_blue: Some(rgba(0x0fa3ffff).into()),
-                        terminal_ansi_bright_magenta: Some(rgba(0xff6b9fff).into()),
-                        terminal_ansi_bright_cyan: Some(rgba(0x00cbe6ff).into()),
-                        terminal_ansi_bright_white: Some(rgba(0xbbc3c4ff).into()),
-                        terminal_ansi_black: Some(rgba(0x0c006bff).into()),
-                        terminal_ansi_red: Some(rgba(0xe34e1cff).into()),
-                        terminal_ansi_green: Some(rgba(0x00b368ff).into()),
-                        terminal_ansi_yellow: Some(rgba(0xf49725ff).into()),
-                        terminal_ansi_blue: Some(rgba(0x0094f0ff).into()),
-                        terminal_ansi_magenta: Some(rgba(0xff5792ff).into()),
-                        terminal_ansi_cyan: Some(rgba(0x00bdd6ff).into()),
-                        terminal_ansi_white: Some(rgba(0x8ca6a6ff).into()),
-                        link_text_hover: Some(rgba(0x00c6e0ff).into()),
-                        ..Default::default()
-                    },
-                    status: StatusColorsRefinement {
-                        conflict: Some(rgba(0xe9a149ff).into()),
-                        created: Some(rgba(0x8ce99aff).into()),
-                        deleted: Some(rgba(0xff4000ff).into()),
-                        error: Some(rgba(0xff4000ff).into()),
-                        hidden: Some(rgba(0x75718eff).into()),
-                        hint: Some(rgba(0x969696ff).into()),
-                        ignored: Some(rgba(0xa8a28faa).into()),
-                        modified: Some(rgba(0xe9a149ff).into()),
-                        warning: Some(rgba(0xe07a52ff).into()),
-                        ..Default::default()
-                    },
-                    syntax: Some(UserSyntaxTheme {
-                        highlights: vec![
-                            (
-                                "boolean".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x5842ffff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "comment".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x9995b7ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "comment.doc".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x9995b7ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "constant".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xa88c00ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "constructor".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xe64100ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "function".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x0095a8ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "keyword".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xe64100ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "label".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x00bdd6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "link_text".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x00bdd6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "link_uri".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x00bdd6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "number".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x5842ffff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "preproc".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xff5792ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "property".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x0095a8ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x0c006bff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.bracket".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x0c006bff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.delimiter".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x0c006bff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.list_marker".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x0c006bff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.special".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x0c006bff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x00b368ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.escape".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x0c006bff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.regex".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x00b368ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.special".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x00b368ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.special.symbol".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x00b368ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "tag".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xe64100ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "text.literal".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x00b368ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "title".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x00bdd6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "type".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xb3694dff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "variable".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xfa8900ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "variable.special".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xe64100ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                        ],
-                    }),
-                },
-            },
-            UserTheme {
-                name: "Noctis Lux".into(),
-                appearance: Appearance::Light,
-                styles: UserThemeStylesRefinement {
-                    colors: ThemeColorsRefinement {
-                        border: Some(rgba(0x00c6e0ff).into()),
-                        border_variant: Some(rgba(0x00c6e0ff).into()),
-                        border_focused: Some(rgba(0xf2eddeff).into()),
-                        border_selected: Some(rgba(0x00c6e0ff).into()),
-                        border_transparent: Some(rgba(0x00c6e0ff).into()),
-                        border_disabled: Some(rgba(0x00c6e0ff).into()),
-                        elevated_surface_background: Some(rgba(0xfef8ecff).into()),
-                        surface_background: Some(rgba(0xf6eddaff).into()),
-                        background: Some(rgba(0xfef8ecff).into()),
-                        element_background: Some(rgba(0x099099ff).into()),
-                        element_hover: Some(rgba(0xd2f3f9ff).into()),
-                        element_selected: Some(rgba(0xb6e1e7ff).into()),
-                        drop_target_background: Some(rgba(0xcdcbb2ff).into()),
-                        ghost_element_hover: Some(rgba(0xd2f3f9ff).into()),
-                        ghost_element_selected: Some(rgba(0xb6e1e7ff).into()),
-                        text: Some(rgba(0x005661ff).into()),
-                        text_muted: Some(rgba(0x888477ff).into()),
-                        status_bar_background: Some(rgba(0xf0e9d6ff).into()),
-                        title_bar_background: Some(rgba(0xf9f1e1ff).into()),
-                        toolbar_background: Some(rgba(0xfef8ecff).into()),
-                        tab_bar_background: Some(rgba(0xf0e9d6ff).into()),
-                        tab_inactive_background: Some(rgba(0xf0e9d6ff).into()),
-                        tab_active_background: Some(rgba(0xfef8ecff).into()),
-                        scrollbar_thumb_background: Some(rgba(0x6a90955b).into()),
-                        scrollbar_thumb_hover_background: Some(rgba(0x0099ad62).into()),
-                        scrollbar_thumb_border: Some(rgba(0x6a90955b).into()),
-                        scrollbar_track_background: Some(rgba(0xfef8ecff).into()),
-                        scrollbar_track_border: Some(rgba(0xfef8ecff).into()),
-                        editor_foreground: Some(rgba(0x005661ff).into()),
-                        editor_background: Some(rgba(0xfef8ecff).into()),
-                        editor_gutter_background: Some(rgba(0xfef8ecff).into()),
-                        editor_line_number: Some(rgba(0xa0abacff).into()),
-                        editor_active_line_number: Some(rgba(0x005661ff).into()),
-                        editor_wrap_guide: Some(rgba(0x00c6e0ff).into()),
-                        editor_active_wrap_guide: Some(rgba(0x00c6e0ff).into()),
-                        terminal_background: Some(rgba(0xf6eddaff).into()),
-                        terminal_ansi_bright_black: Some(rgba(0x004d57ff).into()),
-                        terminal_ansi_bright_red: Some(rgba(0xff4000ff).into()),
-                        terminal_ansi_bright_green: Some(rgba(0x00d17aff).into()),
-                        terminal_ansi_bright_yellow: Some(rgba(0xff8c00ff).into()),
-                        terminal_ansi_bright_blue: Some(rgba(0x0fa3ffff).into()),
-                        terminal_ansi_bright_magenta: Some(rgba(0xff6b9fff).into()),
-                        terminal_ansi_bright_cyan: Some(rgba(0x00cbe6ff).into()),
-                        terminal_ansi_bright_white: Some(rgba(0xbbc3c4ff).into()),
-                        terminal_ansi_black: Some(rgba(0x003b42ff).into()),
-                        terminal_ansi_red: Some(rgba(0xe34e1cff).into()),
-                        terminal_ansi_green: Some(rgba(0x00b368ff).into()),
-                        terminal_ansi_yellow: Some(rgba(0xf49725ff).into()),
-                        terminal_ansi_blue: Some(rgba(0x0094f0ff).into()),
-                        terminal_ansi_magenta: Some(rgba(0xff5792ff).into()),
-                        terminal_ansi_cyan: Some(rgba(0x00bdd6ff).into()),
-                        terminal_ansi_white: Some(rgba(0x8ca6a6ff).into()),
-                        link_text_hover: Some(rgba(0x00c6e0ff).into()),
-                        ..Default::default()
-                    },
-                    status: StatusColorsRefinement {
-                        conflict: Some(rgba(0xe9a149ff).into()),
-                        created: Some(rgba(0x8ce99aff).into()),
-                        deleted: Some(rgba(0xff4000ff).into()),
-                        error: Some(rgba(0xff4000ff).into()),
-                        hidden: Some(rgba(0x888477ff).into()),
-                        hint: Some(rgba(0x969696ff).into()),
-                        ignored: Some(rgba(0xa8a28faa).into()),
-                        modified: Some(rgba(0xe9a149ff).into()),
-                        warning: Some(rgba(0xe07a52ff).into()),
-                        ..Default::default()
-                    },
-                    syntax: Some(UserSyntaxTheme {
-                        highlights: vec![
-                            (
-                                "boolean".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x5842ffff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "comment".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x8ca6a6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "comment.doc".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x8ca6a6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "constant".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xa88c00ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "constructor".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xe64100ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "function".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x0095a8ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "keyword".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xe64100ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "label".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x00bdd6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "link_text".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x00bdd6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "link_uri".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x00bdd6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "number".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x5842ffff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "preproc".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xff5792ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "property".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x0095a8ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x004d57ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.bracket".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x004d57ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.delimiter".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x004d57ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.list_marker".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x004d57ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.special".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x004d57ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x00b368ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.escape".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x004d57ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.regex".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x00b368ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.special".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x00b368ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.special.symbol".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x00b368ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "tag".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xe64100ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "text.literal".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x00b368ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "title".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x00bdd6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "type".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xb3694dff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "variable".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xfa8900ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "variable.special".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xe64100ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                        ],
-                    }),
-                },
-            },
-            UserTheme {
-                name: "Noctis Minimus".into(),
-                appearance: Appearance::Dark,
-                styles: UserThemeStylesRefinement {
-                    colors: ThemeColorsRefinement {
-                        border: Some(rgba(0x496d83ff).into()),
-                        border_variant: Some(rgba(0x496d83ff).into()),
-                        border_focused: Some(rgba(0x202e37ff).into()),
-                        border_selected: Some(rgba(0x496d83ff).into()),
-                        border_transparent: Some(rgba(0x496d83ff).into()),
-                        border_disabled: Some(rgba(0x496d83ff).into()),
-                        elevated_surface_background: Some(rgba(0x202e37ff).into()),
-                        surface_background: Some(rgba(0x0e1920ff).into()),
-                        background: Some(rgba(0x1b2932ff).into()),
-                        element_background: Some(rgba(0x2e616bff).into()),
-                        element_hover: Some(rgba(0x00558aff).into()),
-                        element_selected: Some(rgba(0x2c414eff).into()),
-                        drop_target_background: Some(rgba(0x152837ff).into()),
-                        ghost_element_hover: Some(rgba(0x00558aff).into()),
-                        ghost_element_selected: Some(rgba(0x2c414eff).into()),
-                        text: Some(rgba(0xc5cdd3ff).into()),
-                        text_muted: Some(rgba(0x96a8b6ff).into()),
-                        status_bar_background: Some(rgba(0x1b2932ff).into()),
-                        title_bar_background: Some(rgba(0x1b2932ff).into()),
-                        toolbar_background: Some(rgba(0x1b2932ff).into()),
-                        tab_bar_background: Some(rgba(0x24333dff).into()),
-                        tab_inactive_background: Some(rgba(0x202e37ff).into()),
-                        tab_active_background: Some(rgba(0x1b2932ff).into()),
-                        scrollbar_thumb_background: Some(rgba(0x3f7fa633).into()),
-                        scrollbar_thumb_hover_background: Some(rgba(0x3f7fa655).into()),
-                        scrollbar_thumb_border: Some(rgba(0x3f7fa633).into()),
-                        scrollbar_track_background: Some(rgba(0x1b2932ff).into()),
-                        scrollbar_track_border: Some(rgba(0x1b2932ff).into()),
-                        editor_foreground: Some(rgba(0xc5cdd3ff).into()),
-                        editor_background: Some(rgba(0x1b2932ff).into()),
-                        editor_gutter_background: Some(rgba(0x1b2932ff).into()),
-                        editor_line_number: Some(rgba(0x5d6e79ff).into()),
-                        editor_active_line_number: Some(rgba(0xc5cdd3ff).into()),
-                        editor_wrap_guide: Some(rgba(0x496d83ff).into()),
-                        editor_active_wrap_guide: Some(rgba(0x496d83ff).into()),
-                        terminal_background: Some(rgba(0x0e1920ff).into()),
-                        terminal_ansi_bright_black: Some(rgba(0x425866ff).into()),
-                        terminal_ansi_bright_red: Some(rgba(0xca8468ff).into()),
-                        terminal_ansi_bright_green: Some(rgba(0x84c8abff).into()),
-                        terminal_ansi_bright_yellow: Some(rgba(0xd1aa7bff).into()),
-                        terminal_ansi_bright_blue: Some(rgba(0x68a4caff).into()),
-                        terminal_ansi_bright_magenta: Some(rgba(0xc88da2ff).into()),
-                        terminal_ansi_bright_cyan: Some(rgba(0x84c0c8ff).into()),
-                        terminal_ansi_bright_white: Some(rgba(0xc5d1d3ff).into()),
-                        terminal_ansi_black: Some(rgba(0x182a35ff).into()),
-                        terminal_ansi_red: Some(rgba(0xc08872ff).into()),
-                        terminal_ansi_green: Some(rgba(0x72c09fff).into()),
-                        terminal_ansi_yellow: Some(rgba(0xc8a984ff).into()),
-                        terminal_ansi_blue: Some(rgba(0x6196b8ff).into()),
-                        terminal_ansi_magenta: Some(rgba(0xc28097ff).into()),
-                        terminal_ansi_cyan: Some(rgba(0x72b7c0ff).into()),
-                        terminal_ansi_white: Some(rgba(0xc5cdd3ff).into()),
-                        link_text_hover: Some(rgba(0x5998c0ff).into()),
-                        ..Default::default()
-                    },
-                    status: StatusColorsRefinement {
-                        conflict: Some(rgba(0xdfc09fff).into()),
-                        created: Some(rgba(0xa0d4a8ff).into()),
-                        deleted: Some(rgba(0xb96346ff).into()),
-                        error: Some(rgba(0xb96346ff).into()),
-                        hidden: Some(rgba(0x96a8b6ff).into()),
-                        hint: Some(rgba(0x969696ff).into()),
-                        ignored: Some(rgba(0x5b788bff).into()),
-                        modified: Some(rgba(0xdfc09fff).into()),
-                        warning: Some(rgba(0xffa857ff).into()),
-                        ..Default::default()
-                    },
-                    syntax: Some(UserSyntaxTheme {
-                        highlights: vec![
-                            (
-                                "boolean".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x7068b1ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "comment".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x5e7887ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "comment.doc".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x5e7887ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "constant".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xa88c00ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "constructor".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xc37455ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "function".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x3f848dff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "keyword".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xc37455ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "label".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x72b7c0ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "link_text".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x72b7c0ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "link_uri".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x72b7c0ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "number".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x7068b1ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "preproc".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xc88da2ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "property".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x3f848dff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xc5cdd3ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.bracket".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xc5cdd3ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.delimiter".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xc5cdd3ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.list_marker".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xc5cdd3ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.special".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xc5cdd3ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x72c09fff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.escape".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xc5cdd3ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.regex".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x72c09fff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.special".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x72c09fff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.special.symbol".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x72c09fff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "tag".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xc37455ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "text.literal".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x72c09fff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "title".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x72b7c0ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "type".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xbe856fff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "variable".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xd3b692ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "variable.special".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xc37455ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                        ],
-                    }),
-                },
-            },
-            UserTheme {
-                name: "Noctis".into(),
-                appearance: Appearance::Dark,
-                styles: UserThemeStylesRefinement {
-                    colors: ThemeColorsRefinement {
-                        border: Some(rgba(0x0e6671ff).into()),
-                        border_variant: Some(rgba(0x0e6671ff).into()),
-                        border_focused: Some(rgba(0x073940ff).into()),
-                        border_selected: Some(rgba(0x0e6671ff).into()),
-                        border_transparent: Some(rgba(0x0e6671ff).into()),
-                        border_disabled: Some(rgba(0x0e6671ff).into()),
-                        elevated_surface_background: Some(rgba(0x073940ff).into()),
-                        surface_background: Some(rgba(0x03191bff).into()),
-                        background: Some(rgba(0x052529ff).into()),
-                        element_background: Some(rgba(0x099099ff).into()),
-                        element_hover: Some(rgba(0x0b515bff).into()),
-                        element_selected: Some(rgba(0x0e6671ff).into()),
-                        drop_target_background: Some(rgba(0x00404dff).into()),
-                        ghost_element_hover: Some(rgba(0x0b515bff).into()),
-                        ghost_element_selected: Some(rgba(0x0e6671ff).into()),
-                        text: Some(rgba(0xb2cacdff).into()),
-                        text_muted: Some(rgba(0x87a7abff).into()),
-                        status_bar_background: Some(rgba(0x041d20ff).into()),
-                        title_bar_background: Some(rgba(0x041d20ff).into()),
-                        toolbar_background: Some(rgba(0x052529ff).into()),
-                        tab_bar_background: Some(rgba(0x062e32ff).into()),
-                        tab_inactive_background: Some(rgba(0x062e32ff).into()),
-                        tab_active_background: Some(rgba(0x052529ff).into()),
-                        scrollbar_thumb_background: Some(rgba(0x6a90955b).into()),
-                        scrollbar_thumb_hover_background: Some(rgba(0x169fb162).into()),
-                        scrollbar_thumb_border: Some(rgba(0x6a90955b).into()),
-                        scrollbar_track_background: Some(rgba(0x052529ff).into()),
-                        scrollbar_track_border: Some(rgba(0x052529ff).into()),
-                        editor_foreground: Some(rgba(0xb2cacdff).into()),
-                        editor_background: Some(rgba(0x052529ff).into()),
-                        editor_gutter_background: Some(rgba(0x052529ff).into()),
-                        editor_line_number: Some(rgba(0x4e6b6eff).into()),
-                        editor_active_line_number: Some(rgba(0xb2cacdff).into()),
-                        editor_wrap_guide: Some(rgba(0x0e6671ff).into()),
-                        editor_active_wrap_guide: Some(rgba(0x0e6671ff).into()),
-                        terminal_background: Some(rgba(0x03191bff).into()),
-                        terminal_ansi_bright_black: Some(rgba(0x47686cff).into()),
-                        terminal_ansi_bright_red: Some(rgba(0xe97749ff).into()),
-                        terminal_ansi_bright_green: Some(rgba(0x60ebb1ff).into()),
-                        terminal_ansi_bright_yellow: Some(rgba(0xe69533ff).into()),
-                        terminal_ansi_bright_blue: Some(rgba(0x60b6ebff).into()),
-                        terminal_ansi_bright_magenta: Some(rgba(0xe798b3ff).into()),
-                        terminal_ansi_bright_cyan: Some(rgba(0x60dbebff).into()),
-                        terminal_ansi_bright_white: Some(rgba(0xc1d4d7ff).into()),
-                        terminal_ansi_black: Some(rgba(0x324a4dff).into()),
-                        terminal_ansi_red: Some(rgba(0xe66533ff).into()),
-                        terminal_ansi_green: Some(rgba(0x49e9a6ff).into()),
-                        terminal_ansi_yellow: Some(rgba(0xe4b781ff).into()),
-                        terminal_ansi_blue: Some(rgba(0x49ace9ff).into()),
-                        terminal_ansi_magenta: Some(rgba(0xdf769bff).into()),
-                        terminal_ansi_cyan: Some(rgba(0x49d6e9ff).into()),
-                        terminal_ansi_white: Some(rgba(0xb2cacdff).into()),
-                        link_text_hover: Some(rgba(0x40d4e7ff).into()),
-                        ..Default::default()
-                    },
-                    status: StatusColorsRefinement {
-                        conflict: Some(rgba(0xe4b781ff).into()),
-                        created: Some(rgba(0x8ce99aff).into()),
-                        deleted: Some(rgba(0xe34e1cff).into()),
-                        error: Some(rgba(0xe34e1cff).into()),
-                        hidden: Some(rgba(0x87a7abff).into()),
-                        hint: Some(rgba(0x969696ff).into()),
-                        ignored: Some(rgba(0x5b858bff).into()),
-                        modified: Some(rgba(0xe0c184ff).into()),
-                        warning: Some(rgba(0xffa487ff).into()),
-                        ..Default::default()
-                    },
-                    syntax: Some(UserSyntaxTheme {
-                        highlights: vec![
-                            (
-                                "boolean".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x7060ebff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "comment".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x5b858bff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "comment.doc".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x5b858bff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "constant".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xd5971aff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "constructor".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xe66533ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "function".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x16a3b6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "keyword".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xe66533ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "label".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49d6e9ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "link_text".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49d6e9ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "link_uri".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49d6e9ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "number".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x7060ebff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "preproc".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xdf769bff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "property".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x16a3b6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xb2cacdff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.bracket".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xb2cacdff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.delimiter".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xb2cacdff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.list_marker".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xb2cacdff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.special".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xb2cacdff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49e9a6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.escape".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xb2cacdff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.regex".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49e9a6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.special".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49e9a6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.special.symbol".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49e9a6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "tag".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xe66533ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "text.literal".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49e9a6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "title".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49d6e9ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "type".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xd67e5cff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "variable".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xe4b781ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "variable.special".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xe66533ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                        ],
-                    }),
-                },
-            },
-            UserTheme {
-                name: "Noctis Obscuro".into(),
-                appearance: Appearance::Dark,
-                styles: UserThemeStylesRefinement {
-                    colors: ThemeColorsRefinement {
-                        border: Some(rgba(0x0e6671ff).into()),
-                        border_variant: Some(rgba(0x0e6671ff).into()),
-                        border_focused: Some(rgba(0x062e32ff).into()),
-                        border_selected: Some(rgba(0x0e6671ff).into()),
-                        border_transparent: Some(rgba(0x0e6671ff).into()),
-                        border_disabled: Some(rgba(0x0e6671ff).into()),
-                        elevated_surface_background: Some(rgba(0x031417ff).into()),
-                        surface_background: Some(rgba(0x020c0eff).into()),
-                        background: Some(rgba(0x031417ff).into()),
-                        element_background: Some(rgba(0x099099ff).into()),
-                        element_hover: Some(rgba(0x0b515bff).into()),
-                        element_selected: Some(rgba(0x0e6671ff).into()),
-                        drop_target_background: Some(rgba(0x00404dff).into()),
-                        ghost_element_hover: Some(rgba(0x0b515bff).into()),
-                        ghost_element_selected: Some(rgba(0x0e6671ff).into()),
-                        text: Some(rgba(0xb2cacdff).into()),
-                        text_muted: Some(rgba(0x87a7abff).into()),
-                        status_bar_background: Some(rgba(0x031417ff).into()),
-                        title_bar_background: Some(rgba(0x031417ff).into()),
-                        toolbar_background: Some(rgba(0x031417ff).into()),
-                        tab_bar_background: Some(rgba(0x062e32ff).into()),
-                        tab_inactive_background: Some(rgba(0x062e32ff).into()),
-                        tab_active_background: Some(rgba(0x031417ff).into()),
-                        scrollbar_thumb_background: Some(rgba(0x6a90955b).into()),
-                        scrollbar_thumb_hover_background: Some(rgba(0x169fb162).into()),
-                        scrollbar_thumb_border: Some(rgba(0x6a90955b).into()),
-                        scrollbar_track_background: Some(rgba(0x031417ff).into()),
-                        scrollbar_track_border: Some(rgba(0x031417ff).into()),
-                        editor_foreground: Some(rgba(0xb2cacdff).into()),
-                        editor_background: Some(rgba(0x031417ff).into()),
-                        editor_gutter_background: Some(rgba(0x031417ff).into()),
-                        editor_line_number: Some(rgba(0x4e6b6eff).into()),
-                        editor_active_line_number: Some(rgba(0xb2cacdff).into()),
-                        editor_wrap_guide: Some(rgba(0x0e6671ff).into()),
-                        editor_active_wrap_guide: Some(rgba(0x0e6671ff).into()),
-                        terminal_background: Some(rgba(0x020c0eff).into()),
-                        terminal_ansi_bright_black: Some(rgba(0x47686cff).into()),
-                        terminal_ansi_bright_red: Some(rgba(0xe97749ff).into()),
-                        terminal_ansi_bright_green: Some(rgba(0x60ebb1ff).into()),
-                        terminal_ansi_bright_yellow: Some(rgba(0xe69533ff).into()),
-                        terminal_ansi_bright_blue: Some(rgba(0x60b6ebff).into()),
-                        terminal_ansi_bright_magenta: Some(rgba(0xe798b3ff).into()),
-                        terminal_ansi_bright_cyan: Some(rgba(0x60dbebff).into()),
-                        terminal_ansi_bright_white: Some(rgba(0xc1d4d7ff).into()),
-                        terminal_ansi_black: Some(rgba(0x324a4dff).into()),
-                        terminal_ansi_red: Some(rgba(0xe66533ff).into()),
-                        terminal_ansi_green: Some(rgba(0x49e9a6ff).into()),
-                        terminal_ansi_yellow: Some(rgba(0xe4b781ff).into()),
-                        terminal_ansi_blue: Some(rgba(0x49ace9ff).into()),
-                        terminal_ansi_magenta: Some(rgba(0xdf769bff).into()),
-                        terminal_ansi_cyan: Some(rgba(0x49d6e9ff).into()),
-                        terminal_ansi_white: Some(rgba(0xb2cacdff).into()),
-                        link_text_hover: Some(rgba(0x40d4e7ff).into()),
-                        ..Default::default()
-                    },
-                    status: StatusColorsRefinement {
-                        conflict: Some(rgba(0xe4b781ff).into()),
-                        created: Some(rgba(0x8ce99aff).into()),
-                        deleted: Some(rgba(0xe34e1cff).into()),
-                        error: Some(rgba(0xe34e1cff).into()),
-                        hidden: Some(rgba(0x87a7abff).into()),
-                        hint: Some(rgba(0x969696ff).into()),
-                        ignored: Some(rgba(0x647e82ff).into()),
-                        modified: Some(rgba(0xe4b781ff).into()),
-                        warning: Some(rgba(0xffa487ff).into()),
-                        ..Default::default()
-                    },
-                    syntax: Some(UserSyntaxTheme {
-                        highlights: vec![
-                            (
-                                "boolean".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x7060ebff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "comment".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x5b858bff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "comment.doc".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x5b858bff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "constant".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xd5971aff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "constructor".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xe66533ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "function".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x16a3b6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "keyword".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xe66533ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "label".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49d6e9ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "link_text".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49d6e9ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "link_uri".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49d6e9ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "number".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x7060ebff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "preproc".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xdf769bff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "property".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x16a3b6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xb2cacdff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.bracket".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xb2cacdff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.delimiter".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xb2cacdff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.list_marker".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xb2cacdff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.special".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xb2cacdff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49e9a6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.escape".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xb2cacdff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.regex".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49e9a6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.special".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49e9a6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.special.symbol".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49e9a6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "tag".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xe66533ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "text.literal".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49e9a6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "title".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49d6e9ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "type".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xd67e5cff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "variable".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xe4b781ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "variable.special".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xe66533ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                        ],
-                    }),
-                },
-            },
-            UserTheme {
-                name: "Noctis Sereno".into(),
-                appearance: Appearance::Dark,
-                styles: UserThemeStylesRefinement {
-                    colors: ThemeColorsRefinement {
-                        border: Some(rgba(0x0e6671ff).into()),
-                        border_variant: Some(rgba(0x0e6671ff).into()),
-                        border_focused: Some(rgba(0x062e32ff).into()),
-                        border_selected: Some(rgba(0x0e6671ff).into()),
-                        border_transparent: Some(rgba(0x0e6671ff).into()),
-                        border_disabled: Some(rgba(0x0e6671ff).into()),
-                        elevated_surface_background: Some(rgba(0x031417ff).into()),
-                        surface_background: Some(rgba(0x020c0eff).into()),
-                        background: Some(rgba(0x031417ff).into()),
-                        element_background: Some(rgba(0x099099ff).into()),
-                        element_hover: Some(rgba(0x0b515bff).into()),
-                        element_selected: Some(rgba(0x0e6671ff).into()),
-                        drop_target_background: Some(rgba(0x00404dff).into()),
-                        ghost_element_hover: Some(rgba(0x0b515bff).into()),
-                        ghost_element_selected: Some(rgba(0x0e6671ff).into()),
-                        text: Some(rgba(0xb2cacdff).into()),
-                        text_muted: Some(rgba(0x87a7abff).into()),
-                        status_bar_background: Some(rgba(0x031417ff).into()),
-                        title_bar_background: Some(rgba(0x031417ff).into()),
-                        toolbar_background: Some(rgba(0x031417ff).into()),
-                        tab_bar_background: Some(rgba(0x062e32ff).into()),
-                        tab_inactive_background: Some(rgba(0x062e32ff).into()),
-                        tab_active_background: Some(rgba(0x031417ff).into()),
-                        scrollbar_thumb_background: Some(rgba(0x6a90955b).into()),
-                        scrollbar_thumb_hover_background: Some(rgba(0x169fb162).into()),
-                        scrollbar_thumb_border: Some(rgba(0x6a90955b).into()),
-                        scrollbar_track_background: Some(rgba(0x031417ff).into()),
-                        scrollbar_track_border: Some(rgba(0x031417ff).into()),
-                        editor_foreground: Some(rgba(0xb2cacdff).into()),
-                        editor_background: Some(rgba(0x031417ff).into()),
-                        editor_gutter_background: Some(rgba(0x031417ff).into()),
-                        editor_line_number: Some(rgba(0x4e6b6eff).into()),
-                        editor_active_line_number: Some(rgba(0xb2cacdff).into()),
-                        editor_wrap_guide: Some(rgba(0x0e6671ff).into()),
-                        editor_active_wrap_guide: Some(rgba(0x0e6671ff).into()),
-                        terminal_background: Some(rgba(0x020c0eff).into()),
-                        terminal_ansi_bright_black: Some(rgba(0x47686cff).into()),
-                        terminal_ansi_bright_red: Some(rgba(0xe97749ff).into()),
-                        terminal_ansi_bright_green: Some(rgba(0x60ebb1ff).into()),
-                        terminal_ansi_bright_yellow: Some(rgba(0xe69533ff).into()),
-                        terminal_ansi_bright_blue: Some(rgba(0x60b6ebff).into()),
-                        terminal_ansi_bright_magenta: Some(rgba(0xe798b3ff).into()),
-                        terminal_ansi_bright_cyan: Some(rgba(0x60dbebff).into()),
-                        terminal_ansi_bright_white: Some(rgba(0xc1d4d7ff).into()),
-                        terminal_ansi_black: Some(rgba(0x324a4dff).into()),
-                        terminal_ansi_red: Some(rgba(0xe66533ff).into()),
-                        terminal_ansi_green: Some(rgba(0x49e9a6ff).into()),
-                        terminal_ansi_yellow: Some(rgba(0xe4b781ff).into()),
-                        terminal_ansi_blue: Some(rgba(0x49ace9ff).into()),
-                        terminal_ansi_magenta: Some(rgba(0xdf769bff).into()),
-                        terminal_ansi_cyan: Some(rgba(0x49d6e9ff).into()),
-                        terminal_ansi_white: Some(rgba(0xb2cacdff).into()),
-                        link_text_hover: Some(rgba(0x40d4e7ff).into()),
-                        ..Default::default()
-                    },
-                    status: StatusColorsRefinement {
-                        conflict: Some(rgba(0xe4b781ff).into()),
-                        created: Some(rgba(0x8ce99aff).into()),
-                        deleted: Some(rgba(0xe34e1cff).into()),
-                        error: Some(rgba(0xe34e1cff).into()),
-                        hidden: Some(rgba(0x87a7abff).into()),
-                        hint: Some(rgba(0x969696ff).into()),
-                        ignored: Some(rgba(0x647e82ff).into()),
-                        modified: Some(rgba(0xe4b781ff).into()),
-                        warning: Some(rgba(0xffa487ff).into()),
-                        ..Default::default()
-                    },
-                    syntax: Some(UserSyntaxTheme {
-                        highlights: vec![
-                            (
-                                "boolean".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x7060ebff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "comment".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x5b858bff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "comment.doc".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x5b858bff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "constant".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xd5971aff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "constructor".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xe66533ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "function".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x16a3b6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "keyword".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xe66533ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "label".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49d6e9ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "link_text".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49d6e9ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "link_uri".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49d6e9ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "number".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x7060ebff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "preproc".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xdf769bff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "property".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x16a3b6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xb2cacdff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.bracket".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xb2cacdff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.delimiter".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xb2cacdff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.list_marker".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xb2cacdff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.special".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xb2cacdff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49e9a6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.escape".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xb2cacdff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.regex".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49e9a6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.special".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49e9a6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.special.symbol".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49e9a6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "tag".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xe66533ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "text.literal".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49e9a6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "title".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49d6e9ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "type".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xd67e5cff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "variable".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xe4b781ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "variable.special".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xe66533ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                        ],
-                    }),
-                },
-            },
-            UserTheme {
-                name: "Noctis Uva".into(),
-                appearance: Appearance::Dark,
-                styles: UserThemeStylesRefinement {
-                    colors: ThemeColorsRefinement {
-                        border: Some(rgba(0x6e67a8ff).into()),
-                        border_variant: Some(rgba(0x6e67a8ff).into()),
-                        border_focused: Some(rgba(0x2f2c49ff).into()),
-                        border_selected: Some(rgba(0x6e67a8ff).into()),
-                        border_transparent: Some(rgba(0x6e67a8ff).into()),
-                        border_disabled: Some(rgba(0x6e67a8ff).into()),
-                        elevated_surface_background: Some(rgba(0x2f2c49ff).into()),
-                        surface_background: Some(rgba(0x1f1d30ff).into()),
-                        background: Some(rgba(0x292640ff).into()),
-                        element_background: Some(rgba(0x007f99ff).into()),
-                        element_hover: Some(rgba(0x383866ff).into()),
-                        element_selected: Some(rgba(0x332e5cff).into()),
-                        drop_target_background: Some(rgba(0x202040ff).into()),
-                        ghost_element_hover: Some(rgba(0x383866ff).into()),
-                        ghost_element_selected: Some(rgba(0x332e5cff).into()),
-                        text: Some(rgba(0xc5c2d6ff).into()),
-                        text_muted: Some(rgba(0xa9a5c0ff).into()),
-                        status_bar_background: Some(rgba(0x292640ff).into()),
-                        title_bar_background: Some(rgba(0x292640ff).into()),
-                        toolbar_background: Some(rgba(0x292640ff).into()),
-                        tab_bar_background: Some(rgba(0x2f2c49ff).into()),
-                        tab_inactive_background: Some(rgba(0x2f2c49ff).into()),
-                        tab_active_background: Some(rgba(0x292640ff).into()),
-                        scrollbar_thumb_background: Some(rgba(0x7060eb33).into()),
-                        scrollbar_thumb_hover_background: Some(rgba(0x7060eb55).into()),
-                        scrollbar_thumb_border: Some(rgba(0x7060eb33).into()),
-                        scrollbar_track_background: Some(rgba(0x292640ff).into()),
-                        scrollbar_track_border: Some(rgba(0x292640ff).into()),
-                        editor_foreground: Some(rgba(0xc5c2d6ff).into()),
-                        editor_background: Some(rgba(0x292640ff).into()),
-                        editor_gutter_background: Some(rgba(0x292640ff).into()),
-                        editor_line_number: Some(rgba(0x5c5973ff).into()),
-                        editor_active_line_number: Some(rgba(0xc5c2d6ff).into()),
-                        editor_wrap_guide: Some(rgba(0x6e67a8ff).into()),
-                        editor_active_wrap_guide: Some(rgba(0x6e67a8ff).into()),
-                        terminal_background: Some(rgba(0x1f1d30ff).into()),
-                        terminal_ansi_bright_black: Some(rgba(0x504e65ff).into()),
-                        terminal_ansi_bright_red: Some(rgba(0xe97749ff).into()),
-                        terminal_ansi_bright_green: Some(rgba(0x60ebb1ff).into()),
-                        terminal_ansi_bright_yellow: Some(rgba(0xe69533ff).into()),
-                        terminal_ansi_bright_blue: Some(rgba(0x60b6ebff).into()),
-                        terminal_ansi_bright_magenta: Some(rgba(0xe798b3ff).into()),
-                        terminal_ansi_bright_cyan: Some(rgba(0x60dbebff).into()),
-                        terminal_ansi_bright_white: Some(rgba(0xc5c2d6ff).into()),
-                        terminal_ansi_black: Some(rgba(0x302f3dff).into()),
-                        terminal_ansi_red: Some(rgba(0xe66533ff).into()),
-                        terminal_ansi_green: Some(rgba(0x49e9a6ff).into()),
-                        terminal_ansi_yellow: Some(rgba(0xe4b781ff).into()),
-                        terminal_ansi_blue: Some(rgba(0x49ace9ff).into()),
-                        terminal_ansi_magenta: Some(rgba(0xdf769bff).into()),
-                        terminal_ansi_cyan: Some(rgba(0x49d6e9ff).into()),
-                        terminal_ansi_white: Some(rgba(0xb6b3ccff).into()),
-                        link_text_hover: Some(rgba(0x998ef1ff).into()),
-                        ..Default::default()
-                    },
-                    status: StatusColorsRefinement {
-                        conflict: Some(rgba(0xffc180ff).into()),
-                        created: Some(rgba(0x8ce99aff).into()),
-                        deleted: Some(rgba(0xe34e1cff).into()),
-                        error: Some(rgba(0xe34e1cff).into()),
-                        hidden: Some(rgba(0xa9a5c0ff).into()),
-                        hint: Some(rgba(0x969696ff).into()),
-                        ignored: Some(rgba(0x5b788bff).into()),
-                        modified: Some(rgba(0xffc180ff).into()),
-                        warning: Some(rgba(0xffa857ff).into()),
-                        ..Default::default()
-                    },
-                    syntax: Some(UserSyntaxTheme {
-                        highlights: vec![
-                            (
-                                "boolean".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x7060ebff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "comment".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x716c93ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "comment.doc".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x716c93ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "constant".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xd5971aff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "constructor".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xe66533ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "function".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x16a3b6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "keyword".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xe66533ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "label".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49d6e9ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "link_text".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49d6e9ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "link_uri".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49d6e9ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "number".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x7060ebff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "preproc".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xdf769bff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "property".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x16a3b6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xc5c2d6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.bracket".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xc5c2d6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.delimiter".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xc5c2d6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.list_marker".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xc5c2d6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.special".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xc5c2d6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49e9a6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.escape".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xc5c2d6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.regex".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49e9a6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.special".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49e9a6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.special.symbol".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49e9a6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "tag".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xe66533ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "text.literal".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49e9a6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "title".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49d6e9ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "type".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xd67e5cff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "variable".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xe4b781ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "variable.special".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xe66533ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                        ],
-                    }),
-                },
-            },
-            UserTheme {
-                name: "Noctis Viola".into(),
-                appearance: Appearance::Dark,
-                styles: UserThemeStylesRefinement {
-                    colors: ThemeColorsRefinement {
-                        border: Some(rgba(0x8767a8ff).into()),
-                        border_variant: Some(rgba(0x8767a8ff).into()),
-                        border_focused: Some(rgba(0x3d2e4dff).into()),
-                        border_selected: Some(rgba(0x8767a8ff).into()),
-                        border_transparent: Some(rgba(0x8767a8ff).into()),
-                        border_disabled: Some(rgba(0x8767a8ff).into()),
-                        elevated_surface_background: Some(rgba(0x3d2e4dff).into()),
-                        surface_background: Some(rgba(0x291d35ff).into()),
-                        background: Some(rgba(0x30243dff).into()),
-                        element_background: Some(rgba(0x007f99ff).into()),
-                        element_hover: Some(rgba(0x6a448dff).into()),
-                        element_selected: Some(rgba(0x472e60ff).into()),
-                        drop_target_background: Some(rgba(0x302040ff).into()),
-                        ghost_element_hover: Some(rgba(0x6a448dff).into()),
-                        ghost_element_selected: Some(rgba(0x472e60ff).into()),
-                        text: Some(rgba(0xccbfd9ff).into()),
-                        text_muted: Some(rgba(0xb3a5c0ff).into()),
-                        status_bar_background: Some(rgba(0x30243dff).into()),
-                        title_bar_background: Some(rgba(0x30243dff).into()),
-                        toolbar_background: Some(rgba(0x30243dff).into()),
-                        tab_bar_background: Some(rgba(0x3d2e4dff).into()),
-                        tab_inactive_background: Some(rgba(0x3d2e4dff).into()),
-                        tab_active_background: Some(rgba(0x30243dff).into()),
-                        scrollbar_thumb_background: Some(rgba(0xa660eb33).into()),
-                        scrollbar_thumb_hover_background: Some(rgba(0xa660eb55).into()),
-                        scrollbar_thumb_border: Some(rgba(0xa660eb33).into()),
-                        scrollbar_track_background: Some(rgba(0x30243dff).into()),
-                        scrollbar_track_border: Some(rgba(0x30243dff).into()),
-                        editor_foreground: Some(rgba(0xccbfd9ff).into()),
-                        editor_background: Some(rgba(0x30243dff).into()),
-                        editor_gutter_background: Some(rgba(0x30243dff).into()),
-                        editor_line_number: Some(rgba(0x665973ff).into()),
-                        editor_active_line_number: Some(rgba(0xccbfd9ff).into()),
-                        editor_wrap_guide: Some(rgba(0x8767a8ff).into()),
-                        editor_active_wrap_guide: Some(rgba(0x8767a8ff).into()),
-                        terminal_background: Some(rgba(0x291d35ff).into()),
-                        terminal_ansi_bright_black: Some(rgba(0x594e65ff).into()),
-                        terminal_ansi_bright_red: Some(rgba(0xe97749ff).into()),
-                        terminal_ansi_bright_green: Some(rgba(0x60ebb1ff).into()),
-                        terminal_ansi_bright_yellow: Some(rgba(0xe69533ff).into()),
-                        terminal_ansi_bright_blue: Some(rgba(0x60b6ebff).into()),
-                        terminal_ansi_bright_magenta: Some(rgba(0xe798b3ff).into()),
-                        terminal_ansi_bright_cyan: Some(rgba(0x60dbebff).into()),
-                        terminal_ansi_bright_white: Some(rgba(0xccbfd9ff).into()),
-                        terminal_ansi_black: Some(rgba(0x362f3dff).into()),
-                        terminal_ansi_red: Some(rgba(0xe66533ff).into()),
-                        terminal_ansi_green: Some(rgba(0x49e9a6ff).into()),
-                        terminal_ansi_yellow: Some(rgba(0xe4b781ff).into()),
-                        terminal_ansi_blue: Some(rgba(0x49ace9ff).into()),
-                        terminal_ansi_magenta: Some(rgba(0xdf769bff).into()),
-                        terminal_ansi_cyan: Some(rgba(0x49d6e9ff).into()),
-                        terminal_ansi_white: Some(rgba(0xbfafcfff).into()),
-                        link_text_hover: Some(rgba(0xbf8ef1ff).into()),
-                        ..Default::default()
-                    },
-                    status: StatusColorsRefinement {
-                        conflict: Some(rgba(0xffc180ff).into()),
-                        created: Some(rgba(0x8ce99aff).into()),
-                        deleted: Some(rgba(0xe34e1cff).into()),
-                        error: Some(rgba(0xe34e1cff).into()),
-                        hidden: Some(rgba(0xb3a5c0ff).into()),
-                        hint: Some(rgba(0x969696ff).into()),
-                        ignored: Some(rgba(0x5b788bff).into()),
-                        modified: Some(rgba(0xffc180ff).into()),
-                        warning: Some(rgba(0xffa857ff).into()),
-                        ..Default::default()
-                    },
-                    syntax: Some(UserSyntaxTheme {
-                        highlights: vec![
-                            (
-                                "boolean".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x7060ebff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "comment".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x7f659aff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "comment.doc".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x7f659aff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "constant".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xd5971aff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "constructor".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xe66533ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "function".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x16a3b6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "keyword".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xe66533ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "label".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49d6e9ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "link_text".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49d6e9ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "link_uri".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49d6e9ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "number".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x7060ebff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "preproc".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xdf769bff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "property".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x16a3b6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xccbfd9ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.bracket".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xccbfd9ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.delimiter".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xccbfd9ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.list_marker".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xccbfd9ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.special".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xccbfd9ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49e9a6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.escape".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xccbfd9ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.regex".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49e9a6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.special".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49e9a6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.special.symbol".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49e9a6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "tag".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xe66533ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "text.literal".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49e9a6ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "title".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x49d6e9ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "type".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xd67e5cff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "variable".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xe4b781ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "variable.special".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xe66533ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                        ],
-                    }),
-                },
-            },
-        ],
-    }
-}

crates/theme2/src/themes/nord.rs πŸ”—

@@ -1,277 +0,0 @@
-// This file was generated by the `theme_importer`.
-// Be careful when modifying it by hand.
-
-use gpui::rgba;
-
-#[allow(unused)]
-use crate::{
-    Appearance, StatusColorsRefinement, ThemeColorsRefinement, UserFontStyle, UserFontWeight,
-    UserHighlightStyle, UserSyntaxTheme, UserTheme, UserThemeFamily, UserThemeStylesRefinement,
-};
-
-pub fn nord() -> UserThemeFamily {
-    UserThemeFamily {
-        name: "Nord".into(),
-        author: "Sven Greb (svengreb)".into(),
-        themes: vec![UserTheme {
-            name: "Nord".into(),
-            appearance: Appearance::Dark,
-            styles: UserThemeStylesRefinement {
-                colors: ThemeColorsRefinement {
-                    border: Some(rgba(0x3b4252ff).into()),
-                    border_variant: Some(rgba(0x3b4252ff).into()),
-                    border_focused: Some(rgba(0x3b4252ff).into()),
-                    border_selected: Some(rgba(0x3b4252ff).into()),
-                    border_transparent: Some(rgba(0x3b4252ff).into()),
-                    border_disabled: Some(rgba(0x3b4252ff).into()),
-                    elevated_surface_background: Some(rgba(0x3b4252ff).into()),
-                    surface_background: Some(rgba(0x2e3440ff).into()),
-                    background: Some(rgba(0x2e3440ff).into()),
-                    element_background: Some(rgba(0x88c0d0ee).into()),
-                    element_hover: Some(rgba(0x3b4252ff).into()),
-                    element_selected: Some(rgba(0x88c0d0ff).into()),
-                    drop_target_background: Some(rgba(0x88c0d099).into()),
-                    ghost_element_hover: Some(rgba(0x3b4252ff).into()),
-                    ghost_element_selected: Some(rgba(0x88c0d0ff).into()),
-                    text: Some(rgba(0xd8dee9ff).into()),
-                    text_muted: Some(rgba(0xd8dee966).into()),
-                    status_bar_background: Some(rgba(0x3b4252ff).into()),
-                    title_bar_background: Some(rgba(0x2e3440ff).into()),
-                    toolbar_background: Some(rgba(0x2e3440ff).into()),
-                    tab_bar_background: Some(rgba(0x2e3440ff).into()),
-                    tab_inactive_background: Some(rgba(0x2e3440ff).into()),
-                    tab_active_background: Some(rgba(0x3b4252ff).into()),
-                    scrollbar_thumb_background: Some(rgba(0x434c5e99).into()),
-                    scrollbar_thumb_hover_background: Some(rgba(0x434c5eaa).into()),
-                    scrollbar_thumb_border: Some(rgba(0x434c5e99).into()),
-                    scrollbar_track_background: Some(rgba(0x2e3440ff).into()),
-                    scrollbar_track_border: Some(rgba(0x3b4252ff).into()),
-                    editor_foreground: Some(rgba(0xd8dee9ff).into()),
-                    editor_background: Some(rgba(0x2e3440ff).into()),
-                    editor_gutter_background: Some(rgba(0x2e3440ff).into()),
-                    editor_line_number: Some(rgba(0x4c566aff).into()),
-                    editor_active_line_number: Some(rgba(0xd8dee9ff).into()),
-                    editor_wrap_guide: Some(rgba(0x3b4252ff).into()),
-                    editor_active_wrap_guide: Some(rgba(0x3b4252ff).into()),
-                    terminal_background: Some(rgba(0x2e3440ff).into()),
-                    terminal_ansi_bright_black: Some(rgba(0x4c566aff).into()),
-                    terminal_ansi_bright_red: Some(rgba(0xbf616aff).into()),
-                    terminal_ansi_bright_green: Some(rgba(0xa3be8cff).into()),
-                    terminal_ansi_bright_yellow: Some(rgba(0xebcb8bff).into()),
-                    terminal_ansi_bright_blue: Some(rgba(0x81a1c1ff).into()),
-                    terminal_ansi_bright_magenta: Some(rgba(0xb48eadff).into()),
-                    terminal_ansi_bright_cyan: Some(rgba(0x8fbcbbff).into()),
-                    terminal_ansi_bright_white: Some(rgba(0xeceff4ff).into()),
-                    terminal_ansi_black: Some(rgba(0x3b4252ff).into()),
-                    terminal_ansi_red: Some(rgba(0xbf616aff).into()),
-                    terminal_ansi_green: Some(rgba(0xa3be8cff).into()),
-                    terminal_ansi_yellow: Some(rgba(0xebcb8bff).into()),
-                    terminal_ansi_blue: Some(rgba(0x81a1c1ff).into()),
-                    terminal_ansi_magenta: Some(rgba(0xb48eadff).into()),
-                    terminal_ansi_cyan: Some(rgba(0x88c0d0ff).into()),
-                    terminal_ansi_white: Some(rgba(0xe5e9f0ff).into()),
-                    link_text_hover: Some(rgba(0x88c0d0ff).into()),
-                    ..Default::default()
-                },
-                status: StatusColorsRefinement {
-                    conflict: Some(rgba(0x5e81acff).into()),
-                    created: Some(rgba(0xa3be8cff).into()),
-                    deleted: Some(rgba(0xbf616aff).into()),
-                    error: Some(rgba(0xbf616aff).into()),
-                    hidden: Some(rgba(0xd8dee966).into()),
-                    hint: Some(rgba(0xd8dee9ff).into()),
-                    ignored: Some(rgba(0xd8dee966).into()),
-                    modified: Some(rgba(0xebcb8bff).into()),
-                    warning: Some(rgba(0xebcb8bff).into()),
-                    ..Default::default()
-                },
-                syntax: Some(UserSyntaxTheme {
-                    highlights: vec![
-                        (
-                            "attribute".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0x8fbcbbff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "boolean".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0x81a1c1ff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "comment".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0x616e88ff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "comment.doc".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0x616e88ff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "constant".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0x81a1c1ff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "constructor".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0x81a1c1ff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "function".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0x88c0d0ff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "keyword".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0x81a1c1ff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "number".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0xb48eadff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "operator".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0x81a1c1ff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "preproc".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0x5e81acff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "punctuation".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0xeceff4ff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "punctuation.bracket".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0xeceff4ff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "punctuation.delimiter".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0x81a1c1ff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "punctuation.list_marker".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0xeceff4ff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "punctuation.special".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0xeceff4ff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "string".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0xa3be8cff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "string.escape".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0xebcb8bff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "string.regex".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0xa3be8cff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "string.special".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0xa3be8cff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "string.special.symbol".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0xa3be8cff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "tag".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0x81a1c1ff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "text.literal".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0xa3be8cff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "type".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0x8fbcbbff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "variable".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0x81a1c1ff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "variable.special".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0x81a1c1ff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                    ],
-                }),
-            },
-        }],
-    }
-}

crates/theme2/src/themes/palenight.rs β†’ crates/theme2/src/themes/one.rs πŸ”—

@@ -9,77 +9,68 @@ use crate::{
     UserHighlightStyle, UserSyntaxTheme, UserTheme, UserThemeFamily, UserThemeStylesRefinement,
 };
 
-pub fn palenight() -> UserThemeFamily {
+pub fn one() -> UserThemeFamily {
     UserThemeFamily {
-        name: "Palenight".into(),
-        author: "Olaolu Olawuyi (whizkydee)".into(),
+        name: "One".into(),
+        author: "Zed Industries".into(),
         themes: vec![
             UserTheme {
-                name: "Palenight".into(),
-                appearance: Appearance::Dark,
+                name: "One Light".into(),
+                appearance: Appearance::Light,
                 styles: UserThemeStylesRefinement {
                     colors: ThemeColorsRefinement {
-                        border: Some(rgba(0x282b3cff).into()),
-                        border_variant: Some(rgba(0x282b3cff).into()),
-                        border_focused: Some(rgba(0x282b3cff).into()),
-                        border_selected: Some(rgba(0x282b3cff).into()),
-                        border_transparent: Some(rgba(0x282b3cff).into()),
-                        border_disabled: Some(rgba(0x282b3cff).into()),
-                        elevated_surface_background: Some(rgba(0x292d3eff).into()),
-                        surface_background: Some(rgba(0x292d3eff).into()),
-                        background: Some(rgba(0x292d3eff).into()),
-                        element_background: Some(rgba(0x7e57c2cc).into()),
-                        element_hover: Some(rgba(0x0000001a).into()),
-                        element_selected: Some(rgba(0x7e57c2ff).into()),
-                        drop_target_background: Some(rgba(0x2e3245ff).into()),
-                        ghost_element_hover: Some(rgba(0x0000001a).into()),
-                        ghost_element_selected: Some(rgba(0x7e57c2ff).into()),
-                        text: Some(rgba(0xffffffff).into()),
-                        text_muted: Some(rgba(0x929ac9ff).into()),
-                        status_bar_background: Some(rgba(0x282c3dff).into()),
-                        title_bar_background: Some(rgba(0x292d3eff).into()),
-                        toolbar_background: Some(rgba(0x292d3eff).into()),
-                        tab_bar_background: Some(rgba(0x31364aff).into()),
-                        tab_inactive_background: Some(rgba(0x31364aff).into()),
-                        tab_active_background: Some(rgba(0x292d3eff).into()),
-                        scrollbar_thumb_background: Some(rgba(0x694ca466).into()),
-                        scrollbar_thumb_hover_background: Some(rgba(0x694ca4cc).into()),
-                        scrollbar_thumb_border: Some(rgba(0x694ca466).into()),
-                        scrollbar_track_background: Some(rgba(0x292d3eff).into()),
-                        editor_foreground: Some(rgba(0xbfc7d5ff).into()),
-                        editor_background: Some(rgba(0x292d3eff).into()),
-                        editor_gutter_background: Some(rgba(0x292d3eff).into()),
-                        editor_line_number: Some(rgba(0x4c5374ff).into()),
-                        editor_active_line_number: Some(rgba(0xbfc7d5ff).into()),
-                        editor_wrap_guide: Some(rgba(0x282b3cff).into()),
-                        editor_active_wrap_guide: Some(rgba(0x282b3cff).into()),
-                        terminal_ansi_bright_black: Some(rgba(0x676e95ff).into()),
-                        terminal_ansi_bright_red: Some(rgba(0xff5572ff).into()),
-                        terminal_ansi_bright_green: Some(rgba(0xc3e88dff).into()),
-                        terminal_ansi_bright_yellow: Some(rgba(0xffcb6bff).into()),
-                        terminal_ansi_bright_blue: Some(rgba(0x82aaffff).into()),
-                        terminal_ansi_bright_magenta: Some(rgba(0xc792eaff).into()),
-                        terminal_ansi_bright_cyan: Some(rgba(0x89ddffff).into()),
-                        terminal_ansi_bright_white: Some(rgba(0xffffffff).into()),
-                        terminal_ansi_black: Some(rgba(0x676e95ff).into()),
-                        terminal_ansi_red: Some(rgba(0xff5572ff).into()),
-                        terminal_ansi_green: Some(rgba(0xa9c77dff).into()),
-                        terminal_ansi_yellow: Some(rgba(0xffcb6bff).into()),
-                        terminal_ansi_blue: Some(rgba(0x82aaffff).into()),
-                        terminal_ansi_magenta: Some(rgba(0xc792eaff).into()),
-                        terminal_ansi_cyan: Some(rgba(0x89ddffff).into()),
-                        terminal_ansi_white: Some(rgba(0xffffffff).into()),
+                        border: Some(rgba(0xc9c9caff).into()),
+                        border_variant: Some(rgba(0xc9c9caff).into()),
+                        elevated_surface_background: Some(rgba(0xdcdcddff).into()),
+                        background: Some(rgba(0xdcdcddff).into()),
+                        panel_background: Some(rgba(0xebebecff).into()),
+                        element_hover: Some(rgba(0xc9c9ca80).into()),
+                        element_selected: Some(rgba(0xafafaf80).into()),
+                        text: Some(rgba(0x7f8188ff).into()),
+                        text_muted: Some(rgba(0xa7a7a8ff).into()),
+                        status_bar_background: Some(rgba(0xdcdcddff).into()),
+                        title_bar_background: Some(rgba(0xdcdcddff).into()),
+                        toolbar_background: Some(rgba(0xfafafaff).into()),
+                        tab_bar_background: Some(rgba(0xebebecff).into()),
+                        tab_inactive_background: Some(rgba(0xebebecff).into()),
+                        tab_active_background: Some(rgba(0xfafafaff).into()),
+                        scrollbar_thumb_background: Some(rgba(0x383a414d).into()),
+                        scrollbar_thumb_hover_background: Some(rgba(0x383a414d).into()),
+                        scrollbar_thumb_border: Some(rgba(0xeeeeeeff).into()),
+                        scrollbar_track_border: Some(rgba(0xeeeeeeff).into()),
+                        editor_foreground: Some(rgba(0x383a41ff).into()),
+                        editor_background: Some(rgba(0xfafafaff).into()),
+                        editor_gutter_background: Some(rgba(0xfafafaff).into()),
+                        editor_line_number: Some(rgba(0x383a4159).into()),
+                        editor_active_line_number: Some(rgba(0x383a41ff).into()),
+                        editor_wrap_guide: Some(rgba(0x383a410d).into()),
+                        editor_active_wrap_guide: Some(rgba(0x383a411a).into()),
+                        terminal_background: Some(rgba(0xfafafaff).into()),
+                        terminal_ansi_bright_black: Some(rgba(0xaaaaaaff).into()),
+                        terminal_ansi_bright_red: Some(rgba(0xf0b0a4ff).into()),
+                        terminal_ansi_bright_green: Some(rgba(0xb2cfa9ff).into()),
+                        terminal_ansi_bright_yellow: Some(rgba(0xf1dfc1ff).into()),
+                        terminal_ansi_bright_blue: Some(rgba(0xb5baf2ff).into()),
+                        terminal_ansi_bright_magenta: Some(rgba(0xcea6d3ff).into()),
+                        terminal_ansi_bright_cyan: Some(rgba(0xa4bfdbff).into()),
+                        terminal_ansi_bright_white: Some(rgba(0x383a41ff).into()),
+                        terminal_ansi_black: Some(rgba(0xfafafaff).into()),
+                        terminal_ansi_red: Some(rgba(0xd36151ff).into()),
+                        terminal_ansi_green: Some(rgba(0x669f59ff).into()),
+                        terminal_ansi_yellow: Some(rgba(0xdec184ff).into()),
+                        terminal_ansi_blue: Some(rgba(0x5c79e2ff).into()),
+                        terminal_ansi_magenta: Some(rgba(0x994fa6ff).into()),
+                        terminal_ansi_cyan: Some(rgba(0x3b82b7ff).into()),
+                        terminal_ansi_white: Some(rgba(0x383a41ff).into()),
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
-                        conflict: Some(rgba(0xffeb95cc).into()),
-                        created: Some(rgba(0x9ccc65ff).into()),
-                        deleted: Some(rgba(0xef5350ff).into()),
-                        error: Some(rgba(0xef5350ff).into()),
-                        hidden: Some(rgba(0x929ac9ff).into()),
-                        hint: Some(rgba(0x969696ff).into()),
-                        ignored: Some(rgba(0x69709890).into()),
-                        modified: Some(rgba(0xe2b93dff).into()),
+                        created: Some(rgba(0x84b278ff).into()),
+                        deleted: Some(rgba(0xd36151ff).into()),
+                        error: Some(rgba(0xd36151ff).into()),
+                        modified: Some(rgba(0xdec184ff).into()),
+                        success: Some(rgba(0x383a41ff).into()),
+                        warning: Some(rgba(0xdec184ff).into()),
                         ..Default::default()
                     },
                     syntax: Some(UserSyntaxTheme {
@@ -87,502 +78,278 @@ pub fn palenight() -> UserThemeFamily {
                             (
                                 "attribute".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xffcb6bff).into()),
+                                    color: Some(rgba(0x5c79e2ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "boolean".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x82aaffff).into()),
+                                    color: Some(rgba(0xad6f26ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "comment".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x697098ff).into()),
-                                    font_style: Some(UserFontStyle::Italic),
+                                    color: Some(rgba(0xa2a3a7ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "comment.doc".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x697098ff).into()),
-                                    font_style: Some(UserFontStyle::Italic),
+                                    color: Some(rgba(0x7c7e86ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "constant".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x82aaffff).into()),
+                                    color: Some(rgba(0x669f59ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "constructor".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xff5572ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "emphasis".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xc792eaff).into()),
-                                    font_style: Some(UserFontStyle::Italic),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "emphasis.strong".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xffcb6bff).into()),
-                                    font_weight: Some(UserFontWeight(700.0)),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "function".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x82aaffff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "keyword".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xc792eaff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "link_text".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xff869aff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "link_uri".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xff869aff).into()),
+                                    color: Some(rgba(0x5c79e2ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
-                                "number".into(),
+                                "embedded".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xf78c6cff).into()),
+                                    color: Some(rgba(0x383a41ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
-                                "operator".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x89ddffff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "property".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x80cbc4ff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xc792eaff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.bracket".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xc792eaff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.delimiter".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xc792eaff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.list_marker".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xc792eaff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "punctuation.special".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xc792eaff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xc3e88dff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.escape".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x82aaffff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.regex".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xc3e88dff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.special".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xc3e88dff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "string.special.symbol".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xc3e88dff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "tag".into(),
+                                "emphasis".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xff5572ff).into()),
+                                    color: Some(rgba(0x5c79e2ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
-                                "text.literal".into(),
+                                "emphasis.strong".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xc3e88dff).into()),
+                                    color: Some(rgba(0xad6f26ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
                                     ..Default::default()
                                 },
                             ),
                             (
-                                "type".into(),
+                                "enum".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xffcb6bff).into()),
+                                    color: Some(rgba(0xd36050ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
-                                "variable".into(),
+                                "function".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xffcb6bff).into()),
+                                    color: Some(rgba(0x5b79e3ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
-                                "variable.special".into(),
+                                "hint".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xff5572ff).into()),
+                                    color: Some(rgba(0x9295beff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
                                     ..Default::default()
                                 },
                             ),
-                        ],
-                    }),
-                },
-            },
-            UserTheme {
-                name: "Palenight Operator".into(),
-                appearance: Appearance::Dark,
-                styles: UserThemeStylesRefinement {
-                    colors: ThemeColorsRefinement {
-                        border: Some(rgba(0x282b3cff).into()),
-                        border_variant: Some(rgba(0x282b3cff).into()),
-                        border_focused: Some(rgba(0x282b3cff).into()),
-                        border_selected: Some(rgba(0x282b3cff).into()),
-                        border_transparent: Some(rgba(0x282b3cff).into()),
-                        border_disabled: Some(rgba(0x282b3cff).into()),
-                        elevated_surface_background: Some(rgba(0x292d3eff).into()),
-                        surface_background: Some(rgba(0x292d3eff).into()),
-                        background: Some(rgba(0x292d3eff).into()),
-                        element_background: Some(rgba(0x7e57c2cc).into()),
-                        element_hover: Some(rgba(0x0000001a).into()),
-                        element_selected: Some(rgba(0x7e57c2ff).into()),
-                        drop_target_background: Some(rgba(0x2e3245ff).into()),
-                        ghost_element_hover: Some(rgba(0x0000001a).into()),
-                        ghost_element_selected: Some(rgba(0x7e57c2ff).into()),
-                        text: Some(rgba(0xffffffff).into()),
-                        text_muted: Some(rgba(0x929ac9ff).into()),
-                        status_bar_background: Some(rgba(0x282c3dff).into()),
-                        title_bar_background: Some(rgba(0x292d3eff).into()),
-                        toolbar_background: Some(rgba(0x292d3eff).into()),
-                        tab_bar_background: Some(rgba(0x31364aff).into()),
-                        tab_inactive_background: Some(rgba(0x31364aff).into()),
-                        tab_active_background: Some(rgba(0x292d3eff).into()),
-                        scrollbar_thumb_background: Some(rgba(0x694ca466).into()),
-                        scrollbar_thumb_hover_background: Some(rgba(0x694ca4cc).into()),
-                        scrollbar_thumb_border: Some(rgba(0x694ca466).into()),
-                        scrollbar_track_background: Some(rgba(0x292d3eff).into()),
-                        editor_foreground: Some(rgba(0xbfc7d5ff).into()),
-                        editor_background: Some(rgba(0x292d3eff).into()),
-                        editor_gutter_background: Some(rgba(0x292d3eff).into()),
-                        editor_line_number: Some(rgba(0x4c5374ff).into()),
-                        editor_active_line_number: Some(rgba(0xbfc7d5ff).into()),
-                        editor_wrap_guide: Some(rgba(0x282b3cff).into()),
-                        editor_active_wrap_guide: Some(rgba(0x282b3cff).into()),
-                        terminal_ansi_bright_black: Some(rgba(0x676e95ff).into()),
-                        terminal_ansi_bright_red: Some(rgba(0xff5572ff).into()),
-                        terminal_ansi_bright_green: Some(rgba(0xc3e88dff).into()),
-                        terminal_ansi_bright_yellow: Some(rgba(0xffcb6bff).into()),
-                        terminal_ansi_bright_blue: Some(rgba(0x82aaffff).into()),
-                        terminal_ansi_bright_magenta: Some(rgba(0xc792eaff).into()),
-                        terminal_ansi_bright_cyan: Some(rgba(0x89ddffff).into()),
-                        terminal_ansi_bright_white: Some(rgba(0xffffffff).into()),
-                        terminal_ansi_black: Some(rgba(0x676e95ff).into()),
-                        terminal_ansi_red: Some(rgba(0xff5572ff).into()),
-                        terminal_ansi_green: Some(rgba(0xa9c77dff).into()),
-                        terminal_ansi_yellow: Some(rgba(0xffcb6bff).into()),
-                        terminal_ansi_blue: Some(rgba(0x82aaffff).into()),
-                        terminal_ansi_magenta: Some(rgba(0xc792eaff).into()),
-                        terminal_ansi_cyan: Some(rgba(0x89ddffff).into()),
-                        terminal_ansi_white: Some(rgba(0xffffffff).into()),
-                        ..Default::default()
-                    },
-                    status: StatusColorsRefinement {
-                        conflict: Some(rgba(0xffeb95cc).into()),
-                        created: Some(rgba(0x9ccc65ff).into()),
-                        deleted: Some(rgba(0xef5350ff).into()),
-                        error: Some(rgba(0xef5350ff).into()),
-                        hidden: Some(rgba(0x929ac9ff).into()),
-                        hint: Some(rgba(0x969696ff).into()),
-                        ignored: Some(rgba(0x69709890).into()),
-                        modified: Some(rgba(0xe2b93dff).into()),
-                        ..Default::default()
-                    },
-                    syntax: Some(UserSyntaxTheme {
-                        highlights: vec![
                             (
-                                "attribute".into(),
+                                "keyword".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xffcb6bff).into()),
+                                    color: Some(rgba(0xa449abff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
-                                "boolean".into(),
+                                "label".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x82aaffff).into()),
+                                    color: Some(rgba(0x5c79e2ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
-                                "comment".into(),
+                                "link_text".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x697098ff).into()),
+                                    color: Some(rgba(0x5b79e3ff).into()),
                                     font_style: Some(UserFontStyle::Italic),
                                     ..Default::default()
                                 },
                             ),
                             (
-                                "comment.doc".into(),
+                                "link_uri".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x697098ff).into()),
-                                    font_style: Some(UserFontStyle::Italic),
+                                    color: Some(rgba(0x3982b7ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
-                                "constant".into(),
+                                "number".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x82aaffff).into()),
+                                    color: Some(rgba(0xad6f26ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
-                                "constructor".into(),
+                                "operator".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xff5572ff).into()),
+                                    color: Some(rgba(0x3982b7ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
-                                "emphasis".into(),
+                                "predictive".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xc792eaff).into()),
+                                    color: Some(rgba(0x9c9fc7ff).into()),
                                     font_style: Some(UserFontStyle::Italic),
                                     ..Default::default()
                                 },
                             ),
                             (
-                                "emphasis.strong".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xffcb6bff).into()),
-                                    font_weight: Some(UserFontWeight(700.0)),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "function".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0x82aaffff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "keyword".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xc792eaff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "link_text".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xff869aff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "link_uri".into(),
-                                UserHighlightStyle {
-                                    color: Some(rgba(0xff869aff).into()),
-                                    ..Default::default()
-                                },
-                            ),
-                            (
-                                "number".into(),
+                                "preproc".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xf78c6cff).into()),
+                                    color: Some(rgba(0x383a41ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
-                                "operator".into(),
+                                "primary".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x89ddffff).into()),
+                                    color: Some(rgba(0x383a41ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "property".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x80cbc4ff).into()),
+                                    color: Some(rgba(0xd36050ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xc792eaff).into()),
+                                    color: Some(rgba(0x383a41ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation.bracket".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xc792eaff).into()),
+                                    color: Some(rgba(0x4d4f52ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation.delimiter".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xc792eaff).into()),
+                                    color: Some(rgba(0x4d4f52ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation.list_marker".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xc792eaff).into()),
+                                    color: Some(rgba(0xd36050ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation.special".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xc792eaff).into()),
+                                    color: Some(rgba(0xb92c46ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xc3e88dff).into()),
+                                    color: Some(rgba(0x659f58ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string.escape".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x82aaffff).into()),
+                                    color: Some(rgba(0x7c7e86ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string.regex".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xc3e88dff).into()),
+                                    color: Some(rgba(0xad6f27ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string.special".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xc3e88dff).into()),
+                                    color: Some(rgba(0xad6f27ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string.special.symbol".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xc3e88dff).into()),
+                                    color: Some(rgba(0xad6f27ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "tag".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xff5572ff).into()),
+                                    color: Some(rgba(0x5c79e2ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "text.literal".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xc3e88dff).into()),
+                                    color: Some(rgba(0x659f58ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "title".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xd36050ff).into()),
+                                    font_weight: Some(UserFontWeight(400.0)),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "type".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xffcb6bff).into()),
+                                    color: Some(rgba(0x3982b7ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "variable".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xffcb6bff).into()),
+                                    color: Some(rgba(0x383a41ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "variable.special".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xff5572ff).into()),
+                                    color: Some(rgba(0xad6f26ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variant".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x5b79e3ff).into()),
                                     ..Default::default()
                                 },
                             ),
@@ -591,71 +358,62 @@ pub fn palenight() -> UserThemeFamily {
                 },
             },
             UserTheme {
-                name: "Palenight (Mild Contrast)".into(),
+                name: "One Dark".into(),
                 appearance: Appearance::Dark,
                 styles: UserThemeStylesRefinement {
                     colors: ThemeColorsRefinement {
-                        border: Some(rgba(0x2c2f40ff).into()),
-                        border_variant: Some(rgba(0x2c2f40ff).into()),
-                        border_focused: Some(rgba(0x2c2f40ff).into()),
-                        border_selected: Some(rgba(0x2c2f40ff).into()),
-                        border_transparent: Some(rgba(0x2c2f40ff).into()),
-                        border_disabled: Some(rgba(0x2c2f40ff).into()),
-                        elevated_surface_background: Some(rgba(0x292d3eff).into()),
-                        surface_background: Some(rgba(0x25293aff).into()),
-                        background: Some(rgba(0x292d3eff).into()),
-                        element_background: Some(rgba(0x7e57c2cc).into()),
-                        element_hover: Some(rgba(0x0000001a).into()),
-                        element_selected: Some(rgba(0x7e57c2ff).into()),
-                        drop_target_background: Some(rgba(0x2e3245ff).into()),
-                        ghost_element_hover: Some(rgba(0x0000001a).into()),
-                        ghost_element_selected: Some(rgba(0x7e57c2ff).into()),
-                        text: Some(rgba(0xffffffff).into()),
-                        text_muted: Some(rgba(0x929ac9ff).into()),
-                        status_bar_background: Some(rgba(0x25293aff).into()),
-                        title_bar_background: Some(rgba(0x25293aff).into()),
-                        toolbar_background: Some(rgba(0x292d3eff).into()),
-                        tab_bar_background: Some(rgba(0x31364aff).into()),
-                        tab_inactive_background: Some(rgba(0x31364aff).into()),
-                        tab_active_background: Some(rgba(0x25293aff).into()),
-                        scrollbar_thumb_background: Some(rgba(0x694ca466).into()),
-                        scrollbar_thumb_hover_background: Some(rgba(0x694ca4cc).into()),
-                        scrollbar_thumb_border: Some(rgba(0x694ca466).into()),
-                        scrollbar_track_background: Some(rgba(0x292d3eff).into()),
-                        editor_foreground: Some(rgba(0xbfc7d5ff).into()),
-                        editor_background: Some(rgba(0x292d3eff).into()),
-                        editor_gutter_background: Some(rgba(0x292d3eff).into()),
-                        editor_line_number: Some(rgba(0x4c5374ff).into()),
-                        editor_active_line_number: Some(rgba(0xbfc7d5ff).into()),
-                        editor_wrap_guide: Some(rgba(0x2c2f40ff).into()),
-                        editor_active_wrap_guide: Some(rgba(0x2c2f40ff).into()),
-                        terminal_ansi_bright_black: Some(rgba(0x676e95ff).into()),
-                        terminal_ansi_bright_red: Some(rgba(0xff5572ff).into()),
-                        terminal_ansi_bright_green: Some(rgba(0xc3e88dff).into()),
-                        terminal_ansi_bright_yellow: Some(rgba(0xffcb6bff).into()),
-                        terminal_ansi_bright_blue: Some(rgba(0x82aaffff).into()),
-                        terminal_ansi_bright_magenta: Some(rgba(0xc792eaff).into()),
-                        terminal_ansi_bright_cyan: Some(rgba(0x89ddffff).into()),
-                        terminal_ansi_bright_white: Some(rgba(0xffffffff).into()),
-                        terminal_ansi_black: Some(rgba(0x676e95ff).into()),
-                        terminal_ansi_red: Some(rgba(0xff5572ff).into()),
-                        terminal_ansi_green: Some(rgba(0xa9c77dff).into()),
-                        terminal_ansi_yellow: Some(rgba(0xffcb6bff).into()),
-                        terminal_ansi_blue: Some(rgba(0x82aaffff).into()),
-                        terminal_ansi_magenta: Some(rgba(0xc792eaff).into()),
-                        terminal_ansi_cyan: Some(rgba(0x89ddffff).into()),
-                        terminal_ansi_white: Some(rgba(0xffffffff).into()),
+                        border: Some(rgba(0x464b57ff).into()),
+                        border_variant: Some(rgba(0x464b57ff).into()),
+                        elevated_surface_background: Some(rgba(0x3b414dff).into()),
+                        background: Some(rgba(0x3b414dff).into()),
+                        panel_background: Some(rgba(0x2f343eff).into()),
+                        element_hover: Some(rgba(0x464b5780).into()),
+                        element_selected: Some(rgba(0x4f545e80).into()),
+                        text: Some(rgba(0x838994ff).into()),
+                        text_muted: Some(rgba(0x545862ff).into()),
+                        status_bar_background: Some(rgba(0x3b414dff).into()),
+                        title_bar_background: Some(rgba(0x3b414dff).into()),
+                        toolbar_background: Some(rgba(0x282c34ff).into()),
+                        tab_bar_background: Some(rgba(0x2f343eff).into()),
+                        tab_inactive_background: Some(rgba(0x2f343eff).into()),
+                        tab_active_background: Some(rgba(0x282c34ff).into()),
+                        scrollbar_thumb_background: Some(rgba(0xc8ccd44d).into()),
+                        scrollbar_thumb_hover_background: Some(rgba(0xc8ccd44d).into()),
+                        scrollbar_thumb_border: Some(rgba(0x2e333cff).into()),
+                        scrollbar_track_border: Some(rgba(0x2e333cff).into()),
+                        editor_foreground: Some(rgba(0xacb2beff).into()),
+                        editor_background: Some(rgba(0x282c34ff).into()),
+                        editor_gutter_background: Some(rgba(0x282c34ff).into()),
+                        editor_line_number: Some(rgba(0xc8ccd459).into()),
+                        editor_active_line_number: Some(rgba(0xc8ccd4ff).into()),
+                        editor_wrap_guide: Some(rgba(0xc8ccd40d).into()),
+                        editor_active_wrap_guide: Some(rgba(0xc8ccd41a).into()),
+                        terminal_background: Some(rgba(0x282c34ff).into()),
+                        terminal_ansi_bright_black: Some(rgba(0x525661ff).into()),
+                        terminal_ansi_bright_red: Some(rgba(0x673a3cff).into()),
+                        terminal_ansi_bright_green: Some(rgba(0x4d6140ff).into()),
+                        terminal_ansi_bright_yellow: Some(rgba(0x786441ff).into()),
+                        terminal_ansi_bright_blue: Some(rgba(0x385378ff).into()),
+                        terminal_ansi_bright_magenta: Some(rgba(0x5e2b26ff).into()),
+                        terminal_ansi_bright_cyan: Some(rgba(0x3a565bff).into()),
+                        terminal_ansi_bright_white: Some(rgba(0xc8ccd4ff).into()),
+                        terminal_ansi_black: Some(rgba(0x282c34ff).into()),
+                        terminal_ansi_red: Some(rgba(0xd07277ff).into()),
+                        terminal_ansi_green: Some(rgba(0xa1c181ff).into()),
+                        terminal_ansi_yellow: Some(rgba(0xdec184ff).into()),
+                        terminal_ansi_blue: Some(rgba(0x74ade8ff).into()),
+                        terminal_ansi_magenta: Some(rgba(0xbe5046ff).into()),
+                        terminal_ansi_cyan: Some(rgba(0x6fb4c0ff).into()),
+                        terminal_ansi_white: Some(rgba(0xc8ccd4ff).into()),
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
-                        conflict: Some(rgba(0xffeb95cc).into()),
-                        created: Some(rgba(0x9ccc65ff).into()),
-                        deleted: Some(rgba(0xef5350ff).into()),
-                        error: Some(rgba(0xef5350ff).into()),
-                        hidden: Some(rgba(0x929ac9ff).into()),
-                        hint: Some(rgba(0x969696ff).into()),
-                        ignored: Some(rgba(0x69709890).into()),
-                        modified: Some(rgba(0xe2b93dff).into()),
+                        created: Some(rgba(0xa1c181ff).into()),
+                        deleted: Some(rgba(0xa45a5eff).into()),
+                        error: Some(rgba(0xd07277ff).into()),
+                        modified: Some(rgba(0xdec184ff).into()),
+                        success: Some(rgba(0xc8ccd4ff).into()),
+                        warning: Some(rgba(0xdec184ff).into()),
                         ..Default::default()
                     },
                     syntax: Some(UserSyntaxTheme {
@@ -663,214 +421,278 @@ pub fn palenight() -> UserThemeFamily {
                             (
                                 "attribute".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xffcb6bff).into()),
+                                    color: Some(rgba(0x74ade8ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "boolean".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x82aaffff).into()),
+                                    color: Some(rgba(0xc0966bff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "comment".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x697098ff).into()),
-                                    font_style: Some(UserFontStyle::Italic),
+                                    color: Some(rgba(0x5d636fff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "comment.doc".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x697098ff).into()),
-                                    font_style: Some(UserFontStyle::Italic),
+                                    color: Some(rgba(0x878e98ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "constant".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x82aaffff).into()),
+                                    color: Some(rgba(0xdfc184ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "constructor".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xff5572ff).into()),
+                                    color: Some(rgba(0x74ade9ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "embedded".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xc8ccd4ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "emphasis".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xc792eaff).into()),
-                                    font_style: Some(UserFontStyle::Italic),
+                                    color: Some(rgba(0x74ade8ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "emphasis.strong".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xffcb6bff).into()),
+                                    color: Some(rgba(0xc0966bff).into()),
                                     font_weight: Some(UserFontWeight(700.0)),
                                     ..Default::default()
                                 },
                             ),
+                            (
+                                "enum".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xd07277ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
                             (
                                 "function".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x82aaffff).into()),
+                                    color: Some(rgba(0x74ade9ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "hint".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x5b708aff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "keyword".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xc792eaff).into()),
+                                    color: Some(rgba(0xb478cfff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "label".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x74ade8ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "link_text".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xff869aff).into()),
+                                    color: Some(rgba(0x74ade9ff).into()),
+                                    font_style: Some(UserFontStyle::Normal),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "link_uri".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xff869aff).into()),
+                                    color: Some(rgba(0x6fb4c0ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "number".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xf78c6cff).into()),
+                                    color: Some(rgba(0xc0966bff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "operator".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x89ddffff).into()),
+                                    color: Some(rgba(0x6fb4c0ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "predictive".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x5b6b88ff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "preproc".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xc8ccd4ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "primary".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xacb2beff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "property".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x80cbc4ff).into()),
+                                    color: Some(rgba(0xd07277ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xc792eaff).into()),
+                                    color: Some(rgba(0xacb2beff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation.bracket".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xc792eaff).into()),
+                                    color: Some(rgba(0xb2b9c6ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation.delimiter".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xc792eaff).into()),
+                                    color: Some(rgba(0xb2b9c6ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation.list_marker".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xc792eaff).into()),
+                                    color: Some(rgba(0xd07277ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation.special".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xc792eaff).into()),
+                                    color: Some(rgba(0xb1574bff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xc3e88dff).into()),
+                                    color: Some(rgba(0xa1c181ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string.escape".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x82aaffff).into()),
+                                    color: Some(rgba(0x878e98ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string.regex".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xc3e88dff).into()),
+                                    color: Some(rgba(0xc0966bff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string.special".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xc3e88dff).into()),
+                                    color: Some(rgba(0xc0966bff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string.special.symbol".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xc3e88dff).into()),
+                                    color: Some(rgba(0xc0966bff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "tag".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xff5572ff).into()),
+                                    color: Some(rgba(0x74ade8ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "text.literal".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xc3e88dff).into()),
+                                    color: Some(rgba(0xa1c181ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "title".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xd07277ff).into()),
+                                    font_weight: Some(UserFontWeight(400.0)),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "type".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xffcb6bff).into()),
+                                    color: Some(rgba(0x6fb4c0ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "variable".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xffcb6bff).into()),
+                                    color: Some(rgba(0xc8ccd4ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "variable.special".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xff5572ff).into()),
+                                    color: Some(rgba(0xc0966bff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "variant".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x74ade9ff).into()),
                                     ..Default::default()
                                 },
                             ),

crates/theme2/src/themes/rose_pine.rs πŸ”—

@@ -12,77 +12,65 @@ use crate::{
 pub fn rose_pine() -> UserThemeFamily {
     UserThemeFamily {
         name: "RosΓ© Pine".into(),
-        author: "RosΓ© Pine".into(),
+        author: "Zed Industries".into(),
         themes: vec![
             UserTheme {
-                name: "RosΓ© Pine".into(),
-                appearance: Appearance::Dark,
+                name: "RosΓ© Pine Dawn".into(),
+                appearance: Appearance::Light,
                 styles: UserThemeStylesRefinement {
                     colors: ThemeColorsRefinement {
-                        border: Some(rgba(0x00000000).into()),
-                        border_variant: Some(rgba(0x00000000).into()),
-                        border_focused: Some(rgba(0x6e6a8633).into()),
-                        border_selected: Some(rgba(0x00000000).into()),
-                        border_transparent: Some(rgba(0x00000000).into()),
-                        border_disabled: Some(rgba(0x00000000).into()),
-                        elevated_surface_background: Some(rgba(0x1f1d2eff).into()),
-                        surface_background: Some(rgba(0x1f1d2eff).into()),
-                        background: Some(rgba(0x191724ff).into()),
-                        element_background: Some(rgba(0xebbcbaff).into()),
-                        element_hover: Some(rgba(0x6e6a861a).into()),
-                        element_selected: Some(rgba(0x6e6a8633).into()),
-                        drop_target_background: Some(rgba(0x1f1d2eff).into()),
-                        ghost_element_hover: Some(rgba(0x6e6a861a).into()),
-                        ghost_element_selected: Some(rgba(0x6e6a8633).into()),
-                        text: Some(rgba(0xe0def4ff).into()),
-                        text_muted: Some(rgba(0x908caaff).into()),
-                        status_bar_background: Some(rgba(0x191724ff).into()),
-                        title_bar_background: Some(rgba(0x191724ff).into()),
-                        toolbar_background: Some(rgba(0x191724ff).into()),
-                        tab_bar_background: Some(rgba(0x00000000).into()),
-                        tab_inactive_background: Some(rgba(0x00000000).into()),
-                        tab_active_background: Some(rgba(0x6e6a861a).into()),
-                        scrollbar_thumb_background: Some(rgba(0x6e6a8633).into()),
-                        scrollbar_thumb_hover_background: Some(rgba(0x6e6a8666).into()),
-                        scrollbar_thumb_border: Some(rgba(0x6e6a8633).into()),
-                        scrollbar_track_background: Some(rgba(0x191724ff).into()),
-                        scrollbar_track_border: Some(rgba(0x6e6a8666).into()),
-                        editor_foreground: Some(rgba(0xe0def4ff).into()),
-                        editor_background: Some(rgba(0x191724ff).into()),
-                        editor_gutter_background: Some(rgba(0x191724ff).into()),
-                        editor_line_number: Some(rgba(0x908caaff).into()),
-                        editor_active_line_number: Some(rgba(0xe0def4ff).into()),
-                        editor_wrap_guide: Some(rgba(0x00000000).into()),
-                        editor_active_wrap_guide: Some(rgba(0x00000000).into()),
-                        terminal_ansi_bright_black: Some(rgba(0x908caaff).into()),
-                        terminal_ansi_bright_red: Some(rgba(0xeb6f92ff).into()),
-                        terminal_ansi_bright_green: Some(rgba(0x31748fff).into()),
-                        terminal_ansi_bright_yellow: Some(rgba(0xf6c177ff).into()),
-                        terminal_ansi_bright_blue: Some(rgba(0x9ccfd8ff).into()),
-                        terminal_ansi_bright_magenta: Some(rgba(0xc4a7e7ff).into()),
-                        terminal_ansi_bright_cyan: Some(rgba(0xebbcbaff).into()),
-                        terminal_ansi_bright_white: Some(rgba(0xe0def4ff).into()),
-                        terminal_ansi_black: Some(rgba(0x26233aff).into()),
-                        terminal_ansi_red: Some(rgba(0xeb6f92ff).into()),
-                        terminal_ansi_green: Some(rgba(0x31748fff).into()),
-                        terminal_ansi_yellow: Some(rgba(0xf6c177ff).into()),
-                        terminal_ansi_blue: Some(rgba(0x9ccfd8ff).into()),
-                        terminal_ansi_magenta: Some(rgba(0xc4a7e7ff).into()),
-                        terminal_ansi_cyan: Some(rgba(0xebbcbaff).into()),
-                        terminal_ansi_white: Some(rgba(0xe0def4ff).into()),
-                        link_text_hover: Some(rgba(0xc4a7e7e6).into()),
+                        border: Some(rgba(0xdcd6d5ff).into()),
+                        border_variant: Some(rgba(0xdcd6d5ff).into()),
+                        elevated_surface_background: Some(rgba(0xdcd8d8ff).into()),
+                        background: Some(rgba(0xdcd8d8ff).into()),
+                        panel_background: Some(rgba(0xfef9f2ff).into()),
+                        element_hover: Some(rgba(0xdcd6d580).into()),
+                        element_selected: Some(rgba(0xc1bac180).into()),
+                        text: Some(rgba(0x706c8cff).into()),
+                        text_muted: Some(rgba(0xb1abb5ff).into()),
+                        status_bar_background: Some(rgba(0xdcd8d8ff).into()),
+                        title_bar_background: Some(rgba(0xdcd8d8ff).into()),
+                        toolbar_background: Some(rgba(0xfaf4edff).into()),
+                        tab_bar_background: Some(rgba(0xfef9f2ff).into()),
+                        tab_inactive_background: Some(rgba(0xfef9f2ff).into()),
+                        tab_active_background: Some(rgba(0xfaf4edff).into()),
+                        scrollbar_thumb_background: Some(rgba(0x5752794d).into()),
+                        scrollbar_thumb_hover_background: Some(rgba(0x5752794d).into()),
+                        scrollbar_thumb_border: Some(rgba(0xfdf8f1ff).into()),
+                        scrollbar_track_border: Some(rgba(0xfdf8f1ff).into()),
+                        editor_foreground: Some(rgba(0x575279ff).into()),
+                        editor_background: Some(rgba(0xfaf4edff).into()),
+                        editor_gutter_background: Some(rgba(0xfaf4edff).into()),
+                        editor_line_number: Some(rgba(0x57527959).into()),
+                        editor_active_line_number: Some(rgba(0x575279ff).into()),
+                        editor_wrap_guide: Some(rgba(0x5752790d).into()),
+                        editor_active_wrap_guide: Some(rgba(0x5752791a).into()),
+                        terminal_background: Some(rgba(0xfaf4edff).into()),
+                        terminal_ansi_bright_black: Some(rgba(0xb8b2baff).into()),
+                        terminal_ansi_bright_red: Some(rgba(0xdcb0bbff).into()),
+                        terminal_ansi_bright_green: Some(rgba(0xa5d5c5ff).into()),
+                        terminal_ansi_bright_yellow: Some(rgba(0xfccd9bff).into()),
+                        terminal_ansi_bright_blue: Some(rgba(0xacc9ceff).into()),
+                        terminal_ansi_bright_magenta: Some(rgba(0xbcb1bdff).into()),
+                        terminal_ansi_bright_cyan: Some(rgba(0x97b1c0ff).into()),
+                        terminal_ansi_bright_white: Some(rgba(0x575279ff).into()),
+                        terminal_ansi_black: Some(rgba(0xfaf4edff).into()),
+                        terminal_ansi_red: Some(rgba(0xb4647aff).into()),
+                        terminal_ansi_green: Some(rgba(0x3eaa8eff).into()),
+                        terminal_ansi_yellow: Some(rgba(0xe99d35ff).into()),
+                        terminal_ansi_blue: Some(rgba(0x57949fff).into()),
+                        terminal_ansi_magenta: Some(rgba(0x7c697fff).into()),
+                        terminal_ansi_cyan: Some(rgba(0x2a6983ff).into()),
+                        terminal_ansi_white: Some(rgba(0x575279ff).into()),
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
-                        conflict: Some(rgba(0xeb6f92ff).into()),
-                        created: Some(rgba(0x9ccfd8ff).into()),
-                        deleted: Some(rgba(0xeb6f92ff).into()),
-                        error: Some(rgba(0xeb6f92ff).into()),
-                        hidden: Some(rgba(0x908caaff).into()),
-                        hint: Some(rgba(0x908caaff).into()),
-                        ignored: Some(rgba(0x6e6a86ff).into()),
-                        modified: Some(rgba(0xebbcbaff).into()),
-                        warning: Some(rgba(0xf6c177ff).into()),
+                        created: Some(rgba(0x6bbca3ff).into()),
+                        deleted: Some(rgba(0xb4647aff).into()),
+                        error: Some(rgba(0xb4647aff).into()),
+                        modified: Some(rgba(0xe99d35ff).into()),
+                        success: Some(rgba(0x575279ff).into()),
+                        warning: Some(rgba(0xe99d35ff).into()),
                         ..Default::default()
                     },
                     syntax: Some(UserSyntaxTheme {
@@ -90,186 +78,285 @@ pub fn rose_pine() -> UserThemeFamily {
                             (
                                 "attribute".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xc4a7e7ff).into()),
-                                    font_style: Some(UserFontStyle::Italic),
+                                    color: Some(rgba(0x57949fff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "boolean".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xebbcbaff).into()),
+                                    color: Some(rgba(0xd7827eff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "comment".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x6e6a86ff).into()),
-                                    font_style: Some(UserFontStyle::Italic),
+                                    color: Some(rgba(0x9893a5ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "comment.doc".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x6e6a86ff).into()),
-                                    font_style: Some(UserFontStyle::Italic),
+                                    color: Some(rgba(0x6f6b8cff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "constant".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x31748fff).into()),
+                                    color: Some(rgba(0x3eaa8eff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "constructor".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x9ccfd8ff).into()),
+                                    color: Some(rgba(0x57949fff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "embedded".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x575279ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "emphasis".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x57949fff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "emphasis.strong".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x57949fff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "enum".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x907aa9ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "function".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xebbcbaff).into()),
+                                    color: Some(rgba(0xd7827eff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function.method".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xd7827eff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "hint".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x7a92aaff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "keyword".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x31748fff).into()),
+                                    color: Some(rgba(0x286983ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "label".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xebbcbaff).into()),
+                                    color: Some(rgba(0x57949fff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "link_text".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x56949fff).into()),
+                                    font_style: Some(UserFontStyle::Normal),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "link_uri".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xd7827eff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "number".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xebbcbaff).into()),
+                                    color: Some(rgba(0x3eaa8eff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "operator".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x286983ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "predictive".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xa2acbeff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "preproc".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x575279ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "primary".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x575279ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "property".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x57949fff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x908caaff).into()),
+                                    color: Some(rgba(0x797593ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation.bracket".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x908caaff).into()),
+                                    color: Some(rgba(0x635e82ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation.delimiter".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x908caaff).into()),
+                                    color: Some(rgba(0x635e82ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation.list_marker".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x908caaff).into()),
+                                    color: Some(rgba(0x635e82ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation.special".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x908caaff).into()),
+                                    color: Some(rgba(0x635e82ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xf6c177ff).into()),
+                                    color: Some(rgba(0xea9d34ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string.escape".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xf6c177ff).into()),
+                                    color: Some(rgba(0x6f6b8cff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string.regex".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xf6c177ff).into()),
+                                    color: Some(rgba(0x907aa9ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string.special".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xf6c177ff).into()),
+                                    color: Some(rgba(0x907aa9ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string.special.symbol".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xf6c177ff).into()),
+                                    color: Some(rgba(0x907aa9ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "tag".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x9ccfd8ff).into()),
+                                    color: Some(rgba(0x56949fff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "text.literal".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xf6c177ff).into()),
+                                    color: Some(rgba(0x907aa9ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "title".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xebbcbaff).into()),
+                                    color: Some(rgba(0xea9d34ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "type".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x9ccfd8ff).into()),
+                                    color: Some(rgba(0x56949fff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "type.builtin".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x56949fff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "variable".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xebbcbaff).into()),
-                                    font_style: Some(UserFontStyle::Italic),
+                                    color: Some(rgba(0x575279ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
-                                "variable.special".into(),
+                                "variant".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xe0def4ff).into()),
+                                    color: Some(rgba(0x57949fff).into()),
                                     ..Default::default()
                                 },
                             ),
@@ -282,70 +369,58 @@ pub fn rose_pine() -> UserThemeFamily {
                 appearance: Appearance::Dark,
                 styles: UserThemeStylesRefinement {
                     colors: ThemeColorsRefinement {
-                        border: Some(rgba(0x00000000).into()),
-                        border_variant: Some(rgba(0x00000000).into()),
-                        border_focused: Some(rgba(0x817c9c26).into()),
-                        border_selected: Some(rgba(0x00000000).into()),
-                        border_transparent: Some(rgba(0x00000000).into()),
-                        border_disabled: Some(rgba(0x00000000).into()),
-                        elevated_surface_background: Some(rgba(0x2a273fff).into()),
-                        surface_background: Some(rgba(0x2a273fff).into()),
-                        background: Some(rgba(0x232136ff).into()),
-                        element_background: Some(rgba(0xea9a97ff).into()),
-                        element_hover: Some(rgba(0x817c9c14).into()),
-                        element_selected: Some(rgba(0x817c9c26).into()),
-                        drop_target_background: Some(rgba(0x2a273fff).into()),
-                        ghost_element_hover: Some(rgba(0x817c9c14).into()),
-                        ghost_element_selected: Some(rgba(0x817c9c26).into()),
-                        text: Some(rgba(0xe0def4ff).into()),
-                        text_muted: Some(rgba(0x908caaff).into()),
-                        status_bar_background: Some(rgba(0x232136ff).into()),
-                        title_bar_background: Some(rgba(0x232136ff).into()),
+                        border: Some(rgba(0x504c68ff).into()),
+                        border_variant: Some(rgba(0x504c68ff).into()),
+                        elevated_surface_background: Some(rgba(0x38354eff).into()),
+                        background: Some(rgba(0x38354eff).into()),
+                        panel_background: Some(rgba(0x28253cff).into()),
+                        element_hover: Some(rgba(0x504c6880).into()),
+                        element_selected: Some(rgba(0x45415d80).into()),
+                        text: Some(rgba(0x85819eff).into()),
+                        text_muted: Some(rgba(0x3a3653ff).into()),
+                        status_bar_background: Some(rgba(0x38354eff).into()),
+                        title_bar_background: Some(rgba(0x38354eff).into()),
                         toolbar_background: Some(rgba(0x232136ff).into()),
-                        tab_bar_background: Some(rgba(0x00000000).into()),
-                        tab_inactive_background: Some(rgba(0x00000000).into()),
-                        tab_active_background: Some(rgba(0x817c9c14).into()),
-                        scrollbar_thumb_background: Some(rgba(0x817c9c26).into()),
-                        scrollbar_thumb_hover_background: Some(rgba(0x817c9c4d).into()),
-                        scrollbar_thumb_border: Some(rgba(0x817c9c26).into()),
-                        scrollbar_track_background: Some(rgba(0x232136ff).into()),
-                        scrollbar_track_border: Some(rgba(0x817c9c4d).into()),
+                        tab_bar_background: Some(rgba(0x28253cff).into()),
+                        tab_inactive_background: Some(rgba(0x28253cff).into()),
+                        tab_active_background: Some(rgba(0x232136ff).into()),
+                        scrollbar_thumb_background: Some(rgba(0xe0def44d).into()),
+                        scrollbar_thumb_hover_background: Some(rgba(0xe0def44d).into()),
+                        scrollbar_thumb_border: Some(rgba(0x27243bff).into()),
+                        scrollbar_track_border: Some(rgba(0x27243bff).into()),
                         editor_foreground: Some(rgba(0xe0def4ff).into()),
                         editor_background: Some(rgba(0x232136ff).into()),
                         editor_gutter_background: Some(rgba(0x232136ff).into()),
-                        editor_line_number: Some(rgba(0x908caaff).into()),
+                        editor_line_number: Some(rgba(0xe0def459).into()),
                         editor_active_line_number: Some(rgba(0xe0def4ff).into()),
-                        editor_wrap_guide: Some(rgba(0x00000000).into()),
-                        editor_active_wrap_guide: Some(rgba(0x00000000).into()),
-                        terminal_ansi_bright_black: Some(rgba(0x908caaff).into()),
-                        terminal_ansi_bright_red: Some(rgba(0xeb6f92ff).into()),
-                        terminal_ansi_bright_green: Some(rgba(0x3e8fb0ff).into()),
-                        terminal_ansi_bright_yellow: Some(rgba(0xf6c177ff).into()),
-                        terminal_ansi_bright_blue: Some(rgba(0x9ccfd8ff).into()),
-                        terminal_ansi_bright_magenta: Some(rgba(0xc4a7e7ff).into()),
-                        terminal_ansi_bright_cyan: Some(rgba(0xea9a97ff).into()),
+                        editor_wrap_guide: Some(rgba(0xe0def40d).into()),
+                        editor_active_wrap_guide: Some(rgba(0xe0def41a).into()),
+                        terminal_background: Some(rgba(0x232136ff).into()),
+                        terminal_ansi_bright_black: Some(rgba(0x3f3b58ff).into()),
+                        terminal_ansi_bright_red: Some(rgba(0x7e3647ff).into()),
+                        terminal_ansi_bright_green: Some(rgba(0x31614fff).into()),
+                        terminal_ansi_bright_yellow: Some(rgba(0x8a653bff).into()),
+                        terminal_ansi_bright_blue: Some(rgba(0x566c70ff).into()),
+                        terminal_ansi_bright_magenta: Some(rgba(0x51414eff).into()),
+                        terminal_ansi_bright_cyan: Some(rgba(0x264654ff).into()),
                         terminal_ansi_bright_white: Some(rgba(0xe0def4ff).into()),
-                        terminal_ansi_black: Some(rgba(0x393552ff).into()),
-                        terminal_ansi_red: Some(rgba(0xeb6f92ff).into()),
-                        terminal_ansi_green: Some(rgba(0x3e8fb0ff).into()),
-                        terminal_ansi_yellow: Some(rgba(0xf6c177ff).into()),
-                        terminal_ansi_blue: Some(rgba(0x9ccfd8ff).into()),
-                        terminal_ansi_magenta: Some(rgba(0xc4a7e7ff).into()),
-                        terminal_ansi_cyan: Some(rgba(0xea9a97ff).into()),
+                        terminal_ansi_black: Some(rgba(0x232136ff).into()),
+                        terminal_ansi_red: Some(rgba(0xea6f92ff).into()),
+                        terminal_ansi_green: Some(rgba(0x5dc2a3ff).into()),
+                        terminal_ansi_yellow: Some(rgba(0xf5c177ff).into()),
+                        terminal_ansi_blue: Some(rgba(0x9cced7ff).into()),
+                        terminal_ansi_magenta: Some(rgba(0xa784a1ff).into()),
+                        terminal_ansi_cyan: Some(rgba(0x3f8fb0ff).into()),
                         terminal_ansi_white: Some(rgba(0xe0def4ff).into()),
-                        link_text_hover: Some(rgba(0xc4a7e7e6).into()),
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
-                        conflict: Some(rgba(0xeb6f92ff).into()),
-                        created: Some(rgba(0x9ccfd8ff).into()),
-                        deleted: Some(rgba(0xeb6f92ff).into()),
-                        error: Some(rgba(0xeb6f92ff).into()),
-                        hidden: Some(rgba(0x908caaff).into()),
-                        hint: Some(rgba(0x908caaff).into()),
-                        ignored: Some(rgba(0x6e6a86ff).into()),
-                        modified: Some(rgba(0xea9a97ff).into()),
-                        warning: Some(rgba(0xf6c177ff).into()),
+                        created: Some(rgba(0x5dc2a3ff).into()),
+                        deleted: Some(rgba(0xbe5773ff).into()),
+                        error: Some(rgba(0xea6f92ff).into()),
+                        modified: Some(rgba(0xf5c177ff).into()),
+                        success: Some(rgba(0xe0def4ff).into()),
+                        warning: Some(rgba(0xf5c177ff).into()),
                         ..Default::default()
                     },
                     syntax: Some(UserSyntaxTheme {
@@ -353,8 +428,7 @@ pub fn rose_pine() -> UserThemeFamily {
                             (
                                 "attribute".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xc4a7e7ff).into()),
-                                    font_style: Some(UserFontStyle::Italic),
+                                    color: Some(rgba(0x9cced7ff).into()),
                                     ..Default::default()
                                 },
                             ),
@@ -369,29 +443,56 @@ pub fn rose_pine() -> UserThemeFamily {
                                 "comment".into(),
                                 UserHighlightStyle {
                                     color: Some(rgba(0x6e6a86ff).into()),
-                                    font_style: Some(UserFontStyle::Italic),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "comment.doc".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x6e6a86ff).into()),
-                                    font_style: Some(UserFontStyle::Italic),
+                                    color: Some(rgba(0x8682a0ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "constant".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x3e8fb0ff).into()),
+                                    color: Some(rgba(0x5dc2a3ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "constructor".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x9ccfd8ff).into()),
+                                    color: Some(rgba(0x9cced7ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "embedded".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xe0def4ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "emphasis".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x9cced7ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "emphasis.strong".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x9cced7ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "enum".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xc4a7e6ff).into()),
                                     ..Default::default()
                                 },
                             ),
@@ -402,6 +503,21 @@ pub fn rose_pine() -> UserThemeFamily {
                                     ..Default::default()
                                 },
                             ),
+                            (
+                                "function.method".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xea9a97ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "hint".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x728aa2ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
                             (
                                 "keyword".into(),
                                 UserHighlightStyle {
@@ -411,6 +527,21 @@ pub fn rose_pine() -> UserThemeFamily {
                             ),
                             (
                                 "label".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x9cced7ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "link_text".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x9ccfd8ff).into()),
+                                    font_style: Some(UserFontStyle::Normal),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "link_uri".into(),
                                 UserHighlightStyle {
                                     color: Some(rgba(0xea9a97ff).into()),
                                     ..Default::default()
@@ -419,7 +550,43 @@ pub fn rose_pine() -> UserThemeFamily {
                             (
                                 "number".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xea9a97ff).into()),
+                                    color: Some(rgba(0x5dc2a3ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "operator".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x3e8fb0ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "predictive".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x516b83ff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "preproc".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xe0def4ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "primary".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xe0def4ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "property".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x9cced7ff).into()),
                                     ..Default::default()
                                 },
                             ),
@@ -433,28 +600,28 @@ pub fn rose_pine() -> UserThemeFamily {
                             (
                                 "punctuation.bracket".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x908caaff).into()),
+                                    color: Some(rgba(0xaeabc6ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation.delimiter".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x908caaff).into()),
+                                    color: Some(rgba(0xaeabc6ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation.list_marker".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x908caaff).into()),
+                                    color: Some(rgba(0xaeabc6ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation.special".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x908caaff).into()),
+                                    color: Some(rgba(0xaeabc6ff).into()),
                                     ..Default::default()
                                 },
                             ),
@@ -468,28 +635,28 @@ pub fn rose_pine() -> UserThemeFamily {
                             (
                                 "string.escape".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xf6c177ff).into()),
+                                    color: Some(rgba(0x8682a0ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string.regex".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xf6c177ff).into()),
+                                    color: Some(rgba(0xc4a7e6ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string.special".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xf6c177ff).into()),
+                                    color: Some(rgba(0xc4a7e6ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string.special.symbol".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xf6c177ff).into()),
+                                    color: Some(rgba(0xc4a7e6ff).into()),
                                     ..Default::default()
                                 },
                             ),
@@ -503,14 +670,15 @@ pub fn rose_pine() -> UserThemeFamily {
                             (
                                 "text.literal".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xf6c177ff).into()),
+                                    color: Some(rgba(0xc4a7e6ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "title".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xea9a97ff).into()),
+                                    color: Some(rgba(0xf6c177ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
                                     ..Default::default()
                                 },
                             ),
@@ -522,93 +690,87 @@ pub fn rose_pine() -> UserThemeFamily {
                                 },
                             ),
                             (
-                                "variable".into(),
+                                "type.builtin".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xea9a97ff).into()),
-                                    font_style: Some(UserFontStyle::Italic),
+                                    color: Some(rgba(0x9ccfd8ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
-                                "variable.special".into(),
+                                "variable".into(),
                                 UserHighlightStyle {
                                     color: Some(rgba(0xe0def4ff).into()),
                                     ..Default::default()
                                 },
                             ),
+                            (
+                                "variant".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x9cced7ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
                         ],
                     }),
                 },
             },
             UserTheme {
-                name: "RosΓ© Pine Dawn".into(),
-                appearance: Appearance::Light,
+                name: "RosΓ© Pine".into(),
+                appearance: Appearance::Dark,
                 styles: UserThemeStylesRefinement {
                     colors: ThemeColorsRefinement {
-                        border: Some(rgba(0x00000000).into()),
-                        border_variant: Some(rgba(0x00000000).into()),
-                        border_focused: Some(rgba(0x6e6a8614).into()),
-                        border_selected: Some(rgba(0x00000000).into()),
-                        border_transparent: Some(rgba(0x00000000).into()),
-                        border_disabled: Some(rgba(0x00000000).into()),
-                        elevated_surface_background: Some(rgba(0xfffaf3ff).into()),
-                        surface_background: Some(rgba(0xfffaf3ff).into()),
-                        background: Some(rgba(0xfaf4edff).into()),
-                        element_background: Some(rgba(0xd7827eff).into()),
-                        element_hover: Some(rgba(0x6e6a860d).into()),
-                        element_selected: Some(rgba(0x6e6a8614).into()),
-                        drop_target_background: Some(rgba(0xfffaf3ff).into()),
-                        ghost_element_hover: Some(rgba(0x6e6a860d).into()),
-                        ghost_element_selected: Some(rgba(0x6e6a8614).into()),
-                        text: Some(rgba(0x575279ff).into()),
-                        text_muted: Some(rgba(0x797593ff).into()),
-                        status_bar_background: Some(rgba(0xfaf4edff).into()),
-                        title_bar_background: Some(rgba(0xfaf4edff).into()),
-                        toolbar_background: Some(rgba(0xfaf4edff).into()),
-                        tab_bar_background: Some(rgba(0x00000000).into()),
-                        tab_inactive_background: Some(rgba(0x00000000).into()),
-                        tab_active_background: Some(rgba(0x6e6a860d).into()),
-                        scrollbar_thumb_background: Some(rgba(0x6e6a8614).into()),
-                        scrollbar_thumb_hover_background: Some(rgba(0x6e6a8626).into()),
-                        scrollbar_thumb_border: Some(rgba(0x6e6a8614).into()),
-                        scrollbar_track_background: Some(rgba(0xfaf4edff).into()),
-                        scrollbar_track_border: Some(rgba(0x6e6a8626).into()),
-                        editor_foreground: Some(rgba(0x575279ff).into()),
-                        editor_background: Some(rgba(0xfaf4edff).into()),
-                        editor_gutter_background: Some(rgba(0xfaf4edff).into()),
-                        editor_line_number: Some(rgba(0x797593ff).into()),
-                        editor_active_line_number: Some(rgba(0x575279ff).into()),
-                        editor_wrap_guide: Some(rgba(0x00000000).into()),
-                        editor_active_wrap_guide: Some(rgba(0x00000000).into()),
-                        terminal_ansi_bright_black: Some(rgba(0x797593ff).into()),
-                        terminal_ansi_bright_red: Some(rgba(0xb4637aff).into()),
-                        terminal_ansi_bright_green: Some(rgba(0x286983ff).into()),
-                        terminal_ansi_bright_yellow: Some(rgba(0xea9d34ff).into()),
-                        terminal_ansi_bright_blue: Some(rgba(0x56949fff).into()),
-                        terminal_ansi_bright_magenta: Some(rgba(0x907aa9ff).into()),
-                        terminal_ansi_bright_cyan: Some(rgba(0xd7827eff).into()),
-                        terminal_ansi_bright_white: Some(rgba(0x575279ff).into()),
-                        terminal_ansi_black: Some(rgba(0xf2e9e1ff).into()),
-                        terminal_ansi_red: Some(rgba(0xb4637aff).into()),
-                        terminal_ansi_green: Some(rgba(0x286983ff).into()),
-                        terminal_ansi_yellow: Some(rgba(0xea9d34ff).into()),
-                        terminal_ansi_blue: Some(rgba(0x56949fff).into()),
-                        terminal_ansi_magenta: Some(rgba(0x907aa9ff).into()),
-                        terminal_ansi_cyan: Some(rgba(0xd7827eff).into()),
-                        terminal_ansi_white: Some(rgba(0x575279ff).into()),
-                        link_text_hover: Some(rgba(0x907aa9e6).into()),
+                        border: Some(rgba(0x423f55ff).into()),
+                        border_variant: Some(rgba(0x423f55ff).into()),
+                        elevated_surface_background: Some(rgba(0x292739ff).into()),
+                        background: Some(rgba(0x292739ff).into()),
+                        panel_background: Some(rgba(0x1d1b2aff).into()),
+                        element_hover: Some(rgba(0x423f5580).into()),
+                        element_selected: Some(rgba(0x47445b80).into()),
+                        text: Some(rgba(0x75718eff).into()),
+                        text_muted: Some(rgba(0x3b384fff).into()),
+                        status_bar_background: Some(rgba(0x292739ff).into()),
+                        title_bar_background: Some(rgba(0x292739ff).into()),
+                        toolbar_background: Some(rgba(0x191724ff).into()),
+                        tab_bar_background: Some(rgba(0x1d1b2aff).into()),
+                        tab_inactive_background: Some(rgba(0x1d1b2aff).into()),
+                        tab_active_background: Some(rgba(0x191724ff).into()),
+                        scrollbar_thumb_background: Some(rgba(0xe0def44d).into()),
+                        scrollbar_thumb_hover_background: Some(rgba(0xe0def44d).into()),
+                        scrollbar_thumb_border: Some(rgba(0x1c1a29ff).into()),
+                        scrollbar_track_border: Some(rgba(0x1c1a29ff).into()),
+                        editor_foreground: Some(rgba(0xe0def4ff).into()),
+                        editor_background: Some(rgba(0x191724ff).into()),
+                        editor_gutter_background: Some(rgba(0x191724ff).into()),
+                        editor_line_number: Some(rgba(0xe0def459).into()),
+                        editor_active_line_number: Some(rgba(0xe0def4ff).into()),
+                        editor_wrap_guide: Some(rgba(0xe0def40d).into()),
+                        editor_active_wrap_guide: Some(rgba(0xe0def41a).into()),
+                        terminal_background: Some(rgba(0x191724ff).into()),
+                        terminal_ansi_bright_black: Some(rgba(0x403d55ff).into()),
+                        terminal_ansi_bright_red: Some(rgba(0x7e3647ff).into()),
+                        terminal_ansi_bright_green: Some(rgba(0x31614fff).into()),
+                        terminal_ansi_bright_yellow: Some(rgba(0x8a653bff).into()),
+                        terminal_ansi_bright_blue: Some(rgba(0x566c70ff).into()),
+                        terminal_ansi_bright_magenta: Some(rgba(0x4c3b47ff).into()),
+                        terminal_ansi_bright_cyan: Some(rgba(0x203a46ff).into()),
+                        terminal_ansi_bright_white: Some(rgba(0xe0def4ff).into()),
+                        terminal_ansi_black: Some(rgba(0x191724ff).into()),
+                        terminal_ansi_red: Some(rgba(0xea6f92ff).into()),
+                        terminal_ansi_green: Some(rgba(0x5dc2a3ff).into()),
+                        terminal_ansi_yellow: Some(rgba(0xf5c177ff).into()),
+                        terminal_ansi_blue: Some(rgba(0x9cced7ff).into()),
+                        terminal_ansi_magenta: Some(rgba(0x9d7691ff).into()),
+                        terminal_ansi_cyan: Some(rgba(0x32748fff).into()),
+                        terminal_ansi_white: Some(rgba(0xe0def4ff).into()),
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
-                        conflict: Some(rgba(0xb4637aff).into()),
-                        created: Some(rgba(0x56949fff).into()),
-                        deleted: Some(rgba(0xb4637aff).into()),
-                        error: Some(rgba(0xb4637aff).into()),
-                        hidden: Some(rgba(0x797593ff).into()),
-                        hint: Some(rgba(0x797593ff).into()),
-                        ignored: Some(rgba(0x9893a5ff).into()),
-                        modified: Some(rgba(0xd7827eff).into()),
-                        warning: Some(rgba(0xea9d34ff).into()),
+                        created: Some(rgba(0x5dc2a3ff).into()),
+                        deleted: Some(rgba(0xbe5773ff).into()),
+                        error: Some(rgba(0xea6f92ff).into()),
+                        modified: Some(rgba(0xf5c177ff).into()),
+                        success: Some(rgba(0xe0def4ff).into()),
+                        warning: Some(rgba(0xf5c177ff).into()),
                         ..Default::default()
                     },
                     syntax: Some(UserSyntaxTheme {
@@ -616,186 +778,285 @@ pub fn rose_pine() -> UserThemeFamily {
                             (
                                 "attribute".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x907aa9ff).into()),
-                                    font_style: Some(UserFontStyle::Italic),
+                                    color: Some(rgba(0x9cced7ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "boolean".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xd7827eff).into()),
+                                    color: Some(rgba(0xebbcbaff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "comment".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x9893a5ff).into()),
-                                    font_style: Some(UserFontStyle::Italic),
+                                    color: Some(rgba(0x6e6a86ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "comment.doc".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x9893a5ff).into()),
-                                    font_style: Some(UserFontStyle::Italic),
+                                    color: Some(rgba(0x777390ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "constant".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x286983ff).into()),
+                                    color: Some(rgba(0x5dc2a3ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "constructor".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x56949fff).into()),
+                                    color: Some(rgba(0x9cced7ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "embedded".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xe0def4ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "emphasis".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x9cced7ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "emphasis.strong".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x9cced7ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "enum".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xc4a7e6ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "function".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xd7827eff).into()),
+                                    color: Some(rgba(0xebbcbaff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "function.method".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xebbcbaff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "hint".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x5e768cff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "keyword".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x286983ff).into()),
+                                    color: Some(rgba(0x31748fff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "label".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xd7827eff).into()),
+                                    color: Some(rgba(0x9cced7ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "link_text".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x9ccfd8ff).into()),
+                                    font_style: Some(UserFontStyle::Normal),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "link_uri".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xebbcbaff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "number".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xd7827eff).into()),
+                                    color: Some(rgba(0x5dc2a3ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "operator".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x31748fff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "predictive".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x556b81ff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "preproc".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xe0def4ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "primary".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xe0def4ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "property".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x9cced7ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x797593ff).into()),
+                                    color: Some(rgba(0x908caaff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation.bracket".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x797593ff).into()),
+                                    color: Some(rgba(0x9d99b6ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation.delimiter".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x797593ff).into()),
+                                    color: Some(rgba(0x9d99b6ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation.list_marker".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x797593ff).into()),
+                                    color: Some(rgba(0x9d99b6ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation.special".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x797593ff).into()),
+                                    color: Some(rgba(0x9d99b6ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xea9d34ff).into()),
+                                    color: Some(rgba(0xf6c177ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string.escape".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xea9d34ff).into()),
+                                    color: Some(rgba(0x777390ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string.regex".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xea9d34ff).into()),
+                                    color: Some(rgba(0xc4a7e6ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string.special".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xea9d34ff).into()),
+                                    color: Some(rgba(0xc4a7e6ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string.special.symbol".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xea9d34ff).into()),
+                                    color: Some(rgba(0xc4a7e6ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "tag".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x56949fff).into()),
+                                    color: Some(rgba(0x9ccfd8ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "text.literal".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xea9d34ff).into()),
+                                    color: Some(rgba(0xc4a7e6ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "title".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xd7827eff).into()),
+                                    color: Some(rgba(0xf6c177ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "type".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x56949fff).into()),
+                                    color: Some(rgba(0x9ccfd8ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "type.builtin".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x9ccfd8ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "variable".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xd7827eff).into()),
-                                    font_style: Some(UserFontStyle::Italic),
+                                    color: Some(rgba(0xe0def4ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
-                                "variable.special".into(),
+                                "variant".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x575279ff).into()),
+                                    color: Some(rgba(0x9cced7ff).into()),
                                     ..Default::default()
                                 },
                             ),

crates/theme2/src/themes/sandcastle.rs πŸ”—

@@ -0,0 +1,353 @@
+// This file was generated by the `theme_importer`.
+// Be careful when modifying it by hand.
+
+use gpui::rgba;
+
+#[allow(unused)]
+use crate::{
+    Appearance, StatusColorsRefinement, ThemeColorsRefinement, UserFontStyle, UserFontWeight,
+    UserHighlightStyle, UserSyntaxTheme, UserTheme, UserThemeFamily, UserThemeStylesRefinement,
+};
+
+pub fn sandcastle() -> UserThemeFamily {
+    UserThemeFamily {
+        name: "Sandcastle".into(),
+        author: "Zed Industries".into(),
+        themes: vec![UserTheme {
+            name: "Sandcastle".into(),
+            appearance: Appearance::Dark,
+            styles: UserThemeStylesRefinement {
+                colors: ThemeColorsRefinement {
+                    border: Some(rgba(0x3d4350ff).into()),
+                    border_variant: Some(rgba(0x3d4350ff).into()),
+                    elevated_surface_background: Some(rgba(0x333944ff).into()),
+                    background: Some(rgba(0x333944ff).into()),
+                    panel_background: Some(rgba(0x2b3039ff).into()),
+                    element_hover: Some(rgba(0x3d435080).into()),
+                    element_selected: Some(rgba(0x57535380).into()),
+                    text: Some(rgba(0xa69782ff).into()),
+                    text_muted: Some(rgba(0x645b54ff).into()),
+                    status_bar_background: Some(rgba(0x333944ff).into()),
+                    title_bar_background: Some(rgba(0x333944ff).into()),
+                    toolbar_background: Some(rgba(0x282c34ff).into()),
+                    tab_bar_background: Some(rgba(0x2b3039ff).into()),
+                    tab_inactive_background: Some(rgba(0x2b3039ff).into()),
+                    tab_active_background: Some(rgba(0x282c34ff).into()),
+                    scrollbar_thumb_background: Some(rgba(0xfdf4c14d).into()),
+                    scrollbar_thumb_hover_background: Some(rgba(0xfdf4c14d).into()),
+                    scrollbar_thumb_border: Some(rgba(0x2a2f38ff).into()),
+                    scrollbar_track_border: Some(rgba(0x2a2f38ff).into()),
+                    editor_foreground: Some(rgba(0xfdf4c1ff).into()),
+                    editor_background: Some(rgba(0x282c34ff).into()),
+                    editor_gutter_background: Some(rgba(0x282c34ff).into()),
+                    editor_line_number: Some(rgba(0xfdf4c159).into()),
+                    editor_active_line_number: Some(rgba(0xfdf4c1ff).into()),
+                    editor_wrap_guide: Some(rgba(0xfdf4c10d).into()),
+                    editor_active_wrap_guide: Some(rgba(0xfdf4c11a).into()),
+                    terminal_background: Some(rgba(0x282c34ff).into()),
+                    terminal_ansi_bright_black: Some(rgba(0x5e5753ff).into()),
+                    terminal_ansi_bright_red: Some(rgba(0x57333dff).into()),
+                    terminal_ansi_bright_green: Some(rgba(0x414f4aff).into()),
+                    terminal_ansi_bright_yellow: Some(rgba(0x4e3f22ff).into()),
+                    terminal_ansi_bright_blue: Some(rgba(0x2c4444ff).into()),
+                    terminal_ansi_bright_magenta: Some(rgba(0x523a18ff).into()),
+                    terminal_ansi_bright_cyan: Some(rgba(0x414f4aff).into()),
+                    terminal_ansi_bright_white: Some(rgba(0xfdf4c1ff).into()),
+                    terminal_ansi_black: Some(rgba(0x282c34ff).into()),
+                    terminal_ansi_red: Some(rgba(0xb4637aff).into()),
+                    terminal_ansi_green: Some(rgba(0x83a598ff).into()),
+                    terminal_ansi_yellow: Some(rgba(0xa07e3bff).into()),
+                    terminal_ansi_blue: Some(rgba(0x528b8bff).into()),
+                    terminal_ansi_magenta: Some(rgba(0xa87323ff).into()),
+                    terminal_ansi_cyan: Some(rgba(0x83a598ff).into()),
+                    terminal_ansi_white: Some(rgba(0xfdf4c1ff).into()),
+                    ..Default::default()
+                },
+                status: StatusColorsRefinement {
+                    created: Some(rgba(0x83a598ff).into()),
+                    deleted: Some(rgba(0x8d4f61ff).into()),
+                    error: Some(rgba(0xb4637aff).into()),
+                    modified: Some(rgba(0xa07e3bff).into()),
+                    success: Some(rgba(0xfdf4c1ff).into()),
+                    warning: Some(rgba(0xa07e3bff).into()),
+                    ..Default::default()
+                },
+                syntax: Some(UserSyntaxTheme {
+                    highlights: vec![
+                        (
+                            "attribute".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0x528b8bff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "boolean".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0x83a598ff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "comment".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xa89984ff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "comment.doc".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xa89984ff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "constant".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0x83a598ff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "constructor".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0x528b8bff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "embedded".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xfdf4c1ff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "emphasis".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0x528b8bff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "emphasis.strong".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0x528b8bff).into()),
+                                font_weight: Some(UserFontWeight(700.0)),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "enum".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xa07e3bff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "function".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xa07e3bff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "hint".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0x727d68ff).into()),
+                                font_weight: Some(UserFontWeight(700.0)),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "keyword".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0x528b8bff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "label".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0x528b8bff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "link_text".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xa07e3bff).into()),
+                                font_style: Some(UserFontStyle::Italic),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "link_uri".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0x83a598ff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "number".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0x83a598ff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "operator".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xa07e3bff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "predictive".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0x5c6152ff).into()),
+                                font_style: Some(UserFontStyle::Italic),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "preproc".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xfdf4c1ff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "primary".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xfdf4c1ff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "property".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0x528b8bff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "punctuation".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xd5c5a1ff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "punctuation.bracket".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xd5c5a1ff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "punctuation.delimiter".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xd5c5a1ff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "punctuation.list_marker".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xd5c5a1ff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "punctuation.special".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xd5c5a1ff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "string".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xa07e3bff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "string.escape".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xa89984ff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "string.regex".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xa07e3bff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "string.special".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xa07e3bff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "string.special.symbol".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xa07e3bff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "tag".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0x528b8bff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "text.literal".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xa07e3bff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "title".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xfdf4c1ff).into()),
+                                font_weight: Some(UserFontWeight(700.0)),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "type".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0x83a598ff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "variable".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xfdf4c1ff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "variant".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0x528b8bff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                    ],
+                }),
+            },
+        }],
+    }
+}

crates/theme2/src/themes/solarized.rs πŸ”—

@@ -12,64 +12,65 @@ use crate::{
 pub fn solarized() -> UserThemeFamily {
     UserThemeFamily {
         name: "Solarized".into(),
-        author: "Ethan Schoonover (altercation)".into(),
+        author: "Zed Industries".into(),
         themes: vec![
             UserTheme {
-                name: "Solarized Dark".into(),
-                appearance: Appearance::Dark,
+                name: "Solarized Light".into(),
+                appearance: Appearance::Light,
                 styles: UserThemeStylesRefinement {
                     colors: ThemeColorsRefinement {
-                        border: Some(rgba(0x003847ff).into()),
-                        border_variant: Some(rgba(0x003847ff).into()),
-                        border_focused: Some(rgba(0x2aa19899).into()),
-                        border_selected: Some(rgba(0x003847ff).into()),
-                        border_transparent: Some(rgba(0x003847ff).into()),
-                        border_disabled: Some(rgba(0x003847ff).into()),
-                        elevated_surface_background: Some(rgba(0x00212bff).into()),
-                        background: Some(rgba(0x002b36ff).into()),
-                        element_background: Some(rgba(0x2aa19899).into()),
-                        element_hover: Some(rgba(0x004454aa).into()),
-                        element_selected: Some(rgba(0x005a6fff).into()),
-                        drop_target_background: Some(rgba(0x00445488).into()),
-                        ghost_element_hover: Some(rgba(0x004454aa).into()),
-                        ghost_element_selected: Some(rgba(0x005a6fff).into()),
-                        text: Some(rgba(0xbbbbbbff).into()),
-                        text_muted: Some(rgba(0x93a1a1ff).into()),
-                        status_bar_background: Some(rgba(0x00212bff).into()),
-                        title_bar_background: Some(rgba(0x002c39ff).into()),
-                        toolbar_background: Some(rgba(0x002b36ff).into()),
-                        tab_bar_background: Some(rgba(0x004052ff).into()),
-                        tab_inactive_background: Some(rgba(0x004052ff).into()),
-                        tab_active_background: Some(rgba(0x002b37ff).into()),
-                        scrollbar_track_background: Some(rgba(0x002b36ff).into()),
-                        editor_foreground: Some(rgba(0xbbbbbbff).into()),
-                        editor_background: Some(rgba(0x002b36ff).into()),
-                        editor_gutter_background: Some(rgba(0x002b36ff).into()),
-                        editor_line_number: Some(rgba(0x566c74ff).into()),
-                        editor_wrap_guide: Some(rgba(0x003847ff).into()),
-                        editor_active_wrap_guide: Some(rgba(0x003847ff).into()),
-                        terminal_ansi_bright_black: Some(rgba(0x586e75ff).into()),
-                        terminal_ansi_bright_red: Some(rgba(0xcb4b16ff).into()),
-                        terminal_ansi_bright_green: Some(rgba(0x859900ff).into()),
-                        terminal_ansi_bright_yellow: Some(rgba(0x657b83ff).into()),
-                        terminal_ansi_bright_blue: Some(rgba(0x839496ff).into()),
-                        terminal_ansi_bright_magenta: Some(rgba(0x6c71c4ff).into()),
-                        terminal_ansi_bright_cyan: Some(rgba(0x93a1a1ff).into()),
-                        terminal_ansi_bright_white: Some(rgba(0x839496ff).into()),
-                        terminal_ansi_black: Some(rgba(0x073642ff).into()),
-                        terminal_ansi_red: Some(rgba(0xdc322fff).into()),
-                        terminal_ansi_green: Some(rgba(0x859900ff).into()),
-                        terminal_ansi_yellow: Some(rgba(0xb58900ff).into()),
-                        terminal_ansi_blue: Some(rgba(0x268bd2ff).into()),
-                        terminal_ansi_magenta: Some(rgba(0xd33682ff).into()),
-                        terminal_ansi_cyan: Some(rgba(0x2aa198ff).into()),
-                        terminal_ansi_white: Some(rgba(0x839496ff).into()),
+                        border: Some(rgba(0x9faaa8ff).into()),
+                        border_variant: Some(rgba(0x9faaa8ff).into()),
+                        elevated_surface_background: Some(rgba(0xcfd0c4ff).into()),
+                        background: Some(rgba(0xcfd0c4ff).into()),
+                        panel_background: Some(rgba(0xf3eddaff).into()),
+                        element_hover: Some(rgba(0x9faaa880).into()),
+                        element_selected: Some(rgba(0x7f919480).into()),
+                        text: Some(rgba(0x34555eff).into()),
+                        text_muted: Some(rgba(0x788b8fff).into()),
+                        status_bar_background: Some(rgba(0xcfd0c4ff).into()),
+                        title_bar_background: Some(rgba(0xcfd0c4ff).into()),
+                        toolbar_background: Some(rgba(0xfdf6e3ff).into()),
+                        tab_bar_background: Some(rgba(0xf3eddaff).into()),
+                        tab_inactive_background: Some(rgba(0xf3eddaff).into()),
+                        tab_active_background: Some(rgba(0xfdf6e3ff).into()),
+                        scrollbar_thumb_background: Some(rgba(0x002b364d).into()),
+                        scrollbar_thumb_hover_background: Some(rgba(0x002b364d).into()),
+                        scrollbar_thumb_border: Some(rgba(0xf5eedbff).into()),
+                        scrollbar_track_border: Some(rgba(0xf5eedbff).into()),
+                        editor_foreground: Some(rgba(0x002b36ff).into()),
+                        editor_background: Some(rgba(0xfdf6e3ff).into()),
+                        editor_gutter_background: Some(rgba(0xfdf6e3ff).into()),
+                        editor_line_number: Some(rgba(0x002b3659).into()),
+                        editor_active_line_number: Some(rgba(0x002b36ff).into()),
+                        editor_wrap_guide: Some(rgba(0x002b360d).into()),
+                        editor_active_wrap_guide: Some(rgba(0x002b361a).into()),
+                        terminal_background: Some(rgba(0xfdf6e3ff).into()),
+                        terminal_ansi_bright_black: Some(rgba(0x7b8e91ff).into()),
+                        terminal_ansi_bright_red: Some(rgba(0xfaa091ff).into()),
+                        terminal_ansi_bright_green: Some(rgba(0xc6cb8bff).into()),
+                        terminal_ansi_bright_yellow: Some(rgba(0xe1c28aff).into()),
+                        terminal_ansi_bright_blue: Some(rgba(0xa5c3e9ff).into()),
+                        terminal_ansi_bright_magenta: Some(rgba(0xf0a2bfff).into()),
+                        terminal_ansi_bright_cyan: Some(rgba(0x9fd0cbff).into()),
+                        terminal_ansi_bright_white: Some(rgba(0x002b36ff).into()),
+                        terminal_ansi_black: Some(rgba(0xfdf6e3ff).into()),
+                        terminal_ansi_red: Some(rgba(0xdc3330ff).into()),
+                        terminal_ansi_green: Some(rgba(0x859904ff).into()),
+                        terminal_ansi_yellow: Some(rgba(0xb58904ff).into()),
+                        terminal_ansi_blue: Some(rgba(0x298bd1ff).into()),
+                        terminal_ansi_magenta: Some(rgba(0xd33882ff).into()),
+                        terminal_ansi_cyan: Some(rgba(0x2ca198ff).into()),
+                        terminal_ansi_white: Some(rgba(0x002b36ff).into()),
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
-                        error: Some(rgba(0xffeaeaff).into()),
-                        hidden: Some(rgba(0x93a1a1ff).into()),
-                        hint: Some(rgba(0x969696ff).into()),
+                        created: Some(rgba(0xa0ad46ff).into()),
+                        deleted: Some(rgba(0xdc3330ff).into()),
+                        error: Some(rgba(0xdc3330ff).into()),
+                        modified: Some(rgba(0xb58904ff).into()),
+                        success: Some(rgba(0x002b36ff).into()),
+                        warning: Some(rgba(0xb58904ff).into()),
                         ..Default::default()
                     },
                     syntax: Some(UserSyntaxTheme {
@@ -77,205 +78,271 @@ pub fn solarized() -> UserThemeFamily {
                             (
                                 "attribute".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x93a1a1ff).into()),
+                                    color: Some(rgba(0x298bd1ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "boolean".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xb58900ff).into()),
+                                    color: Some(rgba(0x859904ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "comment".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x657b83ff).into()),
-                                    font_style: Some(UserFontStyle::Italic),
+                                    color: Some(rgba(0x30525bff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "comment.doc".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x657b83ff).into()),
-                                    font_style: Some(UserFontStyle::Italic),
+                                    color: Some(rgba(0x30525bff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "constant".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xb58900ff).into()),
+                                    color: Some(rgba(0x859904ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "constructor".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x268bd2ff).into()),
+                                    color: Some(rgba(0x298bd1ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "embedded".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x93a1a1ff).into()),
+                                    color: Some(rgba(0x002b36ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "emphasis".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xd33682ff).into()),
+                                    color: Some(rgba(0x298bd1ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "emphasis.strong".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xd33682ff).into()),
+                                    color: Some(rgba(0x298bd1ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "enum".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xcb4c18ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "function".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x839496ff).into()),
+                                    color: Some(rgba(0xb58904ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "hint".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x5889a3ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "keyword".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x859900ff).into()),
+                                    color: Some(rgba(0x298bd1ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "label".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x298bd1ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "link_text".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xcb4c18ff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "link_uri".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x859904ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "number".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xd33682ff).into()),
+                                    color: Some(rgba(0x859904ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "operator".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xcb4c18ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "predictive".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x679aafff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "preproc".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xb58900ff).into()),
+                                    color: Some(rgba(0x002b36ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "primary".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x002b36ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "property".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x839496ff).into()),
+                                    color: Some(rgba(0x298bd1ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x657b83ff).into()),
+                                    color: Some(rgba(0x05333eff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation.bracket".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x657b83ff).into()),
+                                    color: Some(rgba(0x05333eff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation.delimiter".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x657b83ff).into()),
+                                    color: Some(rgba(0x05333eff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation.list_marker".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x657b83ff).into()),
+                                    color: Some(rgba(0x05333eff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation.special".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x657b83ff).into()),
+                                    color: Some(rgba(0x05333eff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x2aa198ff).into()),
+                                    color: Some(rgba(0xcb4c18ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string.escape".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xcb4b16ff).into()),
+                                    color: Some(rgba(0x30525bff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string.regex".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x2aa198ff).into()),
+                                    color: Some(rgba(0xcb4c18ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string.special".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x2aa198ff).into()),
+                                    color: Some(rgba(0xcb4c18ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string.special.symbol".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x2aa198ff).into()),
+                                    color: Some(rgba(0xcb4c18ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "tag".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x268bd2ff).into()),
+                                    color: Some(rgba(0x298bd1ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "text.literal".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x2aa198ff).into()),
+                                    color: Some(rgba(0xcb4c18ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "title".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x002b36ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "type".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xb58900ff).into()),
+                                    color: Some(rgba(0x2ca198ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "variable".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x268bd2ff).into()),
+                                    color: Some(rgba(0x002b36ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
-                                "variable.special".into(),
+                                "variant".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x268bd2ff).into()),
+                                    color: Some(rgba(0x298bd1ff).into()),
                                     ..Default::default()
                                 },
                             ),
@@ -284,59 +351,62 @@ pub fn solarized() -> UserThemeFamily {
                 },
             },
             UserTheme {
-                name: "Solarized Light".into(),
-                appearance: Appearance::Light,
+                name: "Solarized Dark".into(),
+                appearance: Appearance::Dark,
                 styles: UserThemeStylesRefinement {
                     colors: ThemeColorsRefinement {
-                        border: Some(rgba(0xddd6c1ff).into()),
-                        border_variant: Some(rgba(0xddd6c1ff).into()),
-                        border_focused: Some(rgba(0xd3af86ff).into()),
-                        border_selected: Some(rgba(0xddd6c1ff).into()),
-                        border_transparent: Some(rgba(0xddd6c1ff).into()),
-                        border_disabled: Some(rgba(0xddd6c1ff).into()),
-                        elevated_surface_background: Some(rgba(0xeee8d5ff).into()),
-                        background: Some(rgba(0xfdf6e3ff).into()),
-                        element_background: Some(rgba(0xac9d57ff).into()),
-                        element_hover: Some(rgba(0xdfca8844).into()),
-                        element_selected: Some(rgba(0xdfca88ff).into()),
-                        ghost_element_hover: Some(rgba(0xdfca8844).into()),
-                        ghost_element_selected: Some(rgba(0xdfca88ff).into()),
-                        text: Some(rgba(0x333333ff).into()),
-                        text_muted: Some(rgba(0x586e75ff).into()),
-                        status_bar_background: Some(rgba(0xeee8d5ff).into()),
-                        title_bar_background: Some(rgba(0xeee8d5ff).into()),
-                        toolbar_background: Some(rgba(0xfdf6e3ff).into()),
-                        tab_bar_background: Some(rgba(0xd9d2c2ff).into()),
-                        tab_inactive_background: Some(rgba(0xd3cbb7ff).into()),
-                        tab_active_background: Some(rgba(0xfdf6e3ff).into()),
-                        scrollbar_track_background: Some(rgba(0xfdf6e3ff).into()),
-                        editor_foreground: Some(rgba(0x333333ff).into()),
-                        editor_background: Some(rgba(0xfdf6e3ff).into()),
-                        editor_gutter_background: Some(rgba(0xfdf6e3ff).into()),
-                        editor_line_number: Some(rgba(0x9ca8a6ff).into()),
-                        editor_wrap_guide: Some(rgba(0xddd6c1ff).into()),
-                        editor_active_wrap_guide: Some(rgba(0xddd6c1ff).into()),
-                        terminal_ansi_bright_black: Some(rgba(0x657b83ff).into()),
-                        terminal_ansi_bright_red: Some(rgba(0xcb4b16ff).into()),
-                        terminal_ansi_bright_green: Some(rgba(0x859900ff).into()),
-                        terminal_ansi_bright_yellow: Some(rgba(0x657b83ff).into()),
-                        terminal_ansi_bright_blue: Some(rgba(0x839496ff).into()),
-                        terminal_ansi_bright_magenta: Some(rgba(0x6c71c4ff).into()),
-                        terminal_ansi_bright_cyan: Some(rgba(0x93a1a1ff).into()),
-                        terminal_ansi_bright_white: Some(rgba(0xeee8d5ff).into()),
-                        terminal_ansi_black: Some(rgba(0x657b83ff).into()),
-                        terminal_ansi_red: Some(rgba(0xdc322fff).into()),
-                        terminal_ansi_green: Some(rgba(0x859900ff).into()),
-                        terminal_ansi_yellow: Some(rgba(0xb58900ff).into()),
-                        terminal_ansi_blue: Some(rgba(0x268bd2ff).into()),
-                        terminal_ansi_magenta: Some(rgba(0xd33682ff).into()),
-                        terminal_ansi_cyan: Some(rgba(0x2aa198ff).into()),
-                        terminal_ansi_white: Some(rgba(0xeee8d5ff).into()),
+                        border: Some(rgba(0x2b4f58ff).into()),
+                        border_variant: Some(rgba(0x2b4f58ff).into()),
+                        elevated_surface_background: Some(rgba(0x083743ff).into()),
+                        background: Some(rgba(0x083743ff).into()),
+                        panel_background: Some(rgba(0x04313cff).into()),
+                        element_hover: Some(rgba(0x2b4f5880).into()),
+                        element_selected: Some(rgba(0x566d7480).into()),
+                        text: Some(rgba(0x93a1a1ff).into()),
+                        text_muted: Some(rgba(0x5f757dff).into()),
+                        status_bar_background: Some(rgba(0x083743ff).into()),
+                        title_bar_background: Some(rgba(0x083743ff).into()),
+                        toolbar_background: Some(rgba(0x002b36ff).into()),
+                        tab_bar_background: Some(rgba(0x04313cff).into()),
+                        tab_inactive_background: Some(rgba(0x04313cff).into()),
+                        tab_active_background: Some(rgba(0x002b36ff).into()),
+                        scrollbar_thumb_background: Some(rgba(0xfdf6e34d).into()),
+                        scrollbar_thumb_hover_background: Some(rgba(0xfdf6e34d).into()),
+                        scrollbar_thumb_border: Some(rgba(0x032f3bff).into()),
+                        scrollbar_track_border: Some(rgba(0x032f3bff).into()),
+                        editor_foreground: Some(rgba(0xfdf6e3ff).into()),
+                        editor_background: Some(rgba(0x002b36ff).into()),
+                        editor_gutter_background: Some(rgba(0x002b36ff).into()),
+                        editor_line_number: Some(rgba(0xfdf6e359).into()),
+                        editor_active_line_number: Some(rgba(0xfdf6e3ff).into()),
+                        editor_wrap_guide: Some(rgba(0xfdf6e30d).into()),
+                        editor_active_wrap_guide: Some(rgba(0xfdf6e31a).into()),
+                        terminal_background: Some(rgba(0x002b36ff).into()),
+                        terminal_ansi_bright_black: Some(rgba(0x5c7279ff).into()),
+                        terminal_ansi_bright_red: Some(rgba(0x7d181cff).into()),
+                        terminal_ansi_bright_green: Some(rgba(0x434a11ff).into()),
+                        terminal_ansi_bright_yellow: Some(rgba(0x5d4310ff).into()),
+                        terminal_ansi_bright_blue: Some(rgba(0x214465ff).into()),
+                        terminal_ansi_bright_magenta: Some(rgba(0x6f1f40ff).into()),
+                        terminal_ansi_bright_cyan: Some(rgba(0x204e4aff).into()),
+                        terminal_ansi_bright_white: Some(rgba(0xfdf6e3ff).into()),
+                        terminal_ansi_black: Some(rgba(0x002b36ff).into()),
+                        terminal_ansi_red: Some(rgba(0xdc3330ff).into()),
+                        terminal_ansi_green: Some(rgba(0x859904ff).into()),
+                        terminal_ansi_yellow: Some(rgba(0xb58903ff).into()),
+                        terminal_ansi_blue: Some(rgba(0x288bd1ff).into()),
+                        terminal_ansi_magenta: Some(rgba(0xd33782ff).into()),
+                        terminal_ansi_cyan: Some(rgba(0x2ca198ff).into()),
+                        terminal_ansi_white: Some(rgba(0xfdf6e3ff).into()),
                         ..Default::default()
                     },
                     status: StatusColorsRefinement {
-                        hidden: Some(rgba(0x586e75ff).into()),
-                        hint: Some(rgba(0x969696ff).into()),
+                        created: Some(rgba(0x859904ff).into()),
+                        deleted: Some(rgba(0xb52727ff).into()),
+                        error: Some(rgba(0xdc3330ff).into()),
+                        modified: Some(rgba(0xb58903ff).into()),
+                        success: Some(rgba(0xfdf6e3ff).into()),
+                        warning: Some(rgba(0xb58903ff).into()),
                         ..Default::default()
                     },
                     syntax: Some(UserSyntaxTheme {
@@ -344,170 +414,271 @@ pub fn solarized() -> UserThemeFamily {
                             (
                                 "attribute".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x93a1a1ff).into()),
+                                    color: Some(rgba(0x288bd1ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "boolean".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xb58900ff).into()),
+                                    color: Some(rgba(0x859904ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "comment".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x93a1a1ff).into()),
-                                    font_style: Some(UserFontStyle::Italic),
+                                    color: Some(rgba(0x99a5a4ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "comment.doc".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x93a1a1ff).into()),
-                                    font_style: Some(UserFontStyle::Italic),
+                                    color: Some(rgba(0x99a5a4ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "constant".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xb58900ff).into()),
+                                    color: Some(rgba(0x859904ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "constructor".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x268bd2ff).into()),
+                                    color: Some(rgba(0x288bd1ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "embedded".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x657b83ff).into()),
+                                    color: Some(rgba(0xfdf6e3ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "emphasis".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xd33682ff).into()),
+                                    color: Some(rgba(0x288bd1ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "emphasis.strong".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xd33682ff).into()),
+                                    color: Some(rgba(0x288bd1ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "enum".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xcb4b17ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "function".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x657b83ff).into()),
+                                    color: Some(rgba(0xb58903ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "hint".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x4f8297ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "keyword".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x859900ff).into()),
+                                    color: Some(rgba(0x288bd1ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "label".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x288bd1ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "link_text".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xcb4b17ff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "link_uri".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x859904ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "number".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xd33682ff).into()),
+                                    color: Some(rgba(0x859904ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "operator".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xcb4b17ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "predictive".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x40728bff).into()),
+                                    font_style: Some(UserFontStyle::Italic),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "preproc".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xb58900ff).into()),
+                                    color: Some(rgba(0xfdf6e3ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "primary".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xfdf6e3ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "property".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0x288bd1ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xefe9d6ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "punctuation.bracket".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x93a1a1ff).into()),
+                                    color: Some(rgba(0xefe9d6ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.delimiter".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xefe9d6ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.list_marker".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xefe9d6ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "punctuation.special".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xefe9d6ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x2aa198ff).into()),
+                                    color: Some(rgba(0xcb4b17ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string.escape".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xcb4b16ff).into()),
+                                    color: Some(rgba(0x99a5a4ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string.regex".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x2aa198ff).into()),
+                                    color: Some(rgba(0xcb4b17ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string.special".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x2aa198ff).into()),
+                                    color: Some(rgba(0xcb4b17ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "string.special.symbol".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x2aa198ff).into()),
+                                    color: Some(rgba(0xcb4b17ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "tag".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x268bd2ff).into()),
+                                    color: Some(rgba(0x288bd1ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "text.literal".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x2aa198ff).into()),
+                                    color: Some(rgba(0xcb4b17ff).into()),
+                                    ..Default::default()
+                                },
+                            ),
+                            (
+                                "title".into(),
+                                UserHighlightStyle {
+                                    color: Some(rgba(0xfdf6e3ff).into()),
+                                    font_weight: Some(UserFontWeight(700.0)),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "type".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0xb58900ff).into()),
+                                    color: Some(rgba(0x2ca198ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
                                 "variable".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x268bd2ff).into()),
+                                    color: Some(rgba(0xfdf6e3ff).into()),
                                     ..Default::default()
                                 },
                             ),
                             (
-                                "variable.special".into(),
+                                "variant".into(),
                                 UserHighlightStyle {
-                                    color: Some(rgba(0x268bd2ff).into()),
+                                    color: Some(rgba(0x288bd1ff).into()),
                                     ..Default::default()
                                 },
                             ),

crates/theme2/src/themes/summercamp.rs πŸ”—

@@ -0,0 +1,353 @@
+// This file was generated by the `theme_importer`.
+// Be careful when modifying it by hand.
+
+use gpui::rgba;
+
+#[allow(unused)]
+use crate::{
+    Appearance, StatusColorsRefinement, ThemeColorsRefinement, UserFontStyle, UserFontWeight,
+    UserHighlightStyle, UserSyntaxTheme, UserTheme, UserThemeFamily, UserThemeStylesRefinement,
+};
+
+pub fn summercamp() -> UserThemeFamily {
+    UserThemeFamily {
+        name: "Summercamp".into(),
+        author: "Zed Industries".into(),
+        themes: vec![UserTheme {
+            name: "Summercamp".into(),
+            appearance: Appearance::Dark,
+            styles: UserThemeStylesRefinement {
+                colors: ThemeColorsRefinement {
+                    border: Some(rgba(0x312d21ff).into()),
+                    border_variant: Some(rgba(0x312d21ff).into()),
+                    elevated_surface_background: Some(rgba(0x2a261cff).into()),
+                    background: Some(rgba(0x2a261cff).into()),
+                    panel_background: Some(rgba(0x231f16ff).into()),
+                    element_hover: Some(rgba(0x312d2180).into()),
+                    element_selected: Some(rgba(0x39342780).into()),
+                    text: Some(rgba(0x736e55ff).into()),
+                    text_muted: Some(rgba(0x3d382aff).into()),
+                    status_bar_background: Some(rgba(0x2a261cff).into()),
+                    title_bar_background: Some(rgba(0x2a261cff).into()),
+                    toolbar_background: Some(rgba(0x1c1810ff).into()),
+                    tab_bar_background: Some(rgba(0x231f16ff).into()),
+                    tab_inactive_background: Some(rgba(0x231f16ff).into()),
+                    tab_active_background: Some(rgba(0x1c1810ff).into()),
+                    scrollbar_thumb_background: Some(rgba(0xf8f5de4d).into()),
+                    scrollbar_thumb_hover_background: Some(rgba(0xf8f5de4d).into()),
+                    scrollbar_thumb_border: Some(rgba(0x221e15ff).into()),
+                    scrollbar_track_border: Some(rgba(0x221e15ff).into()),
+                    editor_foreground: Some(rgba(0xf8f5deff).into()),
+                    editor_background: Some(rgba(0x1c1810ff).into()),
+                    editor_gutter_background: Some(rgba(0x1c1810ff).into()),
+                    editor_line_number: Some(rgba(0xf8f5de59).into()),
+                    editor_active_line_number: Some(rgba(0xf8f5deff).into()),
+                    editor_wrap_guide: Some(rgba(0xf8f5de0d).into()),
+                    editor_active_wrap_guide: Some(rgba(0xf8f5de1a).into()),
+                    terminal_background: Some(rgba(0x1c1810ff).into()),
+                    terminal_ansi_bright_black: Some(rgba(0x3b3627ff).into()),
+                    terminal_ansi_bright_red: Some(rgba(0x7f2724ff).into()),
+                    terminal_ansi_bright_green: Some(rgba(0x28842cff).into()),
+                    terminal_ansi_bright_yellow: Some(rgba(0x8c9a10ff).into()),
+                    terminal_ansi_bright_blue: Some(rgba(0x234b7fff).into()),
+                    terminal_ansi_bright_magenta: Some(rgba(0x88487eff).into()),
+                    terminal_ansi_bright_cyan: Some(rgba(0x298462ff).into()),
+                    terminal_ansi_bright_white: Some(rgba(0xf8f5deff).into()),
+                    terminal_ansi_black: Some(rgba(0x1c1810ff).into()),
+                    terminal_ansi_red: Some(rgba(0xe35142ff).into()),
+                    terminal_ansi_green: Some(rgba(0x5dea5aff).into()),
+                    terminal_ansi_yellow: Some(rgba(0xf1fe29ff).into()),
+                    terminal_ansi_blue: Some(rgba(0x499befff).into()),
+                    terminal_ansi_magenta: Some(rgba(0xf59be6ff).into()),
+                    terminal_ansi_cyan: Some(rgba(0x5beabcff).into()),
+                    terminal_ansi_white: Some(rgba(0xf8f5deff).into()),
+                    ..Default::default()
+                },
+                status: StatusColorsRefinement {
+                    created: Some(rgba(0x5dea5aff).into()),
+                    deleted: Some(rgba(0xb93f36ff).into()),
+                    error: Some(rgba(0xe35142ff).into()),
+                    modified: Some(rgba(0xf1fe29ff).into()),
+                    success: Some(rgba(0xf8f5deff).into()),
+                    warning: Some(rgba(0xf1fe29ff).into()),
+                    ..Default::default()
+                },
+                syntax: Some(UserSyntaxTheme {
+                    highlights: vec![
+                        (
+                            "attribute".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0x499befff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "boolean".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0x5dea5aff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "comment".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0x777259ff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "comment.doc".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0x777259ff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "constant".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0x5dea5aff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "constructor".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0x499befff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "embedded".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xf8f5deff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "emphasis".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0x499befff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "emphasis.strong".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0x499befff).into()),
+                                font_weight: Some(UserFontWeight(700.0)),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "enum".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xfaa11dff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "function".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xf1fe29ff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "hint".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0x246e61ff).into()),
+                                font_weight: Some(UserFontWeight(700.0)),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "keyword".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0x499befff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "label".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0x499befff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "link_text".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xfaa11dff).into()),
+                                font_style: Some(UserFontStyle::Italic),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "link_uri".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0x5dea5aff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "number".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0x5dea5aff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "operator".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xfaa11dff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "predictive".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0x79434bff).into()),
+                                font_style: Some(UserFontStyle::Italic),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "preproc".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xf8f5deff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "primary".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xf8f5deff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "property".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0x499befff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "punctuation".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xbfbb9bff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "punctuation.bracket".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xbfbb9bff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "punctuation.delimiter".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xbfbb9bff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "punctuation.list_marker".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xbfbb9bff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "punctuation.special".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xbfbb9bff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "string".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xfaa11dff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "string.escape".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0x777259ff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "string.regex".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xfaa11dff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "string.special".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xfaa11dff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "string.special.symbol".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xfaa11dff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "tag".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0x499befff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "text.literal".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xfaa11dff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "title".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xf8f5deff).into()),
+                                font_weight: Some(UserFontWeight(700.0)),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "type".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0x5beabcff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "variable".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0xf8f5deff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                        (
+                            "variant".into(),
+                            UserHighlightStyle {
+                                color: Some(rgba(0x499befff).into()),
+                                ..Default::default()
+                            },
+                        ),
+                    ],
+                }),
+            },
+        }],
+    }
+}

crates/theme2/src/themes/synthwave_84.rs πŸ”—

@@ -1,248 +0,0 @@
-// This file was generated by the `theme_importer`.
-// Be careful when modifying it by hand.
-
-use gpui::rgba;
-
-#[allow(unused)]
-use crate::{
-    Appearance, StatusColorsRefinement, ThemeColorsRefinement, UserFontStyle, UserFontWeight,
-    UserHighlightStyle, UserSyntaxTheme, UserTheme, UserThemeFamily, UserThemeStylesRefinement,
-};
-
-pub fn synthwave_84() -> UserThemeFamily {
-    UserThemeFamily {
-        name: "Synthwave 84".into(),
-        author: "Robb Owen (robb0wen)".into(),
-        themes: vec![UserTheme {
-            name: "Synthwave 84".into(),
-            appearance: Appearance::Dark,
-            styles: UserThemeStylesRefinement {
-                colors: ThemeColorsRefinement {
-                    border_focused: Some(rgba(0x1f212bff).into()),
-                    elevated_surface_background: Some(rgba(0x232530ff).into()),
-                    background: Some(rgba(0x262335ff).into()),
-                    element_background: Some(rgba(0x614d85ff).into()),
-                    element_hover: Some(rgba(0x37294d99).into()),
-                    element_selected: Some(rgba(0xffffff20).into()),
-                    drop_target_background: Some(rgba(0x34294f66).into()),
-                    ghost_element_hover: Some(rgba(0x37294d99).into()),
-                    ghost_element_selected: Some(rgba(0xffffff20).into()),
-                    text: Some(rgba(0xffffffff).into()),
-                    status_bar_background: Some(rgba(0x241b2fff).into()),
-                    title_bar_background: Some(rgba(0x241b2fff).into()),
-                    toolbar_background: Some(rgba(0x262335ff).into()),
-                    tab_bar_background: Some(rgba(0x241b2fff).into()),
-                    tab_inactive_background: Some(rgba(0x262335ff).into()),
-                    tab_active_background: Some(rgba(0x262335ff).into()),
-                    scrollbar_thumb_background: Some(rgba(0x9d8bca30).into()),
-                    scrollbar_thumb_hover_background: Some(rgba(0x9d8bca50).into()),
-                    scrollbar_thumb_border: Some(rgba(0x9d8bca30).into()),
-                    scrollbar_track_background: Some(rgba(0x262335ff).into()),
-                    scrollbar_track_border: Some(rgba(0x34294fb3).into()),
-                    editor_background: Some(rgba(0x262335ff).into()),
-                    editor_gutter_background: Some(rgba(0x262335ff).into()),
-                    editor_line_number: Some(rgba(0xffffff73).into()),
-                    terminal_ansi_bright_red: Some(rgba(0xfe4450ff).into()),
-                    terminal_ansi_bright_green: Some(rgba(0x72f1b8ff).into()),
-                    terminal_ansi_bright_yellow: Some(rgba(0xfede5dff).into()),
-                    terminal_ansi_bright_blue: Some(rgba(0x03edf9ff).into()),
-                    terminal_ansi_bright_magenta: Some(rgba(0xff7edbff).into()),
-                    terminal_ansi_bright_cyan: Some(rgba(0x03edf9ff).into()),
-                    terminal_ansi_red: Some(rgba(0xfe4450ff).into()),
-                    terminal_ansi_green: Some(rgba(0x72f1b8ff).into()),
-                    terminal_ansi_yellow: Some(rgba(0xf3e70fff).into()),
-                    terminal_ansi_blue: Some(rgba(0x03edf9ff).into()),
-                    terminal_ansi_magenta: Some(rgba(0xff7edbff).into()),
-                    terminal_ansi_cyan: Some(rgba(0x03edf9ff).into()),
-                    link_text_hover: Some(rgba(0xff7edbff).into()),
-                    ..Default::default()
-                },
-                status: StatusColorsRefinement {
-                    created: Some(rgba(0x206d4bd6).into()),
-                    deleted: Some(rgba(0xfa2e46a4).into()),
-                    error: Some(rgba(0xfe4450ff).into()),
-                    hint: Some(rgba(0x969696ff).into()),
-                    ignored: Some(rgba(0xffffff59).into()),
-                    modified: Some(rgba(0xb893ce8f).into()),
-                    warning: Some(rgba(0x72f1b8bb).into()),
-                    ..Default::default()
-                },
-                syntax: Some(UserSyntaxTheme {
-                    highlights: vec![
-                        (
-                            "attribute".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0xfede5dff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "boolean".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0xf97e72ff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "comment".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0x848bbdff).into()),
-                                font_style: Some(UserFontStyle::Italic),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "comment.doc".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0x848bbdff).into()),
-                                font_style: Some(UserFontStyle::Italic),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "constant".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0xf97e72ff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "constructor".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0x72f1b8ff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "function".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0x36f9f6ff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "keyword".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0xfede5dff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "label".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0xfe4450ff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "link_text".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0xdd5500ff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "link_uri".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0xdd5500ff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "number".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0xf97e72ff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "operator".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0xfede5dff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "property".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0xff7edbff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "punctuation".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0x36f9f6ff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "punctuation.bracket".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0x36f9f6ff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "punctuation.delimiter".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0x36f9f6ff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "punctuation.list_marker".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0x36f9f6ff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "punctuation.special".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0x36f9f6ff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "tag".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0x72f1b8ff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "title".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0xfe4450ff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "type".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0xfe4450ff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "variable".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0xff7edbff).into()),
-                                ..Default::default()
-                            },
-                        ),
-                        (
-                            "variable.special".into(),
-                            UserHighlightStyle {
-                                color: Some(rgba(0xfe4450ff).into()),
-                                font_weight: Some(UserFontWeight(700.0)),
-                                ..Default::default()
-                            },
-                        ),
-                    ],
-                }),
-            },
-        }],
-    }
-}

crates/theme_importer/src/main.rs πŸ”—

@@ -73,10 +73,6 @@ pub struct ThemeMetadata {
 #[derive(Parser)]
 #[command(author, version, about, long_about = None)]
 struct Args {
-    /// Whether to import Zed1 themes.
-    #[arg(long)]
-    zed1: bool,
-
     /// Whether to warn when values are missing from the theme.
     #[arg(long)]
     warn_on_missing: bool,
@@ -106,181 +102,185 @@ fn main() -> Result<()> {
     TermLogger::init(LevelFilter::Trace, log_config, TerminalMode::Mixed)
         .expect("could not initialize logger");
 
-    log::info!("Loading themes source...");
-    let vscode_themes_path = PathBuf::from_str(SOURCE_PATH)?;
-    if !vscode_themes_path.exists() {
-        return Err(anyhow!(format!(
-            "Couldn't find {}, make sure it exists",
-            SOURCE_PATH
-        )));
-    }
-
     let mut theme_families = Vec::new();
 
-    for theme_family_dir in fs::read_dir(&vscode_themes_path)? {
-        let theme_family_dir = theme_family_dir?;
-
-        if !theme_family_dir.file_type()?.is_dir() {
-            continue;
+    /// Whether VS Code themes should be imported.
+    ///
+    /// For the initial release of Zed2, we will just be using the Zed1 themes ported to Zed2.
+    const IMPORT_VS_CODE_THEMES: bool = false;
+
+    if IMPORT_VS_CODE_THEMES {
+        log::info!("Loading themes source...");
+        let vscode_themes_path = PathBuf::from_str(SOURCE_PATH)?;
+        if !vscode_themes_path.exists() {
+            return Err(anyhow!(format!(
+                "Couldn't find {}, make sure it exists",
+                SOURCE_PATH
+            )));
         }
 
-        let theme_family_slug = theme_family_dir
-            .path()
-            .file_stem()
-            .ok_or(anyhow!("no file stem"))
-            .map(|stem| stem.to_string_lossy().to_string())?;
+        for theme_family_dir in fs::read_dir(&vscode_themes_path)? {
+            let theme_family_dir = theme_family_dir?;
 
-        let family_metadata_file = File::open(theme_family_dir.path().join("family.json"))
-            .context(format!(
-                "no `family.json` found for '{}'",
-                theme_family_slug
-            ))?;
+            if !theme_family_dir.file_type()?.is_dir() {
+                continue;
+            }
 
-        let license_file_path = theme_family_dir.path().join("LICENSE");
+            let theme_family_slug = theme_family_dir
+                .path()
+                .file_stem()
+                .ok_or(anyhow!("no file stem"))
+                .map(|stem| stem.to_string_lossy().to_string())?;
 
-        if !license_file_path.exists() {
-            log::info!("Skipping theme family '{}' because it does not have a LICENSE file. This theme will only be imported once a LICENSE file is provided.", theme_family_slug);
-            continue;
-        }
+            let family_metadata_file = File::open(theme_family_dir.path().join("family.json"))
+                .context(format!(
+                    "no `family.json` found for '{}'",
+                    theme_family_slug
+                ))?;
 
-        let family_metadata: FamilyMetadata = serde_json::from_reader(family_metadata_file)
-            .context(format!(
-                "failed to parse `family.json` for '{theme_family_slug}'"
-            ))?;
+            let license_file_path = theme_family_dir.path().join("LICENSE");
 
-        let mut themes = Vec::new();
+            if !license_file_path.exists() {
+                log::info!("Skipping theme family '{}' because it does not have a LICENSE file. This theme will only be imported once a LICENSE file is provided.", theme_family_slug);
+                continue;
+            }
 
-        for theme_metadata in family_metadata.themes {
-            log::info!("Converting '{}' theme", &theme_metadata.name);
+            let family_metadata: FamilyMetadata = serde_json::from_reader(family_metadata_file)
+                .context(format!(
+                    "failed to parse `family.json` for '{theme_family_slug}'"
+                ))?;
 
-            let theme_file_path = theme_family_dir.path().join(&theme_metadata.file_name);
+            let mut themes = Vec::new();
 
-            let theme_file = match File::open(&theme_file_path) {
-                Ok(file) => file,
-                Err(_) => {
-                    log::info!("Failed to open file at path: {:?}", theme_file_path);
-                    continue;
-                }
-            };
+            for theme_metadata in family_metadata.themes {
+                log::info!("Converting '{}' theme", &theme_metadata.name);
 
-            let theme_without_comments = StripComments::new(theme_file);
-            let vscode_theme: VsCodeTheme = serde_json::from_reader(theme_without_comments)
-                .context(format!("failed to parse theme {theme_file_path:?}"))?;
+                let theme_file_path = theme_family_dir.path().join(&theme_metadata.file_name);
 
-            let converter = VsCodeThemeConverter::new(
-                vscode_theme,
-                theme_metadata,
-                family_metadata.syntax.clone(),
-            );
+                let theme_file = match File::open(&theme_file_path) {
+                    Ok(file) => file,
+                    Err(_) => {
+                        log::info!("Failed to open file at path: {:?}", theme_file_path);
+                        continue;
+                    }
+                };
 
-            let theme = converter.convert()?;
+                let theme_without_comments = StripComments::new(theme_file);
+                let vscode_theme: VsCodeTheme = serde_json::from_reader(theme_without_comments)
+                    .context(format!("failed to parse theme {theme_file_path:?}"))?;
 
-            themes.push(theme);
-        }
+                let converter = VsCodeThemeConverter::new(
+                    vscode_theme,
+                    theme_metadata,
+                    family_metadata.syntax.clone(),
+                );
 
-        let theme_family = UserThemeFamily {
-            name: family_metadata.name.into(),
-            author: family_metadata.author.into(),
-            themes,
-        };
+                let theme = converter.convert()?;
 
-        theme_families.push(theme_family);
+                themes.push(theme);
+            }
+
+            let theme_family = UserThemeFamily {
+                name: family_metadata.name.into(),
+                author: family_metadata.author.into(),
+                themes,
+            };
+
+            theme_families.push(theme_family);
+        }
     }
 
-    if args.zed1 {
-        let zed1_themes_path = PathBuf::from_str("assets/themes")?;
-
-        let zed1_theme_familes = [
-            "Andromeda",
-            "Atelier",
-            "Ayu",
-            "Gruvbox",
-            "One",
-            "RosΓ© Pine",
-            "Sandcastle",
-            "Solarized",
-            "Summercamp",
-        ];
-
-        let mut zed1_themes_by_family: HashMap<String, Vec<UserTheme>> = HashMap::from_iter(
-            zed1_theme_familes
-                .into_iter()
-                .map(|family| (family.to_string(), Vec::new())),
-        );
+    let zed1_themes_path = PathBuf::from_str("assets/themes")?;
+
+    let zed1_theme_familes = [
+        "Andromeda",
+        "Atelier",
+        "Ayu",
+        "Gruvbox",
+        "One",
+        "RosΓ© Pine",
+        "Sandcastle",
+        "Solarized",
+        "Summercamp",
+    ];
+
+    let mut zed1_themes_by_family: HashMap<String, Vec<UserTheme>> = HashMap::from_iter(
+        zed1_theme_familes
+            .into_iter()
+            .map(|family| (family.to_string(), Vec::new())),
+    );
 
-        let platform = gpui1::platform::current::platform();
-        let zed1_font_cache = Arc::new(gpui1::FontCache::new(platform.fonts()));
+    let platform = gpui1::platform::current::platform();
+    let zed1_font_cache = Arc::new(gpui1::FontCache::new(platform.fonts()));
 
-        let mut embedded_fonts = Vec::new();
-        for font_path in Assets.list("fonts")? {
-            if font_path.ends_with(".ttf") {
-                let font_bytes = Assets.load(&font_path)?.to_vec();
-                embedded_fonts.push(Arc::from(font_bytes));
-            }
+    let mut embedded_fonts = Vec::new();
+    for font_path in Assets.list("fonts")? {
+        if font_path.ends_with(".ttf") {
+            let font_bytes = Assets.load(&font_path)?.to_vec();
+            embedded_fonts.push(Arc::from(font_bytes));
         }
+    }
 
-        platform.fonts().add_fonts(&embedded_fonts)?;
+    platform.fonts().add_fonts(&embedded_fonts)?;
 
-        for entry in fs::read_dir(&zed1_themes_path)? {
-            let entry = entry?;
+    for entry in fs::read_dir(&zed1_themes_path)? {
+        let entry = entry?;
 
-            if entry.file_type()?.is_dir() {
-                continue;
-            }
+        if entry.file_type()?.is_dir() {
+            continue;
+        }
 
-            match entry.path().extension() {
-                None => continue,
-                Some(extension) => {
-                    if extension != "json" {
-                        continue;
-                    }
+        match entry.path().extension() {
+            None => continue,
+            Some(extension) => {
+                if extension != "json" {
+                    continue;
                 }
             }
+        }
 
-            let theme_file_path = entry.path();
+        let theme_file_path = entry.path();
 
-            let theme_file = match File::open(&theme_file_path) {
-                Ok(file) => file,
-                Err(_) => {
-                    log::info!("Failed to open file at path: {:?}", theme_file_path);
-                    continue;
-                }
-            };
+        let theme_file = match File::open(&theme_file_path) {
+            Ok(file) => file,
+            Err(_) => {
+                log::info!("Failed to open file at path: {:?}", theme_file_path);
+                continue;
+            }
+        };
 
-            let theme_without_comments = StripComments::new(theme_file);
+        let theme_without_comments = StripComments::new(theme_file);
 
-            let zed1_theme: Zed1Theme =
-                gpui1::fonts::with_font_cache(zed1_font_cache.clone(), || {
-                    serde_json::from_reader(theme_without_comments)
-                        .context(format!("failed to parse theme {theme_file_path:?}"))
-                })?;
+        let zed1_theme: Zed1Theme = gpui1::fonts::with_font_cache(zed1_font_cache.clone(), || {
+            serde_json::from_reader(theme_without_comments)
+                .context(format!("failed to parse theme {theme_file_path:?}"))
+        })?;
 
-            let theme_name = zed1_theme.meta.name.clone();
+        let theme_name = zed1_theme.meta.name.clone();
 
-            let converter = Zed1ThemeConverter::new(zed1_theme);
+        let converter = Zed1ThemeConverter::new(zed1_theme);
 
-            let theme = converter.convert()?;
+        let theme = converter.convert()?;
 
-            let Some((_, themes_for_family)) = zed1_themes_by_family
-                .iter_mut()
-                .find(|(family, _)| theme_name.starts_with(*family))
-            else {
-                log::warn!("No theme family found for '{}'.", theme_name);
-                continue;
-            };
+        let Some((_, themes_for_family)) = zed1_themes_by_family
+            .iter_mut()
+            .find(|(family, _)| theme_name.starts_with(*family))
+        else {
+            log::warn!("No theme family found for '{}'.", theme_name);
+            continue;
+        };
 
-            themes_for_family.push(theme);
-        }
+        themes_for_family.push(theme);
+    }
 
-        for (family, themes) in zed1_themes_by_family {
-            let theme_family = UserThemeFamily {
-                name: format!("{family} (Zed1)"),
-                author: "Zed Industries".to_string(),
-                themes,
-            };
+    for (family, themes) in zed1_themes_by_family {
+        let theme_family = UserThemeFamily {
+            name: family,
+            author: "Zed Industries".to_string(),
+            themes,
+        };
 
-            theme_families.push(theme_family);
-        }
+        theme_families.push(theme_family);
     }
 
     let themes_output_path = PathBuf::from_str(OUT_PATH)?;

crates/theme_importer/src/theme_printer.rs πŸ”—

@@ -160,6 +160,7 @@ impl<'a> Debug for ThemeColorsRefinementPrinter<'a> {
             ),
             ("surface_background", self.0.surface_background),
             ("background", self.0.background),
+            ("panel_background", self.0.panel_background),
             ("element_background", self.0.element_background),
             ("element_hover", self.0.element_hover),
             ("element_active", self.0.element_active),

crates/theme_importer/src/zed1/converter.rs πŸ”—

@@ -53,7 +53,7 @@ impl Zed1ThemeConverter {
         let syntax_theme = self.convert_syntax_theme()?;
 
         Ok(UserTheme {
-            name: format!("{} (Zed1)", self.theme.meta.name),
+            name: self.theme.meta.name,
             appearance,
             styles: UserThemeStylesRefinement {
                 colors: theme_colors_refinement,
@@ -68,12 +68,16 @@ impl Zed1ThemeConverter {
             Some(zed1_color_to_hsla(color))
         }
 
-        let diff_style = self.theme.editor.diff.clone();
+        let diff_style = &self.theme.editor.diff;
+        let diagnostic_summary = &self.theme.workspace.status_bar.diagnostic_summary;
 
         Ok(StatusColorsRefinement {
             created: convert(diff_style.inserted),
             modified: convert(diff_style.modified),
             deleted: convert(diff_style.deleted),
+            success: convert(diagnostic_summary.icon_color_ok),
+            warning: convert(diagnostic_summary.icon_color_warning),
+            error: convert(diagnostic_summary.icon_color_error),
             ..Default::default()
         })
     }
@@ -83,11 +87,11 @@ impl Zed1ThemeConverter {
             Some(zed1_color_to_hsla(color))
         }
 
-        let tab_bar = self.theme.workspace.tab_bar.clone();
-        let active_tab = self.theme.workspace.tab_bar.tab_style(true, true).clone();
-        let inactive_tab = self.theme.workspace.tab_bar.tab_style(true, false).clone();
-        let toolbar = self.theme.workspace.toolbar.clone();
-        let scrollbar = self.theme.editor.scrollbar.clone();
+        let tab_bar = &self.theme.workspace.tab_bar;
+        let active_tab = &self.theme.workspace.tab_bar.tab_style(true, true);
+        let inactive_tab = &self.theme.workspace.tab_bar.tab_style(true, false);
+        let toolbar = &self.theme.workspace.toolbar;
+        let scrollbar = &self.theme.editor.scrollbar;
 
         let zed1_titlebar_border = convert(self.theme.titlebar.container.border.color);
 
@@ -95,6 +99,12 @@ impl Zed1ThemeConverter {
             border: zed1_titlebar_border,
             border_variant: zed1_titlebar_border,
             background: convert(self.theme.workspace.background),
+            elevated_surface_background: self
+                .theme
+                .picker
+                .container
+                .background_color
+                .map(zed1_color_to_hsla),
             title_bar_background: self
                 .theme
                 .titlebar
@@ -107,8 +117,38 @@ impl Zed1ThemeConverter {
                 .status_bar
                 .container
                 .background_color
+                .map(zed1_color_to_hsla)
+                .or_else(|| {
+                    self.theme
+                        .titlebar
+                        .container
+                        .background_color
+                        .map(zed1_color_to_hsla)
+                }),
+            panel_background: self
+                .theme
+                .project_panel
+                .container
+                .background_color
+                .map(zed1_color_to_hsla),
+            text: convert(self.theme.project_panel.entry.default_style().text.color),
+            text_muted: convert(active_tab.description.text.color),
+            element_hover: self
+                .theme
+                .picker
+                .item
+                .hovered
+                .as_ref()
+                .and_then(|hovered| hovered.container.background_color)
+                .map(zed1_color_to_hsla),
+            element_selected: self
+                .theme
+                .picker
+                .item
+                .active_state()
+                .container
+                .background_color
                 .map(zed1_color_to_hsla),
-            text: convert(self.theme.editor.text_color),
             tab_bar_background: tab_bar.container.background_color.map(zed1_color_to_hsla),
             tab_active_background: active_tab
                 .container

crates/workspace2/src/dock.rs πŸ”—

@@ -537,6 +537,7 @@ impl Render for Dock {
 
             div()
                 .flex()
+                .bg(cx.theme().colors().panel_background)
                 .border_color(cx.theme().colors().border)
                 .overflow_hidden()
                 .map(|this| match self.position().axis() {