From a6dd070f9216a118b697c6bd607801fdb0288b92 Mon Sep 17 00:00:00 2001
From: Mark Grey <mgthesecond@spotify.com>
Date: Mon, 12 Feb 2024 17:01:46 -0500
Subject: [PATCH 01/40] Implement initial structs from spec

---
 zellij-utils/src/data.rs        | 37 +++++++++++++++++++++++++++++++++
 zellij-utils/src/input/theme.rs |  3 ++-
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/zellij-utils/src/data.rs b/zellij-utils/src/data.rs
index 54c056e359..830b7a2895 100644
--- a/zellij-utils/src/data.rs
+++ b/zellij-utils/src/data.rs
@@ -1134,6 +1134,43 @@ pub struct Style {
     pub hide_session_name: bool,
 }
 
+#[derive(Debug, Clone, PartialEq, Deserialize, Serialize)]
+pub struct Styling {
+    text_unselected: [PaletteColor; 6],
+    text_selected: [PaletteColor; 6],
+    ribbon_unselected: [PaletteColor; 6],
+    ribbon_selected: [PaletteColor; 6],
+    table_title: [PaletteColor; 6],
+    table_cell_unselected: [PaletteColor; 6],
+    table_cell_selected: [PaletteColor; 6],
+    list_unselected: [PaletteColor; 6],
+    list_selected: [PaletteColor; 6],
+    frame_unselected: [PaletteColor; 5],
+    frame_selected: [PaletteColor; 5],
+    exit_code_success: [PaletteColor; 5],
+    exit_code_error: [PaletteColor; 5],
+}
+
+impl Default for Styling {
+    fn default() -> Self {
+        Self {
+            text_unselected: Default::default(),
+            text_selected: Default::default(),
+            ribbon_unselected: Default::default(),
+            ribbon_selected: Default::default(),
+            table_title: Default::default(),
+            table_cell_unselected: Default::default(),
+            table_cell_selected: Default::default(),
+            list_unselected: Default::default(),
+            list_selected: Default::default(),
+            frame_unselected: Default::default(),
+            frame_selected: Default::default(),
+            exit_code_success: Default::default(),
+            exit_code_error: Default::default(),
+        }
+    }
+}
+
 // FIXME: Poor devs hashtable since HashTable can't derive `Default`...
 pub type KeybindsVec = Vec<(InputMode, Vec<(KeyWithModifier, Vec<Action>)>)>;
 
diff --git a/zellij-utils/src/input/theme.rs b/zellij-utils/src/input/theme.rs
index bf0edf232c..eb4c2023dc 100644
--- a/zellij-utils/src/input/theme.rs
+++ b/zellij-utils/src/input/theme.rs
@@ -7,7 +7,7 @@ use std::{
     fmt,
 };
 
-use crate::data::Palette;
+use crate::data::{Palette, Styling};
 
 #[derive(Debug, Default, Clone, Copy, PartialEq, Deserialize, Serialize)]
 pub struct UiConfig {
@@ -73,6 +73,7 @@ impl Themes {
 pub struct Theme {
     #[serde(flatten)]
     pub palette: Palette,
+    pub styling: Styling,
 }
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]

From 2bbe0a522527bfde3e4298630ae30215b3f4924f Mon Sep 17 00:00:00 2001
From: Mark Grey <mgthesecond@spotify.com>
Date: Mon, 12 Feb 2024 17:02:12 -0500
Subject: [PATCH 02/40] kdl configuration unmarshalling

---
 zellij-client/src/lib.rs                |   1 +
 zellij-utils/assets/prost/api.style.rs  |  33 ++++++
 zellij-utils/src/data.rs                |  61 +++++-----
 zellij-utils/src/input/config.rs        | 145 +++++++++++++++++++++++-
 zellij-utils/src/kdl/mod.rs             |  78 ++++++++++---
 zellij-utils/src/plugin_api/event.rs    |   2 +
 zellij-utils/src/plugin_api/style.proto |  19 +++-
 zellij-utils/src/plugin_api/style.rs    |  25 +++-
 8 files changed, 312 insertions(+), 52 deletions(-)

diff --git a/zellij-client/src/lib.rs b/zellij-client/src/lib.rs
index 422e205283..ce2322d02c 100644
--- a/zellij-client/src/lib.rs
+++ b/zellij-client/src/lib.rs
@@ -215,6 +215,7 @@ pub fn start_client(
         size: full_screen_ws,
         style: Style {
             colors: palette,
+            styling: palette.into(),
             rounded_corners: config.ui.pane_frames.rounded_corners,
             hide_session_name: config.ui.pane_frames.hide_session_name,
         },
diff --git a/zellij-utils/assets/prost/api.style.rs b/zellij-utils/assets/prost/api.style.rs
index cd768c3908..1f99b9709d 100644
--- a/zellij-utils/assets/prost/api.style.rs
+++ b/zellij-utils/assets/prost/api.style.rs
@@ -1,12 +1,15 @@
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Style {
+    #[deprecated]
     #[prost(message, optional, tag = "1")]
     pub palette: ::core::option::Option<Palette>,
     #[prost(bool, tag = "2")]
     pub rounded_corners: bool,
     #[prost(bool, tag = "3")]
     pub hide_session_name: bool,
+    #[prost(message, optional, tag = "4")]
+    pub styling: ::core::option::Option<Styling>,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
@@ -77,6 +80,36 @@ pub struct RgbColorPayload {
     #[prost(uint32, tag = "3")]
     pub blue: u32,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct Styling {
+    #[prost(message, repeated, tag = "1")]
+    pub text_unselected: ::prost::alloc::vec::Vec<Color>,
+    #[prost(message, repeated, tag = "2")]
+    pub text_selected: ::prost::alloc::vec::Vec<Color>,
+    #[prost(message, repeated, tag = "3")]
+    pub ribbon_unselected: ::prost::alloc::vec::Vec<Color>,
+    #[prost(message, repeated, tag = "4")]
+    pub ribbon_selected: ::prost::alloc::vec::Vec<Color>,
+    #[prost(message, repeated, tag = "5")]
+    pub table_title: ::prost::alloc::vec::Vec<Color>,
+    #[prost(message, repeated, tag = "6")]
+    pub table_cell_unselected: ::prost::alloc::vec::Vec<Color>,
+    #[prost(message, repeated, tag = "7")]
+    pub table_cell_selected: ::prost::alloc::vec::Vec<Color>,
+    #[prost(message, repeated, tag = "8")]
+    pub list_unselected: ::prost::alloc::vec::Vec<Color>,
+    #[prost(message, repeated, tag = "9")]
+    pub list_selected: ::prost::alloc::vec::Vec<Color>,
+    #[prost(message, repeated, tag = "10")]
+    pub frame_unselected: ::prost::alloc::vec::Vec<Color>,
+    #[prost(message, repeated, tag = "11")]
+    pub frame_selected: ::prost::alloc::vec::Vec<Color>,
+    #[prost(message, repeated, tag = "12")]
+    pub exit_code_success: ::prost::alloc::vec::Vec<Color>,
+    #[prost(message, repeated, tag = "13")]
+    pub exit_code_error: ::prost::alloc::vec::Vec<Color>,
+}
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
 #[repr(i32)]
 pub enum ColorType {
diff --git a/zellij-utils/src/data.rs b/zellij-utils/src/data.rs
index 830b7a2895..eac08f79cf 100644
--- a/zellij-utils/src/data.rs
+++ b/zellij-utils/src/data.rs
@@ -1130,44 +1130,39 @@ pub struct Palette {
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Default, Serialize, Deserialize)]
 pub struct Style {
     pub colors: Palette,
+    pub styling: Styling,
     pub rounded_corners: bool,
     pub hide_session_name: bool,
 }
 
-#[derive(Debug, Clone, PartialEq, Deserialize, Serialize)]
+#[derive(Debug, Copy, Default, Clone, PartialEq, Eq, Hash, Deserialize, Serialize)]
 pub struct Styling {
-    text_unselected: [PaletteColor; 6],
-    text_selected: [PaletteColor; 6],
-    ribbon_unselected: [PaletteColor; 6],
-    ribbon_selected: [PaletteColor; 6],
-    table_title: [PaletteColor; 6],
-    table_cell_unselected: [PaletteColor; 6],
-    table_cell_selected: [PaletteColor; 6],
-    list_unselected: [PaletteColor; 6],
-    list_selected: [PaletteColor; 6],
-    frame_unselected: [PaletteColor; 5],
-    frame_selected: [PaletteColor; 5],
-    exit_code_success: [PaletteColor; 5],
-    exit_code_error: [PaletteColor; 5],
-}
-
-impl Default for Styling {
-    fn default() -> Self {
-        Self {
-            text_unselected: Default::default(),
-            text_selected: Default::default(),
-            ribbon_unselected: Default::default(),
-            ribbon_selected: Default::default(),
-            table_title: Default::default(),
-            table_cell_unselected: Default::default(),
-            table_cell_selected: Default::default(),
-            list_unselected: Default::default(),
-            list_selected: Default::default(),
-            frame_unselected: Default::default(),
-            frame_selected: Default::default(),
-            exit_code_success: Default::default(),
-            exit_code_error: Default::default(),
-        }
+    pub text_unselected: [PaletteColor; 6],
+    pub text_selected: [PaletteColor; 6],
+    pub ribbon_unselected: [PaletteColor; 6],
+    pub ribbon_selected: [PaletteColor; 6],
+    pub table_title: [PaletteColor; 6],
+    pub table_cell_unselected: [PaletteColor; 6],
+    pub table_cell_selected: [PaletteColor; 6],
+    pub list_unselected: [PaletteColor; 6],
+    pub list_selected: [PaletteColor; 6],
+    pub frame_unselected: [PaletteColor; 5],
+    pub frame_selected: [PaletteColor; 5],
+    pub exit_code_success: [PaletteColor; 5],
+    pub exit_code_error: [PaletteColor; 5],
+}
+
+impl From<Palette> for Styling {
+    fn from(_value: Palette) -> Self {
+        // TODO: Implement mapping of old colors -> styling
+        todo!()
+    }
+}
+
+impl From<Styling> for Palette {
+    // TODO: Implement mapping of old colors -> styling
+    fn from(_value: Styling) -> Self {
+        todo!()
     }
 }
 
diff --git a/zellij-utils/src/input/config.rs b/zellij-utils/src/input/config.rs
index 56c6f338af..91f887d8e5 100644
--- a/zellij-utils/src/input/config.rs
+++ b/zellij-utils/src/input/config.rs
@@ -238,7 +238,7 @@ impl Config {
 #[cfg(test)]
 mod config_test {
     use super::*;
-    use crate::data::{InputMode, Palette, PaletteColor, PluginTag};
+    use crate::data::{InputMode, Palette, PaletteColor, PluginTag, Styling};
     use crate::input::layout::{RunPlugin, RunPluginLocation};
     use crate::input::options::{Clipboard, OnForceClose};
     use crate::input::plugins::{PluginConfig, PluginType};
@@ -463,6 +463,7 @@ mod config_test {
                     white: PaletteColor::Rgb((255, 255, 255)),
                     ..Default::default()
                 },
+                styling: Default::default(),
             },
         );
         let expected_themes = Themes::from_data(expected_themes);
@@ -520,6 +521,7 @@ mod config_test {
                     white: PaletteColor::Rgb((255, 255, 255)),
                     ..Default::default()
                 },
+                styling: Default::default(),
             },
         );
         expected_themes.insert(
@@ -539,6 +541,7 @@ mod config_test {
                     orange: PaletteColor::Rgb((208, 135, 112)),
                     ..Default::default()
                 },
+                styling: Default::default(),
             },
         );
         let expected_themes = Themes::from_data(expected_themes);
@@ -583,12 +586,152 @@ mod config_test {
                     white: PaletteColor::EightBit(255),
                     ..Default::default()
                 },
+                styling: Default::default(),
             },
         );
         let expected_themes = Themes::from_data(expected_themes);
         assert_eq!(config.themes, expected_themes, "Theme defined in config");
     }
 
+    #[test]
+    fn can_define_style_for_theme_with_hex() {
+        let config_contents = r##"
+            themes {
+                named_theme {
+                    styling {
+                        //                      base      emp1      emp2      emp3      emp4      bg
+                        text_unselected       "#DCD7BA" "#DCD7CD" "#DCD8DD" "#DCD899" "#ACD7CD" "#1F1F28"
+                        text_selected         "#16161D" "#16161D" "#16161D" "#16161D" "#16161D" "#9CABCA"
+                        ribbon_unselected     "#DCD7BA" "#7FB4CA" "#A3D4D5" "#7AA89F" "#DCD819" "#252535"
+                        ribbon_selected       "#16161D" "#181820" "#1A1A22" "#2A2A37" "#363646" "#76946A"
+                        table_title           "#DCD7BA" "#7FB4CA" "#A3D4D5" "#7AA89F" "#DCD819" "#252535"
+                        table_cell_unselected "#DCD7BA" "#DCD7CD" "#DCD8DD" "#DCD899" "#ACD7CD" "#1F1F28"
+                        table_cell_selected   "#16161D" "#181820" "#1A1A22" "#2A2A37" "#363646" "#76946A"
+                        list_unselected       "#DCD7BA" "#DCD7CD" "#DCD8DD" "#DCD899" "#ACD7CD" "#1F1F28"
+                        list_selected         "#16161D" "#181820" "#1A1A22" "#2A2A37" "#363646" "#76946A"
+                        frame_unselected      "#DCD8DD" "#7FB4CA" "#A3D4D5" "#7AA89F" "#DCD819"
+                        frame_selected        "#76946A" "#C34043" "#C8C093" "#ACD7CD" "#DCD819"
+                        exit_code_success     "#76946A" "#76946A" "#76946A" "#76946A" "#76946A"
+                        exit_code_error       "#C34043" "#C34043" "#C34043" "#C34043" "#C34043"
+                    }
+                }
+            }
+            "##;
+
+        let config = Config::from_kdl(config_contents, None).unwrap();
+        let mut expected_themes = HashMap::new();
+        expected_themes.insert(
+            "named_theme".into(),
+            Theme {
+                styling: Styling {
+                    text_unselected: [
+                        PaletteColor::Rgb((220, 215, 186)),
+                        PaletteColor::Rgb((220, 215, 205)),
+                        PaletteColor::Rgb((220, 216, 221)),
+                        PaletteColor::Rgb((220, 216, 153)),
+                        PaletteColor::Rgb((172, 215, 205)),
+                        PaletteColor::Rgb((31, 31, 40)),
+                    ],
+                    text_selected: [
+                        PaletteColor::Rgb((22, 22, 29)),
+                        PaletteColor::Rgb((22, 22, 29)),
+                        PaletteColor::Rgb((22, 22, 29)),
+                        PaletteColor::Rgb((22, 22, 29)),
+                        PaletteColor::Rgb((22, 22, 29)),
+                        PaletteColor::Rgb((156, 171, 202)),
+                    ],
+                    ribbon_unselected: [
+                        PaletteColor::Rgb((220, 215, 186)),
+                        PaletteColor::Rgb((127, 180, 202)),
+                        PaletteColor::Rgb((163, 212, 213)),
+                        PaletteColor::Rgb((122, 168, 159)),
+                        PaletteColor::Rgb((220, 216, 25)),
+                        PaletteColor::Rgb((37, 37, 53)),
+                    ],
+                    ribbon_selected: [
+                        PaletteColor::Rgb((22, 22, 29)),
+                        PaletteColor::Rgb((24, 24, 32)),
+                        PaletteColor::Rgb((26, 26, 34)),
+                        PaletteColor::Rgb((42, 42, 55)),
+                        PaletteColor::Rgb((54, 54, 70)),
+                        PaletteColor::Rgb((118, 148, 106)),
+                    ],
+                    table_title: [
+                        PaletteColor::Rgb((220, 215, 186)),
+                        PaletteColor::Rgb((127, 180, 202)),
+                        PaletteColor::Rgb((163, 212, 213)),
+                        PaletteColor::Rgb((122, 168, 159)),
+                        PaletteColor::Rgb((220, 216, 25)),
+                        PaletteColor::Rgb((37, 37, 53)),
+                    ],
+                    table_cell_unselected: [
+                        PaletteColor::Rgb((220, 215, 186)),
+                        PaletteColor::Rgb((220, 215, 205)),
+                        PaletteColor::Rgb((220, 216, 221)),
+                        PaletteColor::Rgb((220, 216, 153)),
+                        PaletteColor::Rgb((172, 215, 205)),
+                        PaletteColor::Rgb((31, 31, 40)),
+                    ],
+                    table_cell_selected: [
+                        PaletteColor::Rgb((22, 22, 29)),
+                        PaletteColor::Rgb((24, 24, 32)),
+                        PaletteColor::Rgb((26, 26, 34)),
+                        PaletteColor::Rgb((42, 42, 55)),
+                        PaletteColor::Rgb((54, 54, 70)),
+                        PaletteColor::Rgb((118, 148, 106)),
+                    ],
+                    list_unselected: [
+                        PaletteColor::Rgb((220, 215, 186)),
+                        PaletteColor::Rgb((220, 215, 205)),
+                        PaletteColor::Rgb((220, 216, 221)),
+                        PaletteColor::Rgb((220, 216, 153)),
+                        PaletteColor::Rgb((172, 215, 205)),
+                        PaletteColor::Rgb((31, 31, 40)),
+                    ],
+                    list_selected: [
+                        PaletteColor::Rgb((22, 22, 29)),
+                        PaletteColor::Rgb((22, 22, 29)),
+                        PaletteColor::Rgb((22, 22, 29)),
+                        PaletteColor::Rgb((22, 22, 29)),
+                        PaletteColor::Rgb((22, 22, 29)),
+                        PaletteColor::Rgb((156, 171, 202)),
+                    ],
+                    frame_unselected: [
+                        PaletteColor::Rgb((220, 216, 221)),
+                        PaletteColor::Rgb((127, 180, 202)),
+                        PaletteColor::Rgb((163, 212, 213)),
+                        PaletteColor::Rgb((122, 168, 159)),
+                        PaletteColor::Rgb((220, 216, 25)),
+                    ],
+                    frame_selected: [
+                        PaletteColor::Rgb((118, 148, 106)),
+                        PaletteColor::Rgb((195, 64, 67)),
+                        PaletteColor::Rgb((200, 192, 147)),
+                        PaletteColor::Rgb((172, 215, 205)),
+                        PaletteColor::Rgb((220, 216, 125)),
+                    ],
+                    exit_code_success: [
+                        PaletteColor::Rgb((118, 148, 106)),
+                        PaletteColor::Rgb((118, 148, 106)),
+                        PaletteColor::Rgb((118, 148, 106)),
+                        PaletteColor::Rgb((118, 148, 106)),
+                        PaletteColor::Rgb((118, 148, 106)),
+                    ],
+                    exit_code_error: [
+                        PaletteColor::Rgb((195, 64, 67)),
+                        PaletteColor::Rgb((195, 64, 67)),
+                        PaletteColor::Rgb((195, 64, 67)),
+                        PaletteColor::Rgb((195, 64, 67)),
+                        PaletteColor::Rgb((195, 64, 67)),
+                    ],
+                },
+                palette: Default::default(),
+            },
+        );
+        let expected_themes = Themes::from_data(expected_themes);
+        assert_eq!(config.themes, expected_themes, "Theme defined in config")
+    }
+
     #[test]
     fn can_define_plugin_configuration_in_configfile() {
         let config_contents = r#"
diff --git a/zellij-utils/src/kdl/mod.rs b/zellij-utils/src/kdl/mod.rs
index a69b6b0276..9baff92a4e 100644
--- a/zellij-utils/src/kdl/mod.rs
+++ b/zellij-utils/src/kdl/mod.rs
@@ -1,7 +1,7 @@
 mod kdl_layout_parser;
 use crate::data::{
     Direction, FloatingPaneCoordinates, InputMode, KeyWithModifier, LayoutInfo, Palette,
-    PaletteColor, PaneInfo, PaneManifest, PermissionType, Resize, SessionInfo, TabInfo,
+    PaletteColor, PaneInfo, PaneManifest, PermissionType, Resize, SessionInfo, Styling, TabInfo,
 };
 use crate::envs::EnvironmentVariables;
 use crate::home::{find_default_config_dir, get_layout_dir};
@@ -1981,20 +1981,68 @@ impl Themes {
         for theme_config in kdl_children_nodes_or_error!(themes_from_kdl, "no themes found") {
             let theme_name = kdl_name!(theme_config);
             let theme_colors = kdl_children_or_error!(theme_config, "empty theme");
-            let theme = Theme {
-                palette: Palette {
-                    fg: PaletteColor::try_from(("fg", theme_colors))?,
-                    bg: PaletteColor::try_from(("bg", theme_colors))?,
-                    red: PaletteColor::try_from(("red", theme_colors))?,
-                    green: PaletteColor::try_from(("green", theme_colors))?,
-                    yellow: PaletteColor::try_from(("yellow", theme_colors))?,
-                    blue: PaletteColor::try_from(("blue", theme_colors))?,
-                    magenta: PaletteColor::try_from(("magenta", theme_colors))?,
-                    orange: PaletteColor::try_from(("orange", theme_colors))?,
-                    cyan: PaletteColor::try_from(("cyan", theme_colors))?,
-                    black: PaletteColor::try_from(("black", theme_colors))?,
-                    white: PaletteColor::try_from(("white", theme_colors))?,
-                    ..Default::default()
+            let styling = kdl_child_with_name!(theme_config, "styling");
+            /*
+            let styling_node =
+                kdl_child_with_name!(theme_config, "styling").ok_or(ConfigError::new_kdl_error(
+                    "Styling block invalid".into(),
+                    theme_config.span().offset(),
+                    theme_config.span().len(),
+                ))?;
+
+            let mut colors = BTreeMap::new();
+            let color_nodes = kdl_children_nodes_or_error!(theme_config, "Palette is empty").iter();
+            for color in color_nodes.filter(|n| n.name().value() != "styling") {
+                let color_name = kdl_name!(color);
+                let color = PaletteColor::try_from(color)?;
+                colors.insert(color_name.to_owned(), color);
+            }
+            */
+            let theme = match styling {
+                // Newer theme definition with named styles
+                Some(style) => {
+                    let s = Styling {
+                        text_unselected: todo!(),
+                        text_selected: todo!(),
+                        ribbon_unselected: todo!(),
+                        ribbon_selected: todo!(),
+                        table_title: todo!(),
+                        table_cell_unselected: todo!(),
+                        table_cell_selected: todo!(),
+                        list_unselected: todo!(),
+                        list_selected: todo!(),
+                        frame_unselected: todo!(),
+                        frame_selected: todo!(),
+                        exit_code_success: todo!(),
+                        exit_code_error: todo!(),
+                    };
+
+                    let t = Theme {
+                        palette: Default::default(),
+                        styling: Default::default(),
+                    };
+                    t
+                },
+                // Older palette based theme definition
+                None => {
+                    let palette = Palette {
+                        fg: PaletteColor::try_from(("fg", theme_colors))?,
+                        bg: PaletteColor::try_from(("bg", theme_colors))?,
+                        red: PaletteColor::try_from(("red", theme_colors))?,
+                        green: PaletteColor::try_from(("green", theme_colors))?,
+                        yellow: PaletteColor::try_from(("yellow", theme_colors))?,
+                        blue: PaletteColor::try_from(("blue", theme_colors))?,
+                        magenta: PaletteColor::try_from(("magenta", theme_colors))?,
+                        orange: PaletteColor::try_from(("orange", theme_colors))?,
+                        cyan: PaletteColor::try_from(("cyan", theme_colors))?,
+                        black: PaletteColor::try_from(("black", theme_colors))?,
+                        white: PaletteColor::try_from(("white", theme_colors))?,
+                        ..Default::default()
+                    };
+                    Theme {
+                        palette,
+                        styling: palette.into(),
+                    }
                 },
             };
             themes.insert(theme_name.into(), theme);
diff --git a/zellij-utils/src/plugin_api/event.rs b/zellij-utils/src/plugin_api/event.rs
index 1e793e66cf..30814b842e 100644
--- a/zellij-utils/src/plugin_api/event.rs
+++ b/zellij-utils/src/plugin_api/event.rs
@@ -1115,6 +1115,8 @@ fn serialize_mode_update_event_with_non_default_values() {
                 pink: PaletteColor::EightBit(2),
                 brown: PaletteColor::Rgb((222, 221, 220)),
             },
+            // TODO: replace default
+            styling: Default::default(),
             rounded_corners: true,
             hide_session_name: false,
         },
diff --git a/zellij-utils/src/plugin_api/style.proto b/zellij-utils/src/plugin_api/style.proto
index f4f3b75889..8cc50b192e 100644
--- a/zellij-utils/src/plugin_api/style.proto
+++ b/zellij-utils/src/plugin_api/style.proto
@@ -3,9 +3,10 @@ syntax = "proto3";
 package api.style;
 
 message Style {
-  Palette palette = 1;
+  Palette palette = 1 [deprecated = true];
   bool rounded_corners = 2;
   bool hide_session_name = 3;
+  Styling styling = 4;
 }
 
 message Palette {
@@ -52,3 +53,19 @@ enum ThemeHue {
   Dark = 0;
   Light = 1;
 }
+
+message Styling {
+    repeated Color text_unselected = 1;
+    repeated Color text_selected = 2;
+    repeated Color ribbon_unselected = 3;
+    repeated Color ribbon_selected =4;
+    repeated Color table_title = 5;
+    repeated Color table_cell_unselected = 6;
+    repeated Color table_cell_selected = 7;
+    repeated Color list_unselected = 8;
+    repeated Color list_selected = 9;
+    repeated Color frame_unselected = 10;
+    repeated Color frame_selected = 11;
+    repeated Color exit_code_success = 12;
+    repeated Color exit_code_error = 13;
+}
diff --git a/zellij-utils/src/plugin_api/style.rs b/zellij-utils/src/plugin_api/style.rs
index 1e3ba677f6..795a026948 100644
--- a/zellij-utils/src/plugin_api/style.rs
+++ b/zellij-utils/src/plugin_api/style.rs
@@ -1,9 +1,9 @@
 use super::generated_api::api::style::{
     color::Payload as ProtobufColorPayload, Color as ProtobufColor, ColorType as ProtobufColorType,
     Palette as ProtobufPalette, RgbColorPayload as ProtobufRgbColorPayload, Style as ProtobufStyle,
-    ThemeHue as ProtobufThemeHue,
+    Styling as ProtobufStyling, ThemeHue as ProtobufThemeHue,
 };
-use crate::data::{Palette, PaletteColor, Style, ThemeHue};
+use crate::data::{Palette, PaletteColor, Style, Styling, ThemeHue};
 use crate::errors::prelude::*;
 
 use std::convert::TryFrom;
@@ -16,6 +16,10 @@ impl TryFrom<ProtobufStyle> for Style {
                 .palette
                 .ok_or("malformed style payload")?
                 .try_into()?,
+            styling: protobuf_style
+                .styling
+                .ok_or("malformed style payload")?
+                .try_into()?,
             rounded_corners: protobuf_style.rounded_corners,
             hide_session_name: protobuf_style.hide_session_name,
         })
@@ -29,10 +33,27 @@ impl TryFrom<Style> for ProtobufStyle {
             palette: Some(style.colors.try_into()?),
             rounded_corners: style.rounded_corners,
             hide_session_name: style.hide_session_name,
+            styling: Some(style.styling.try_into()?),
         })
     }
 }
 
+impl TryFrom<ProtobufStyling> for Styling {
+    type Error = &'static str;
+
+    fn try_from(_value: ProtobufStyling) -> std::result::Result<Self, Self::Error> {
+        todo!()
+    }
+}
+
+impl TryFrom<Styling> for ProtobufStyling {
+    type Error = &'static str;
+
+    fn try_from(_value: Styling) -> std::result::Result<Self, Self::Error> {
+        todo!()
+    }
+}
+
 impl TryFrom<ProtobufPalette> for Palette {
     type Error = &'static str;
     fn try_from(protobuf_palette: ProtobufPalette) -> Result<Self, &'static str> {

From 9a14b576cbebe72ab29be21ac9944092d7afefa9 Mon Sep 17 00:00:00 2001
From: Mark Grey <mgthesecond@spotify.com>
Date: Tue, 20 Feb 2024 08:08:24 -0500
Subject: [PATCH 03/40] Configuration of styles

---
 zellij-client/src/lib.rs                     |   6 +-
 zellij-server/src/ui/components/mod.rs       |   2 +-
 zellij-server/src/ui/components/ribbon.rs    |  30 ++--
 zellij-server/src/ui/components/table.rs     |   8 +-
 zellij-server/src/ui/components/text.rs      |  17 ++-
 zellij-server/src/ui/pane_contents_and_ui.rs |   3 +-
 zellij-utils/src/data.rs                     |  13 +-
 zellij-utils/src/input/config.rs             | 140 +++++++++++++++----
 zellij-utils/src/kdl/mod.rs                  | 102 +++++++++++---
 zellij-utils/src/plugin_api/style.rs         |  74 ++++++++--
 10 files changed, 308 insertions(+), 87 deletions(-)

diff --git a/zellij-client/src/lib.rs b/zellij-client/src/lib.rs
index ce2322d02c..e1c6eccbcc 100644
--- a/zellij-client/src/lib.rs
+++ b/zellij-client/src/lib.rs
@@ -206,16 +206,16 @@ pub fn start_client(
     envs::set_zellij("0".to_string());
     config.env.set_vars();
 
-    let palette = config
+    let (palette, styling) = config
         .theme_config(&config_options)
-        .unwrap_or_else(|| os_input.load_palette());
+        .unwrap_or_else(|| (os_input.load_palette(), Default::default()));
 
     let full_screen_ws = os_input.get_terminal_size_using_fd(0);
     let client_attributes = ClientAttributes {
         size: full_screen_ws,
         style: Style {
             colors: palette,
-            styling: palette.into(),
+            styling: styling,
             rounded_corners: config.ui.pane_frames.rounded_corners,
             hide_session_name: config.ui.pane_frames.hide_session_name,
         },
diff --git a/zellij-server/src/ui/components/mod.rs b/zellij-server/src/ui/components/mod.rs
index 8fcfcc143f..02cbdc02cf 100644
--- a/zellij-server/src/ui/components/mod.rs
+++ b/zellij-server/src/ui/components/mod.rs
@@ -87,7 +87,7 @@ impl<'a> UiComponentParser<'a> {
                 columns,
                 rows,
                 stringified_params,
-                Some(self.style.colors.green),
+                Some(self.style.styling.table_title[0]),
                 &self.style,
                 component_coordinates,
             );
diff --git a/zellij-server/src/ui/components/ribbon.rs b/zellij-server/src/ui/components/ribbon.rs
index 7f0f781592..283f69934c 100644
--- a/zellij-server/src/ui/components/ribbon.rs
+++ b/zellij-server/src/ui/components/ribbon.rs
@@ -11,18 +11,18 @@ pub fn ribbon(
     arrow_fonts: bool,
     component_coordinates: Option<Coordinates>,
 ) -> Vec<u8> {
-    let colors = style.colors;
+    let colors = style.styling;
     let (first_arrow_styles, text_style, last_arrow_styles) = if content.selected {
         (
-            character_style(colors.black, colors.green),
-            character_style(colors.black, colors.green),
-            character_style(colors.green, colors.black),
+            character_style(colors.ribbon_selected[0], colors.ribbon_selected[5]),
+            character_style(colors.ribbon_selected[0], colors.ribbon_selected[5]),
+            character_style(colors.ribbon_selected[5], colors.ribbon_selected[0]),
         )
     } else {
         (
-            character_style(colors.black, colors.fg),
-            character_style(colors.black, colors.fg),
-            character_style(colors.fg, colors.black),
+            character_style(colors.ribbon_unselected[5], colors.ribbon_unselected[0]),
+            character_style(colors.ribbon_unselected[5], colors.ribbon_unselected[0]),
+            character_style(colors.ribbon_unselected[0], colors.ribbon_unselected[5]),
         )
     };
     let (text, _text_width) =
@@ -47,19 +47,19 @@ pub fn ribbon(
 
 pub fn emphasis_variants_for_ribbon(style: &Style) -> [PaletteColor; 4] {
     [
-        style.colors.red,
-        style.colors.white,
-        style.colors.blue,
-        style.colors.magenta,
+        style.styling.ribbon_unselected[1],
+        style.styling.ribbon_unselected[2],
+        style.styling.ribbon_unselected[3],
+        style.styling.ribbon_unselected[4],
     ]
 }
 
 pub fn emphasis_variants_for_selected_ribbon(style: &Style) -> [PaletteColor; 4] {
     [
-        style.colors.red,
-        style.colors.orange,
-        style.colors.magenta,
-        style.colors.blue,
+        style.styling.ribbon_selected[1],
+        style.styling.ribbon_selected[2],
+        style.styling.ribbon_selected[3],
+        style.styling.ribbon_selected[4],
     ]
 }
 
diff --git a/zellij-server/src/ui/components/table.rs b/zellij-server/src/ui/components/table.rs
index 4842f93e74..15847c579d 100644
--- a/zellij-server/src/ui/components/table.rs
+++ b/zellij-server/src/ui/components/table.rs
@@ -21,7 +21,10 @@ pub fn table(
     let title_styles = RESET_STYLES
         .foreground(title_color.map(|t| t.into()))
         .bold(Some(AnsiCode::On));
-    let cell_styles = RESET_STYLES.bold(Some(AnsiCode::On));
+    let cell_styles = RESET_STYLES
+        .bold(Some(AnsiCode::On))
+        .background(Some(style.styling.table_cell_unselected[5].into()))
+        .foreground(Some(style.styling.table_cell_unselected[0].into()));
     for (row_index, (_, row)) in stringified_rows.into_iter().enumerate() {
         let is_title_row = row_index == 0;
         if is_too_high(row_index + 1, &coordinates) {
@@ -36,7 +39,8 @@ pub fn table(
             };
             if cell.selected {
                 reset_styles_for_item.background = None;
-                text_style = text_style.background(Some(style.colors.bg.into()));
+                text_style =
+                    text_style.background(Some(style.styling.table_cell_selected[5].into()));
             }
             // here we intentionally don't pass our coordinates even if we have them, because
             // these cells have already been padded and truncated
diff --git a/zellij-server/src/ui/components/text.rs b/zellij-server/src/ui/components/text.rs
index cb94eebe02..365eafb7b0 100644
--- a/zellij-server/src/ui/components/text.rs
+++ b/zellij-server/src/ui/components/text.rs
@@ -12,9 +12,14 @@ use unicode_width::UnicodeWidthChar;
 use zellij_utils::errors::prelude::*;
 
 pub fn text(content: Text, style: &Style, component_coordinates: Option<Coordinates>) -> Vec<u8> {
-    let mut text_style = RESET_STYLES.bold(Some(AnsiCode::On));
+    let mut text_style = RESET_STYLES
+        .bold(Some(AnsiCode::On))
+        .background(Some(style.styling.text_unselected[5].into()))
+        .foreground(Some(style.styling.text_unselected[0].into()));
     if content.selected {
-        text_style = text_style.background(Some(style.colors.bg.into()));
+        text_style = text_style
+            .background(Some(style.styling.text_selected[5].into()))
+            .foreground(Some(style.styling.text_selected[0].into()));
     }
     let (text, _text_width) =
         stringify_text(&content, None, &component_coordinates, style, text_style);
@@ -72,10 +77,10 @@ pub fn color_index_character(
 
 pub fn emphasis_variants(style: &Style) -> [PaletteColor; 4] {
     [
-        style.colors.orange,
-        style.colors.cyan,
-        style.colors.green,
-        style.colors.magenta,
+        style.styling.text_unselected[1],
+        style.styling.text_unselected[2],
+        style.styling.text_unselected[3],
+        style.styling.text_unselected[4],
     ]
 }
 
diff --git a/zellij-server/src/ui/pane_contents_and_ui.rs b/zellij-server/src/ui/pane_contents_and_ui.rs
index 72f0b80499..6ff0e920b7 100644
--- a/zellij-server/src/ui/pane_contents_and_ui.rs
+++ b/zellij-server/src/ui/pane_contents_and_ui.rs
@@ -259,8 +259,7 @@ impl<'a> PaneContentsAndUi<'a> {
             match mode {
                 InputMode::Normal | InputMode::Locked => {
                     if session_is_mirrored || !self.multiple_users_exist_in_session {
-                        let colors = single_client_color(self.style.colors); // mirrored sessions only have one focused color
-                        Some(colors.0)
+                        Some(self.style.styling.frame_selected[0])
                     } else {
                         let colors = client_id_to_colors(client_id, self.style.colors);
                         colors.map(|colors| colors.0)
diff --git a/zellij-utils/src/data.rs b/zellij-utils/src/data.rs
index eac08f79cf..75e1643641 100644
--- a/zellij-utils/src/data.rs
+++ b/zellij-utils/src/data.rs
@@ -2,6 +2,7 @@ use crate::input::actions::Action;
 use crate::input::config::ConversionError;
 use crate::input::keybinds::Keybinds;
 use crate::input::layout::SplitSize;
+use crate::shared::default_palette;
 use clap::ArgEnum;
 use serde::{Deserialize, Serialize};
 use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};
@@ -1152,17 +1153,17 @@ pub struct Styling {
     pub exit_code_error: [PaletteColor; 5],
 }
 
-impl From<Palette> for Styling {
-    fn from(_value: Palette) -> Self {
-        // TODO: Implement mapping of old colors -> styling
-        todo!()
-    }
+#[derive(Debug, Copy, Default, Clone, PartialEq, Eq, Hash, Deserialize, Serialize)]
+pub struct StyleDeclaration {
+    pub base: PaletteColor,
+    pub emphasis: [PaletteColor; 4],
+    pub background: Option<PaletteColor>,
 }
 
 impl From<Styling> for Palette {
     // TODO: Implement mapping of old colors -> styling
     fn from(_value: Styling) -> Self {
-        todo!()
+        default_palette()
     }
 }
 
diff --git a/zellij-utils/src/input/config.rs b/zellij-utils/src/input/config.rs
index 91f887d8e5..6ee285fb57 100644
--- a/zellij-utils/src/input/config.rs
+++ b/zellij-utils/src/input/config.rs
@@ -1,4 +1,4 @@
-use crate::data::Palette;
+use crate::data::{Palette, Styling};
 use miette::{Diagnostic, LabeledSpan, NamedSource, SourceCode};
 use std::fs::File;
 use std::io::{self, Read};
@@ -162,10 +162,16 @@ impl TryFrom<&CliArgs> for Config {
 }
 
 impl Config {
-    pub fn theme_config(&self, opts: &Options) -> Option<Palette> {
+    pub fn theme_config(&self, opts: &Options) -> Option<(Palette, Styling)> {
         match &opts.theme {
-            Some(theme_name) => self.themes.get_theme(theme_name).map(|theme| theme.palette),
-            None => self.themes.get_theme("default").map(|theme| theme.palette),
+            Some(theme_name) => self
+                .themes
+                .get_theme(theme_name)
+                .map(|theme| (theme.palette, theme.styling)),
+            None => self
+                .themes
+                .get_theme("default")
+                .map(|theme| (theme.palette, theme.styling)),
         }
     }
     /// Gets default configuration from assets
@@ -599,20 +605,106 @@ mod config_test {
             themes {
                 named_theme {
                     styling {
-                        //                      base      emp1      emp2      emp3      emp4      bg
-                        text_unselected       "#DCD7BA" "#DCD7CD" "#DCD8DD" "#DCD899" "#ACD7CD" "#1F1F28"
-                        text_selected         "#16161D" "#16161D" "#16161D" "#16161D" "#16161D" "#9CABCA"
-                        ribbon_unselected     "#DCD7BA" "#7FB4CA" "#A3D4D5" "#7AA89F" "#DCD819" "#252535"
-                        ribbon_selected       "#16161D" "#181820" "#1A1A22" "#2A2A37" "#363646" "#76946A"
-                        table_title           "#DCD7BA" "#7FB4CA" "#A3D4D5" "#7AA89F" "#DCD819" "#252535"
-                        table_cell_unselected "#DCD7BA" "#DCD7CD" "#DCD8DD" "#DCD899" "#ACD7CD" "#1F1F28"
-                        table_cell_selected   "#16161D" "#181820" "#1A1A22" "#2A2A37" "#363646" "#76946A"
-                        list_unselected       "#DCD7BA" "#DCD7CD" "#DCD8DD" "#DCD899" "#ACD7CD" "#1F1F28"
-                        list_selected         "#16161D" "#181820" "#1A1A22" "#2A2A37" "#363646" "#76946A"
-                        frame_unselected      "#DCD8DD" "#7FB4CA" "#A3D4D5" "#7AA89F" "#DCD819"
-                        frame_selected        "#76946A" "#C34043" "#C8C093" "#ACD7CD" "#DCD819"
-                        exit_code_success     "#76946A" "#76946A" "#76946A" "#76946A" "#76946A"
-                        exit_code_error       "#C34043" "#C34043" "#C34043" "#C34043" "#C34043"
+                        text_unselected {
+                            base "#DCD7BA"
+                            emp1 "#DCD7CD"
+                            emp2 "#DCD8DD"
+                            emp3 "#DCD899"
+                            emp4 "#ACD7CD"
+                            bg   "#1F1F28"
+                        }
+                        text_selected {
+                            base "#16161D"
+                            emp1 "#16161D"
+                            emp2 "#16161D"
+                            emp3 "#16161D"
+                            emp4 "#16161D"
+                            bg   "#9CABCA"
+                        }
+                        ribbon_unselected {
+                            base "#DCD7BA"
+                            emp1 "#7FB4CA"
+                            emp2 "#A3D4D5"
+                            emp3 "#7AA89F"
+                            emp4 "#DCD819"
+                            bg   "#252535"
+                        }
+                        ribbon_selected {
+                            base "#16161D"
+                            emp1 "#181820"
+                            emp2 "#1A1A22"
+                            emp3 "#2A2A37"
+                            emp4 "#363646"
+                            bg   "#76946A"
+                        }
+                        table_title {
+                            base "#DCD7BA"
+                            emp1 "#7FB4CA"
+                            emp2 "#A3D4D5"
+                            emp3 "#7AA89F"
+                            emp4 "#DCD819"
+                            bg   "#252535"
+                        }
+                        table_cell_unselected {
+                            base "#DCD7BA"
+                            emp1 "#DCD7CD"
+                            emp2 "#DCD8DD"
+                            emp3 "#DCD899"
+                            emp4 "#ACD7CD"
+                            bg   "#1F1F28"
+                        }
+                        table_cell_selected {
+                            base "#16161D"
+                            emp1 "#181820"
+                            emp2 "#1A1A22"
+                            emp3 "#2A2A37"
+                            emp4 "#363646"
+                            bg   "#76946A"
+                        }
+                        list_unselected {
+                            base "#DCD7BA"
+                            emp1 "#DCD7CD"
+                            emp2 "#DCD8DD"
+                            emp3 "#DCD899"
+                            emp4 "#ACD7CD"
+                            bg   "#1F1F28"
+                        }
+                        list_selected {
+                            base "#16161D"
+                            emp1 "#181820"
+                            emp2 "#1A1A22"
+                            emp3 "#2A2A37"
+                            emp4 "#363646"
+                            bg   "#76946A"
+                        }
+                        frame_unselected {
+                            base "#DCD8DD"
+                            emp1 "#7FB4CA"
+                            emp2 "#A3D4D5"
+                            emp3 "#7AA89F"
+                            emp4 "#DCD819"
+                        }
+                        frame_selected {
+                            base "#76946A"
+                            emp1 "#C34043"
+                            emp2 "#C8C093"
+                            emp3 "#ACD7CD"
+                            emp4 "#DCD819"
+                        }
+                        exit_code_success {
+                            base "#76946A"
+                            emp1 "#76946A"
+                            emp2 "#76946A"
+                            emp3 "#76946A"
+                            emp4 "#76946A"
+                        }
+                        exit_code_error {
+                            base "#C34043"
+                            emp1 "#C34043"
+                            emp2 "#C34043"
+                            emp3 "#C34043"
+                            emp4 "#C34043"
+                        }
                     }
                 }
             }
@@ -690,11 +782,11 @@ mod config_test {
                     ],
                     list_selected: [
                         PaletteColor::Rgb((22, 22, 29)),
-                        PaletteColor::Rgb((22, 22, 29)),
-                        PaletteColor::Rgb((22, 22, 29)),
-                        PaletteColor::Rgb((22, 22, 29)),
-                        PaletteColor::Rgb((22, 22, 29)),
-                        PaletteColor::Rgb((156, 171, 202)),
+                        PaletteColor::Rgb((24, 24, 32)),
+                        PaletteColor::Rgb((26, 26, 34)),
+                        PaletteColor::Rgb((42, 42, 55)),
+                        PaletteColor::Rgb((54, 54, 70)),
+                        PaletteColor::Rgb((118, 148, 106)),
                     ],
                     frame_unselected: [
                         PaletteColor::Rgb((220, 216, 221)),
@@ -708,7 +800,7 @@ mod config_test {
                         PaletteColor::Rgb((195, 64, 67)),
                         PaletteColor::Rgb((200, 192, 147)),
                         PaletteColor::Rgb((172, 215, 205)),
-                        PaletteColor::Rgb((220, 216, 125)),
+                        PaletteColor::Rgb((220, 216, 25)),
                     ],
                     exit_code_success: [
                         PaletteColor::Rgb((118, 148, 106)),
diff --git a/zellij-utils/src/kdl/mod.rs b/zellij-utils/src/kdl/mod.rs
index 9baff92a4e..10ea48b908 100644
--- a/zellij-utils/src/kdl/mod.rs
+++ b/zellij-utils/src/kdl/mod.rs
@@ -12,6 +12,7 @@ use crate::input::options::{Clipboard, OnForceClose, Options};
 use crate::input::permission::{GrantedPermission, PermissionCache};
 use crate::input::plugins::PluginAliases;
 use crate::input::theme::{FrameConfig, Theme, Themes, UiConfig};
+use crate::shared::colors;
 use kdl_layout_parser::KdlLayoutParser;
 use std::collections::{BTreeMap, HashMap, HashSet};
 use strum::IntoEnumIterator;
@@ -1429,6 +1430,20 @@ macro_rules! kdl_child_with_name {
     }};
 }
 
+#[macro_export]
+macro_rules! kdl_child_with_name_or_error {
+    ( $kdl_node:expr, $name:expr) => {{
+        $kdl_node
+            .children()
+            .and_then(|children| children.nodes().iter().find(|c| c.name().value() == $name))
+            .ok_or(ConfigError::new_kdl_error(
+                format!("Missing node {}", $name).into(),
+                $kdl_node.span().offset(),
+                $kdl_node.span().len(),
+            ))
+    }};
+}
+
 #[macro_export]
 macro_rules! kdl_get_string_property_or_child_value_with_error {
     ( $kdl_node:expr, $name:expr ) => {
@@ -1976,6 +1991,42 @@ impl UiConfig {
 }
 
 impl Themes {
+    fn color_from_node(
+        style_node: &KdlNode,
+        style_descriptor: &str,
+    ) -> Result<[PaletteColor; 6], ConfigError> {
+        let colors = kdl_children_or_error!(
+            kdl_child_with_name_or_error!(style_node, style_descriptor)?,
+            "foo"
+        );
+        Ok([
+            PaletteColor::try_from(("base", colors))?,
+            PaletteColor::try_from(("emp1", colors))?,
+            PaletteColor::try_from(("emp2", colors))?,
+            PaletteColor::try_from(("emp3", colors))?,
+            PaletteColor::try_from(("emp4", colors))?,
+            PaletteColor::try_from(("bg", colors))?,
+        ])
+    }
+
+    // TODO: const generics etc?
+    fn color_from_node_2(
+        style_node: &KdlNode,
+        style_descriptor: &str,
+    ) -> Result<[PaletteColor; 5], ConfigError> {
+        let colors = kdl_children_or_error!(
+            kdl_child_with_name_or_error!(style_node, style_descriptor)?,
+            "foo"
+        );
+        Ok([
+            PaletteColor::try_from(("base", colors))?,
+            PaletteColor::try_from(("emp1", colors))?,
+            PaletteColor::try_from(("emp2", colors))?,
+            PaletteColor::try_from(("emp3", colors))?,
+            PaletteColor::try_from(("emp4", colors))?,
+        ])
+    }
+
     pub fn from_kdl(themes_from_kdl: &KdlNode) -> Result<Self, ConfigError> {
         let mut themes: HashMap<String, Theme> = HashMap::new();
         for theme_config in kdl_children_nodes_or_error!(themes_from_kdl, "no themes found") {
@@ -2002,26 +2053,28 @@ impl Themes {
                 // Newer theme definition with named styles
                 Some(style) => {
                     let s = Styling {
-                        text_unselected: todo!(),
-                        text_selected: todo!(),
-                        ribbon_unselected: todo!(),
-                        ribbon_selected: todo!(),
-                        table_title: todo!(),
-                        table_cell_unselected: todo!(),
-                        table_cell_selected: todo!(),
-                        list_unselected: todo!(),
-                        list_selected: todo!(),
-                        frame_unselected: todo!(),
-                        frame_selected: todo!(),
-                        exit_code_success: todo!(),
-                        exit_code_error: todo!(),
+                        text_unselected: Themes::color_from_node(style, "text_unselected")?,
+                        text_selected: Themes::color_from_node(style, "text_selected")?,
+                        ribbon_unselected: Themes::color_from_node(style, "ribbon_unselected")?,
+                        ribbon_selected: Themes::color_from_node(style, "ribbon_selected")?,
+                        table_title: Themes::color_from_node(style, "table_title")?,
+                        table_cell_unselected: Themes::color_from_node(
+                            style,
+                            "table_cell_unselected",
+                        )?,
+                        table_cell_selected: Themes::color_from_node(style, "table_cell_selected")?,
+                        list_unselected: Themes::color_from_node(style, "list_unselected")?,
+                        list_selected: Themes::color_from_node(style, "list_selected")?,
+                        frame_unselected: Themes::color_from_node_2(style, "frame_unselected")?,
+                        frame_selected: Themes::color_from_node_2(style, "frame_selected")?,
+                        exit_code_success: Themes::color_from_node_2(style, "exit_code_success")?,
+                        exit_code_error: Themes::color_from_node_2(style, "exit_code_error")?,
                     };
 
-                    let t = Theme {
-                        palette: Default::default(),
-                        styling: Default::default(),
-                    };
-                    t
+                    Theme {
+                        palette: s.into(),
+                        styling: s,
+                    }
                 },
                 // Older palette based theme definition
                 None => {
@@ -2041,7 +2094,18 @@ impl Themes {
                     };
                     Theme {
                         palette,
-                        styling: palette.into(),
+                        // TODO: inverse palette -> styling
+                        styling: Styling {
+                            ribbon_unselected: [
+                                PaletteColor::EightBit(colors::BLUE),
+                                PaletteColor::EightBit(colors::BLUE),
+                                PaletteColor::EightBit(colors::BLUE),
+                                PaletteColor::EightBit(colors::BLUE),
+                                PaletteColor::EightBit(colors::BLUE),
+                                PaletteColor::EightBit(colors::BLUE),
+                            ],
+                            ..Default::default()
+                        },
                     }
                 },
             };
diff --git a/zellij-utils/src/plugin_api/style.rs b/zellij-utils/src/plugin_api/style.rs
index 795a026948..f05e7a8f0a 100644
--- a/zellij-utils/src/plugin_api/style.rs
+++ b/zellij-utils/src/plugin_api/style.rs
@@ -11,15 +11,13 @@ use std::convert::TryFrom;
 impl TryFrom<ProtobufStyle> for Style {
     type Error = &'static str;
     fn try_from(protobuf_style: ProtobufStyle) -> Result<Self, &'static str> {
+        let s = protobuf_style.styling.ok_or("malformed")?.try_into()?;
         Ok(Style {
             colors: protobuf_style
                 .palette
                 .ok_or("malformed style payload")?
                 .try_into()?,
-            styling: protobuf_style
-                .styling
-                .ok_or("malformed style payload")?
-                .try_into()?,
+            styling: s,
             rounded_corners: protobuf_style.rounded_corners,
             hide_session_name: protobuf_style.hide_session_name,
         })
@@ -29,28 +27,86 @@ impl TryFrom<ProtobufStyle> for Style {
 impl TryFrom<Style> for ProtobufStyle {
     type Error = &'static str;
     fn try_from(style: Style) -> Result<Self, &'static str> {
+        log::info!("{:?}", style.styling.ribbon_unselected);
+        let s = ProtobufStyling::try_from(style.styling)?;
+        log::info!("{:?}", s.ribbon_unselected);
         Ok(ProtobufStyle {
             palette: Some(style.colors.try_into()?),
             rounded_corners: style.rounded_corners,
             hide_session_name: style.hide_session_name,
-            styling: Some(style.styling.try_into()?),
+            styling: Some(s),
         })
     }
 }
 
+fn to_array<T, const N: usize>(v: Vec<T>) -> std::result::Result<[T; N], &'static str> {
+    v.try_into().map_err(|_| "darn")
+}
+
+#[macro_export]
+macro_rules! color_definitions {
+    ($proto:expr, $declaration:ident, $size:expr) => {
+        to_array::<PaletteColor, $size>(
+            $proto
+                .$declaration
+                .into_iter()
+                .map(PaletteColor::try_from)
+                .collect::<Result<Vec<PaletteColor>, _>>()?,
+        )?
+    };
+}
+
 impl TryFrom<ProtobufStyling> for Styling {
     type Error = &'static str;
 
-    fn try_from(_value: ProtobufStyling) -> std::result::Result<Self, Self::Error> {
-        todo!()
+    fn try_from(proto: ProtobufStyling) -> std::result::Result<Self, Self::Error> {
+        log::info!("{:?}", proto);
+        Ok(Styling {
+            text_unselected: color_definitions!(proto, text_unselected, 6),
+            text_selected: color_definitions!(proto, text_selected, 6),
+            ribbon_unselected: color_definitions!(proto, ribbon_unselected, 6),
+            ribbon_selected: color_definitions!(proto, ribbon_selected, 6),
+            table_title: color_definitions!(proto, table_title, 6),
+            table_cell_unselected: color_definitions!(proto, table_cell_unselected, 6),
+            table_cell_selected: color_definitions!(proto, table_cell_selected, 6),
+            list_unselected: color_definitions!(proto, list_unselected, 6),
+            list_selected: color_definitions!(proto, list_selected, 6),
+            frame_unselected: color_definitions!(proto, frame_unselected, 5),
+            frame_selected: color_definitions!(proto, frame_selected, 5),
+            exit_code_success: color_definitions!(proto, exit_code_success, 5),
+            exit_code_error: color_definitions!(proto, exit_code_error, 5),
+        })
     }
 }
 
+fn color_protos<const N: usize>(
+    colors: [PaletteColor; N],
+) -> Result<Vec<ProtobufColor>, &'static str> {
+    colors
+        .into_iter()
+        .map(ProtobufColor::try_from)
+        .collect::<Result<Vec<ProtobufColor>, _>>()
+}
+
 impl TryFrom<Styling> for ProtobufStyling {
     type Error = &'static str;
 
-    fn try_from(_value: Styling) -> std::result::Result<Self, Self::Error> {
-        todo!()
+    fn try_from(style: Styling) -> std::result::Result<Self, Self::Error> {
+        Ok(ProtobufStyling {
+            text_unselected: color_protos(style.text_unselected)?,
+            text_selected: color_protos(style.text_selected)?,
+            ribbon_unselected: color_protos(style.ribbon_unselected)?,
+            ribbon_selected: color_protos(style.ribbon_selected)?,
+            table_title: color_protos(style.table_title)?,
+            table_cell_unselected: color_protos(style.table_cell_unselected)?,
+            table_cell_selected: color_protos(style.table_cell_selected)?,
+            list_unselected: color_protos(style.list_unselected)?,
+            list_selected: color_protos(style.list_selected)?,
+            frame_unselected: color_protos(style.frame_unselected)?,
+            frame_selected: color_protos(style.frame_selected)?,
+            exit_code_success: color_protos(style.exit_code_success)?,
+            exit_code_error: color_protos(style.exit_code_error)?,
+        })
     }
 }
 

From 17c522ad2eeff9f8b0272e3e1a50ad7d3da1d843 Mon Sep 17 00:00:00 2001
From: Mark Grey <mgthesecond@spotify.com>
Date: Mon, 26 Feb 2024 22:47:59 -0500
Subject: [PATCH 04/40] provisional styling of status bar component

---
 default-plugins/status-bar/src/first_line.rs |   4 +-
 default-plugins/status-bar/src/main.rs       | 147 +++++++------------
 zellij-server/src/ui/components/ribbon.rs    |   4 +-
 3 files changed, 58 insertions(+), 97 deletions(-)

diff --git a/default-plugins/status-bar/src/first_line.rs b/default-plugins/status-bar/src/first_line.rs
index ee9b9478d4..c1b21da2ca 100644
--- a/default-plugins/status-bar/src/first_line.rs
+++ b/default-plugins/status-bar/src/first_line.rs
@@ -612,7 +612,7 @@ pub fn first_line(
     separator: &str,
 ) -> LinePart {
     let supports_arrow_fonts = !help.capabilities.arrow_fonts;
-    let colored_elements = color_elements(help.style.colors, !supports_arrow_fonts);
+    let colored_elements = color_elements(help.style.styling, !supports_arrow_fonts);
     let binds = &help.get_mode_keybinds();
     // Unselect all by default
     let mut default_keys = vec![
@@ -731,7 +731,7 @@ mod tests {
     use super::*;
 
     fn colored_elements() -> ColoredElements {
-        let palette = Palette::default();
+        let palette = Styling::default();
         color_elements(palette, false)
     }
 
diff --git a/default-plugins/status-bar/src/main.rs b/default-plugins/status-bar/src/main.rs
index 7db9b09d97..3dc9d249db 100644
--- a/default-plugins/status-bar/src/main.rs
+++ b/default-plugins/status-bar/src/main.rs
@@ -87,96 +87,61 @@ pub struct SegmentStyle {
 // we need different colors from palette for the default theme
 // plus here we can add new sources in the future, like Theme
 // that can be defined in the config perhaps
-fn color_elements(palette: Palette, different_color_alternates: bool) -> ColoredElements {
-    let background = match palette.theme_hue {
-        ThemeHue::Dark => palette.black,
-        ThemeHue::Light => palette.white,
-    };
-    let foreground = match palette.theme_hue {
-        ThemeHue::Dark => palette.white,
-        ThemeHue::Light => palette.black,
-    };
-    let alternate_background_color = if different_color_alternates {
-        match palette.theme_hue {
-            ThemeHue::Dark => palette.white,
-            ThemeHue::Light => palette.black,
-        }
-    } else {
-        palette.fg
-    };
-    match palette.source {
-        PaletteSource::Default => ColoredElements {
-            selected: SegmentStyle {
-                prefix_separator: style!(background, palette.green),
-                char_left_separator: style!(background, palette.green).bold(),
-                char_shortcut: style!(palette.red, palette.green).bold(),
-                char_right_separator: style!(background, palette.green).bold(),
-                styled_text: style!(background, palette.green).bold(),
-                suffix_separator: style!(palette.green, background).bold(),
-            },
-            unselected: SegmentStyle {
-                prefix_separator: style!(background, palette.fg),
-                char_left_separator: style!(background, palette.fg).bold(),
-                char_shortcut: style!(palette.red, palette.fg).bold(),
-                char_right_separator: style!(background, palette.fg).bold(),
-                styled_text: style!(background, palette.fg).bold(),
-                suffix_separator: style!(palette.fg, background),
-            },
-            unselected_alternate: SegmentStyle {
-                prefix_separator: style!(background, alternate_background_color),
-                char_left_separator: style!(background, alternate_background_color).bold(),
-                char_shortcut: style!(palette.red, alternate_background_color).bold(),
-                char_right_separator: style!(background, alternate_background_color).bold(),
-                styled_text: style!(background, alternate_background_color).bold(),
-                suffix_separator: style!(alternate_background_color, background),
-            },
-            disabled: SegmentStyle {
-                prefix_separator: style!(background, palette.fg),
-                char_left_separator: style!(background, palette.fg).dimmed().italic(),
-                char_shortcut: style!(background, palette.fg).dimmed().italic(),
-                char_right_separator: style!(background, palette.fg).dimmed().italic(),
-                styled_text: style!(background, palette.fg).dimmed().italic(),
-                suffix_separator: style!(palette.fg, background),
-            },
-            superkey_prefix: style!(foreground, background).bold(),
-            superkey_suffix_separator: style!(background, background),
+fn color_elements(palette: Styling, different_color_alternates: bool) -> ColoredElements {
+    let background = palette.text_unselected[5];
+    let foreground = palette.text_unselected[0];
+    let alternate_background_color = palette.text_unselected[5];
+    ColoredElements {
+        selected: SegmentStyle {
+            prefix_separator: style!(background, palette.ribbon_selected[0]),
+            char_left_separator: style!(palette.ribbon_selected[0], palette.ribbon_selected[5])
+                .bold(),
+            char_shortcut: style!(palette.ribbon_selected[1], palette.ribbon_selected[5]).bold(),
+            char_right_separator: style!(palette.ribbon_selected[0], palette.ribbon_selected[5])
+                .bold(),
+            styled_text: style!(palette.ribbon_selected[0], palette.ribbon_selected[5]).bold(),
+            suffix_separator: style!(palette.ribbon_selected[5], palette.ribbon_selected[0]).bold(),
         },
-        PaletteSource::Xresources => ColoredElements {
-            selected: SegmentStyle {
-                prefix_separator: style!(background, palette.green),
-                char_left_separator: style!(palette.fg, palette.green).bold(),
-                char_shortcut: style!(palette.red, palette.green).bold(),
-                char_right_separator: style!(palette.fg, palette.green).bold(),
-                styled_text: style!(background, palette.green).bold(),
-                suffix_separator: style!(palette.green, background).bold(),
-            },
-            unselected: SegmentStyle {
-                prefix_separator: style!(background, palette.fg),
-                char_left_separator: style!(background, palette.fg).bold(),
-                char_shortcut: style!(palette.red, palette.fg).bold(),
-                char_right_separator: style!(background, palette.fg).bold(),
-                styled_text: style!(background, palette.fg).bold(),
-                suffix_separator: style!(palette.fg, background),
-            },
-            unselected_alternate: SegmentStyle {
-                prefix_separator: style!(background, alternate_background_color),
-                char_left_separator: style!(background, alternate_background_color).bold(),
-                char_shortcut: style!(palette.red, alternate_background_color).bold(),
-                char_right_separator: style!(background, alternate_background_color).bold(),
-                styled_text: style!(background, alternate_background_color).bold(),
-                suffix_separator: style!(alternate_background_color, background),
-            },
-            disabled: SegmentStyle {
-                prefix_separator: style!(background, palette.fg),
-                char_left_separator: style!(background, palette.fg).dimmed(),
-                char_shortcut: style!(background, palette.fg).dimmed(),
-                char_right_separator: style!(background, palette.fg).dimmed(),
-                styled_text: style!(background, palette.fg).dimmed(),
-                suffix_separator: style!(palette.fg, background),
-            },
-            superkey_prefix: style!(background, palette.fg).bold(),
-            superkey_suffix_separator: style!(palette.fg, background),
+        unselected: SegmentStyle {
+            prefix_separator: style!(palette.ribbon_unselected[0], palette.ribbon_unselected[5]),
+            char_left_separator: style!(palette.ribbon_unselected[0], palette.ribbon_unselected[5])
+                .bold(),
+            char_shortcut: style!(palette.ribbon_unselected[2], palette.ribbon_unselected[5])
+                .bold(),
+            char_right_separator: style!(
+                palette.ribbon_unselected[0],
+                palette.ribbon_unselected[5]
+            )
+            .bold(),
+            styled_text: style!(palette.ribbon_unselected[0], palette.ribbon_unselected[5]).bold(),
+            suffix_separator: style!(palette.ribbon_unselected[5], palette.ribbon_selected[0])
+                .bold(),
         },
+        unselected_alternate: SegmentStyle {
+            prefix_separator: style!(palette.ribbon_unselected[0], palette.ribbon_unselected[5]),
+            char_left_separator: style!(palette.ribbon_unselected[0], palette.ribbon_unselected[5])
+                .bold(),
+            char_shortcut: style!(palette.ribbon_unselected[1], palette.ribbon_unselected[5])
+                .bold(),
+            char_right_separator: style!(
+                palette.ribbon_unselected[0],
+                palette.ribbon_unselected[5]
+            )
+            .bold(),
+            styled_text: style!(palette.ribbon_unselected[0], palette.ribbon_unselected[5]).bold(),
+            suffix_separator: style!(palette.ribbon_unselected[5], palette.ribbon_selected[0])
+                .bold(),
+        },
+        disabled: SegmentStyle {
+            prefix_separator: style!(background, foreground),
+            char_left_separator: style!(background, foreground).dimmed().italic(),
+            char_shortcut: style!(background, foreground).dimmed().italic(),
+            char_right_separator: style!(background, foreground).dimmed().italic(),
+            styled_text: style!(background, foreground).dimmed().italic(),
+            suffix_separator: style!(foreground, background),
+        },
+        superkey_prefix: style!(foreground, background).bold(),
+        superkey_suffix_separator: style!(background, background),
     }
 }
 
@@ -272,11 +237,7 @@ impl ZellijPlugin for State {
         let first_line = first_line(&self.mode_info, active_tab, cols, separator);
         let second_line = self.second_line(cols);
 
-        let background = match self.mode_info.style.colors.theme_hue {
-            ThemeHue::Dark => self.mode_info.style.colors.black,
-            ThemeHue::Light => self.mode_info.style.colors.white,
-        };
-
+        let background = self.mode_info.style.styling.text_unselected[5];
         // [48;5;238m is white background, [0K is so that it fills the rest of the line
         // [m is background reset, [0K is so that it clears the rest of the line
         match background {
diff --git a/zellij-server/src/ui/components/ribbon.rs b/zellij-server/src/ui/components/ribbon.rs
index 283f69934c..640b54a8b8 100644
--- a/zellij-server/src/ui/components/ribbon.rs
+++ b/zellij-server/src/ui/components/ribbon.rs
@@ -20,9 +20,9 @@ pub fn ribbon(
         )
     } else {
         (
-            character_style(colors.ribbon_unselected[5], colors.ribbon_unselected[0]),
-            character_style(colors.ribbon_unselected[5], colors.ribbon_unselected[0]),
             character_style(colors.ribbon_unselected[0], colors.ribbon_unselected[5]),
+            character_style(colors.ribbon_unselected[0], colors.ribbon_unselected[5]),
+            character_style(colors.ribbon_unselected[5], colors.ribbon_unselected[0]),
         )
     };
     let (text, _text_width) =

From 127bd5ea784a5299688bfba1d3e19ba03503ee74 Mon Sep 17 00:00:00 2001
From: Mark Grey <mgthesecond@spotify.com>
Date: Fri, 29 Mar 2024 14:28:59 -0400
Subject: [PATCH 05/40] status bar tips

---
 default-plugins/status-bar/src/first_line.rs  |  7 +-
 default-plugins/status-bar/src/main.rs        | 48 +++++------
 default-plugins/status-bar/src/second_line.rs | 86 ++++++++-----------
 .../status-bar/src/tip/data/compact_layout.rs | 10 +--
 .../src/tip/data/edit_scrollbuffer.rs         | 10 +--
 .../src/tip/data/floating_panes_mouse.rs      |  4 +-
 .../tip/data/move_focus_hjkl_tab_switch.rs    |  4 +-
 .../status-bar/src/tip/data/quicknav.rs       |  8 +-
 .../status-bar/src/tip/data/sync_tab.rs       |  4 +-
 9 files changed, 82 insertions(+), 99 deletions(-)

diff --git a/default-plugins/status-bar/src/first_line.rs b/default-plugins/status-bar/src/first_line.rs
index c1b21da2ca..718eec1761 100644
--- a/default-plugins/status-bar/src/first_line.rs
+++ b/default-plugins/status-bar/src/first_line.rs
@@ -351,8 +351,11 @@ fn swap_layout_keycode(mode_info: &ModeInfo, palette: &Palette) -> LinePart {
         &mode_keybinds,
         &[&[Action::PreviousSwapLayout], &[Action::NextSwapLayout]],
     );
-    let prev_next_keys_indicator =
-        style_key_with_modifier(&prev_next_keys, palette, Some(palette.black));
+    let prev_next_keys_indicator = style_key_with_modifier(
+        &prev_next_keys,
+        &mode_info.style.styling,
+        Some(palette.black),
+    );
     let keycode = ANSIStrings(&prev_next_keys_indicator);
     let len = unstyled_len(&keycode);
     let part = keycode.to_string();
diff --git a/default-plugins/status-bar/src/main.rs b/default-plugins/status-bar/src/main.rs
index 3dc9d249db..f773228575 100644
--- a/default-plugins/status-bar/src/main.rs
+++ b/default-plugins/status-bar/src/main.rs
@@ -93,7 +93,7 @@ fn color_elements(palette: Styling, different_color_alternates: bool) -> Colored
     let alternate_background_color = palette.text_unselected[5];
     ColoredElements {
         selected: SegmentStyle {
-            prefix_separator: style!(background, palette.ribbon_selected[0]),
+            prefix_separator: style!(palette.ribbon_selected[0], palette.ribbon_selected[5]),
             char_left_separator: style!(palette.ribbon_selected[0], palette.ribbon_selected[5])
                 .bold(),
             char_shortcut: style!(palette.ribbon_selected[1], palette.ribbon_selected[5]).bold(),
@@ -233,6 +233,7 @@ impl ZellijPlugin for State {
             return;
         }
 
+        //TODO: Switch to UI components here
         let active_tab = self.tabs.iter().find(|t| t.active);
         let first_line = first_line(&self.mode_info, active_tab, cols, separator);
         let second_line = self.second_line(cols);
@@ -276,18 +277,18 @@ impl State {
         let active_tab = self.tabs.iter().find(|t| t.active);
 
         if let Some(copy_destination) = self.text_copy_destination {
-            text_copied_hint(&self.mode_info.style.colors, copy_destination)
+            text_copied_hint(&self.mode_info.style.styling, copy_destination)
         } else if self.display_system_clipboard_failure {
-            system_clipboard_error(&self.mode_info.style.colors)
+            system_clipboard_error(&self.mode_info.style.styling)
         } else if let Some(active_tab) = active_tab {
             if active_tab.is_fullscreen_active {
                 match self.mode_info.mode {
                     InputMode::Normal => fullscreen_panes_to_hide(
-                        &self.mode_info.style.colors,
+                        &self.mode_info.style.styling,
                         active_tab.panes_to_hide,
                     ),
                     InputMode::Locked => locked_fullscreen_panes_to_hide(
-                        &self.mode_info.style.colors,
+                        &self.mode_info.style.styling,
                         active_tab.panes_to_hide,
                     ),
                     _ => keybinds(&self.mode_info, &self.tip_name, cols),
@@ -296,7 +297,7 @@ impl State {
                 match self.mode_info.mode {
                     InputMode::Normal => floating_panes_are_visible(&self.mode_info),
                     InputMode::Locked => {
-                        locked_floating_panes_are_visible(&self.mode_info.style.colors)
+                        locked_floating_panes_are_visible(&self.mode_info.style.styling)
                     },
                     _ => keybinds(&self.mode_info, &self.tip_name, cols),
                 }
@@ -386,19 +387,16 @@ pub fn action_key_group(
 /// type.
 pub fn style_key_with_modifier(
     keyvec: &[KeyWithModifier],
-    palette: &Palette,
+    palette: &Styling,
     background: Option<PaletteColor>,
 ) -> Vec<ANSIString<'static>> {
     if keyvec.is_empty() {
         return vec![];
     }
 
-    let text_color = palette_match!(match palette.theme_hue {
-        ThemeHue::Dark => palette.white,
-        ThemeHue::Light => palette.black,
-    });
-    let green_color = palette_match!(palette.green);
-    let orange_color = palette_match!(palette.orange);
+    let text_color = palette_match!(palette.text_unselected[0]);
+    let green_color = palette_match!(palette.text_unselected[1]);
+    let orange_color = palette_match!(palette.text_unselected[2]);
     let mut ret = vec![];
 
     let common_modifiers = get_common_modifiers(keyvec.iter().collect());
@@ -660,7 +658,7 @@ pub mod tests {
             KeyWithModifier::new(BareKey::Char('b')),
             KeyWithModifier::new(BareKey::Char('c')),
         ];
-        let palette = get_palette();
+        let palette = Styling::default();
 
         let ret = style_key_with_modifier(&keyvec, &palette, None);
         let ret = unstyle(&ANSIStrings(&ret));
@@ -676,7 +674,7 @@ pub mod tests {
             KeyWithModifier::new(BareKey::Char('k')),
             KeyWithModifier::new(BareKey::Char('l')),
         ];
-        let palette = get_palette();
+        let palette = Styling::default();
 
         let ret = style_key_with_modifier(&keyvec, &palette, None);
         let ret = unstyle(&ANSIStrings(&ret));
@@ -692,7 +690,7 @@ pub mod tests {
             KeyWithModifier::new(BareKey::Up),
             KeyWithModifier::new(BareKey::Right),
         ];
-        let palette = get_palette();
+        let palette = Styling::default();
 
         let ret = style_key_with_modifier(&keyvec, &palette, None);
         let ret = unstyle(&ANSIStrings(&ret));
@@ -706,7 +704,7 @@ pub mod tests {
             KeyWithModifier::new(BareKey::Left),
             KeyWithModifier::new(BareKey::Right),
         ];
-        let palette = get_palette();
+        let palette = Styling::default();
 
         let ret = style_key_with_modifier(&keyvec, &palette, None);
         let ret = unstyle(&ANSIStrings(&ret));
@@ -720,7 +718,7 @@ pub mod tests {
             KeyWithModifier::new(BareKey::Down),
             KeyWithModifier::new(BareKey::Up),
         ];
-        let palette = get_palette();
+        let palette = Styling::default();
 
         let ret = style_key_with_modifier(&keyvec, &palette, None);
         let ret = unstyle(&ANSIStrings(&ret));
@@ -736,7 +734,7 @@ pub mod tests {
             KeyWithModifier::new(BareKey::Char('c')).with_ctrl_modifier(),
             KeyWithModifier::new(BareKey::Char('d')).with_ctrl_modifier(),
         ];
-        let palette = get_palette();
+        let palette = Styling::default();
 
         let ret = style_key_with_modifier(&keyvec, &palette, None);
         let ret = unstyle(&ANSIStrings(&ret));
@@ -752,7 +750,7 @@ pub mod tests {
             KeyWithModifier::new(BareKey::Char('c')).with_alt_modifier(),
             KeyWithModifier::new(BareKey::Char('d')).with_alt_modifier(),
         ];
-        let palette = get_palette();
+        let palette = Styling::default();
 
         let ret = style_key_with_modifier(&keyvec, &palette, None);
         let ret = unstyle(&ANSIStrings(&ret));
@@ -768,7 +766,7 @@ pub mod tests {
             KeyWithModifier::new(BareKey::Up).with_alt_modifier(),
             KeyWithModifier::new(BareKey::Right).with_alt_modifier(),
         ];
-        let palette = get_palette();
+        let palette = Styling::default();
 
         let ret = style_key_with_modifier(&keyvec, &palette, None);
         let ret = unstyle(&ANSIStrings(&ret));
@@ -783,7 +781,7 @@ pub mod tests {
             KeyWithModifier::new(BareKey::Char('b')).with_ctrl_modifier(),
             KeyWithModifier::new(BareKey::Char('c')),
         ];
-        let palette = get_palette();
+        let palette = Styling::default();
 
         let ret = style_key_with_modifier(&keyvec, &palette, None);
         let ret = unstyle(&ANSIStrings(&ret));
@@ -806,7 +804,7 @@ pub mod tests {
             KeyWithModifier::new(BareKey::Tab),
             KeyWithModifier::new(BareKey::Esc),
         ];
-        let palette = get_palette();
+        let palette = Styling::default();
 
         let ret = style_key_with_modifier(&keyvec, &palette, None);
         let ret = unstyle(&ANSIStrings(&ret));
@@ -824,7 +822,7 @@ pub mod tests {
             KeyWithModifier::new(BareKey::Char(' ')).with_ctrl_modifier(),
             KeyWithModifier::new(BareKey::Tab).with_ctrl_modifier(),
         ];
-        let palette = get_palette();
+        let palette = Styling::default();
 
         let ret = style_key_with_modifier(&keyvec, &palette, None);
         let ret = unstyle(&ANSIStrings(&ret));
@@ -839,7 +837,7 @@ pub mod tests {
             KeyWithModifier::new(BareKey::Char(' ')).with_alt_modifier(),
             KeyWithModifier::new(BareKey::Tab).with_alt_modifier(),
         ];
-        let palette = get_palette();
+        let palette = Styling::default();
 
         let ret = style_key_with_modifier(&keyvec, &palette, None);
         let ret = unstyle(&ANSIStrings(&ret));
diff --git a/default-plugins/status-bar/src/second_line.rs b/default-plugins/status-bar/src/second_line.rs
index 63730aa4eb..3a2998fe0f 100644
--- a/default-plugins/status-bar/src/second_line.rs
+++ b/default-plugins/status-bar/src/second_line.rs
@@ -17,16 +17,13 @@ fn full_length_shortcut(
     is_first_shortcut: bool,
     key: Vec<KeyWithModifier>,
     action: &str,
-    palette: Palette,
+    palette: Styling,
 ) -> LinePart {
     if key.is_empty() {
         return LinePart::default();
     }
 
-    let text_color = palette_match!(match palette.theme_hue {
-        ThemeHue::Dark => palette.white,
-        ThemeHue::Light => palette.black,
-    });
+    let text_color = palette_match!(palette.text_unselected[0]);
 
     let separator = if is_first_shortcut { " " } else { " / " };
     let mut bits: Vec<ANSIString> = vec![Style::new().fg(text_color).paint(separator)];
@@ -45,13 +42,10 @@ fn full_length_shortcut(
     }
 }
 
-fn locked_interface_indication(palette: Palette) -> LinePart {
+fn locked_interface_indication(palette: Styling) -> LinePart {
     let locked_text = " -- INTERFACE LOCKED -- ";
     let locked_text_len = locked_text.chars().count();
-    let text_color = palette_match!(match palette.theme_hue {
-        ThemeHue::Dark => palette.white,
-        ThemeHue::Light => palette.black,
-    });
+    let text_color = palette_match!(palette.text_unselected[0]);
     let locked_styled_text = Style::new().fg(text_color).bold().paint(locked_text);
     LinePart {
         part: locked_styled_text.to_string(),
@@ -66,9 +60,9 @@ fn add_shortcut(
     keys: Vec<KeyWithModifier>,
 ) -> LinePart {
     let shortcut = if linepart.len == 0 {
-        full_length_shortcut(true, keys, text, help.style.colors)
+        full_length_shortcut(true, keys, text, help.style.styling)
     } else {
-        full_length_shortcut(false, keys, text, help.style.colors)
+        full_length_shortcut(false, keys, text, help.style.styling)
     };
 
     let mut new_linepart = LinePart::default();
@@ -276,7 +270,7 @@ fn get_keys_and_hints(mi: &ModeInfo) -> Vec<(String, String, Vec<KeyWithModifier
 fn full_shortcut_list(help: &ModeInfo, tip: TipFn) -> LinePart {
     match help.mode {
         InputMode::Normal => tip(help),
-        InputMode::Locked => locked_interface_indication(help.style.colors),
+        InputMode::Locked => locked_interface_indication(help.style.styling),
         _ => full_shortcut_list_nonstandard_mode(help),
     }
 }
@@ -294,7 +288,7 @@ fn shortened_shortcut_list_nonstandard_mode(help: &ModeInfo) -> LinePart {
 fn shortened_shortcut_list(help: &ModeInfo, tip: TipFn) -> LinePart {
     match help.mode {
         InputMode::Normal => tip(help),
-        InputMode::Locked => locked_interface_indication(help.style.colors),
+        InputMode::Locked => locked_interface_indication(help.style.styling),
         _ => shortened_shortcut_list_nonstandard_mode(help),
     }
 }
@@ -326,7 +320,7 @@ fn best_effort_shortcut_list(help: &ModeInfo, tip: TipFn, max_len: usize) -> Lin
             }
         },
         InputMode::Locked => {
-            let line_part = locked_interface_indication(help.style.colors);
+            let line_part = locked_interface_indication(help.style.styling);
             if line_part.len <= max_len {
                 line_part
             } else {
@@ -354,8 +348,8 @@ pub fn keybinds(help: &ModeInfo, tip_name: &str, max_width: usize) -> LinePart {
     best_effort_shortcut_list(help, tip_body.short, max_width)
 }
 
-pub fn text_copied_hint(palette: &Palette, copy_destination: CopyDestination) -> LinePart {
-    let green_color = palette_match!(palette.green);
+pub fn text_copied_hint(palette: &Styling, copy_destination: CopyDestination) -> LinePart {
+    let green_color = palette_match!(palette.text_unselected[1]);
     let hint = match copy_destination {
         CopyDestination::Command => "Text piped to external command",
         #[cfg(not(target_os = "macos"))]
@@ -370,22 +364,19 @@ pub fn text_copied_hint(palette: &Palette, copy_destination: CopyDestination) ->
     }
 }
 
-pub fn system_clipboard_error(palette: &Palette) -> LinePart {
+pub fn system_clipboard_error(palette: &Styling) -> LinePart {
     let hint = " Error using the system clipboard.";
-    let red_color = palette_match!(palette.red);
+    let red_color = palette_match!(palette.text_unselected[4]);
     LinePart {
         part: Style::new().fg(red_color).bold().paint(hint).to_string(),
         len: hint.len(),
     }
 }
 
-pub fn fullscreen_panes_to_hide(palette: &Palette, panes_to_hide: usize) -> LinePart {
-    let text_color = palette_match!(match palette.theme_hue {
-        ThemeHue::Dark => palette.white,
-        ThemeHue::Light => palette.black,
-    });
-    let green_color = palette_match!(palette.green);
-    let orange_color = palette_match!(palette.orange);
+pub fn fullscreen_panes_to_hide(palette: &Styling, panes_to_hide: usize) -> LinePart {
+    let text_color = palette_match!(palette.text_unselected[0]);
+    let green_color = palette_match!(palette.text_unselected[1]);
+    let orange_color = palette_match!(palette.text_unselected[2]);
     let shortcut_left_separator = Style::new().fg(text_color).bold().paint(" (");
     let shortcut_right_separator = Style::new().fg(text_color).bold().paint("): ");
     let fullscreen = "FULLSCREEN";
@@ -477,13 +468,10 @@ pub fn floating_panes_are_visible(mode_info: &ModeInfo) -> LinePart {
     }
 }
 
-pub fn locked_fullscreen_panes_to_hide(palette: &Palette, panes_to_hide: usize) -> LinePart {
-    let text_color = palette_match!(match palette.theme_hue {
-        ThemeHue::Dark => palette.white,
-        ThemeHue::Light => palette.black,
-    });
-    let green_color = palette_match!(palette.green);
-    let orange_color = palette_match!(palette.orange);
+pub fn locked_fullscreen_panes_to_hide(palette: &Styling, panes_to_hide: usize) -> LinePart {
+    let text_color = palette_match!(palette.text_unselected[0]);
+    let green_color = palette_match!(palette.text_unselected[1]);
+    let orange_color = palette_match!(palette.text_unselected[2]);
     let locked_text = " -- INTERFACE LOCKED -- ";
     let shortcut_left_separator = Style::new().fg(text_color).bold().paint(" (");
     let shortcut_right_separator = Style::new().fg(text_color).bold().paint("): ");
@@ -512,15 +500,9 @@ pub fn locked_fullscreen_panes_to_hide(palette: &Palette, panes_to_hide: usize)
     }
 }
 
-pub fn locked_floating_panes_are_visible(palette: &Palette) -> LinePart {
-    let white_color = match palette.white {
-        PaletteColor::Rgb((r, g, b)) => RGB(r, g, b),
-        PaletteColor::EightBit(color) => Fixed(color),
-    };
-    let orange_color = match palette.orange {
-        PaletteColor::Rgb((r, g, b)) => RGB(r, g, b),
-        PaletteColor::EightBit(color) => Fixed(color),
-    };
+pub fn locked_floating_panes_are_visible(palette: &Styling) -> LinePart {
+    let white_color = palette_match!(palette.text_unselected[0]);
+    let orange_color = palette_match!(palette.text_unselected[1]);
     let shortcut_left_separator = Style::new().fg(white_color).bold().paint(" (");
     let shortcut_right_separator = Style::new().fg(white_color).bold().paint(")");
     let locked_text = " -- INTERFACE LOCKED -- ";
@@ -566,7 +548,7 @@ mod tests {
     #[test]
     fn full_length_shortcut_with_key() {
         let keyvec = vec![KeyWithModifier::new(BareKey::Char('a'))];
-        let palette = get_palette();
+        let palette = Styling::default();
 
         let ret = full_length_shortcut(false, keyvec, "Foobar", palette);
         let ret = unstyle(ret);
@@ -577,7 +559,7 @@ mod tests {
     #[test]
     fn full_length_shortcut_with_key_first_element() {
         let keyvec = vec![KeyWithModifier::new(BareKey::Char('a'))];
-        let palette = get_palette();
+        let palette = Styling::default();
 
         let ret = full_length_shortcut(true, keyvec, "Foobar", palette);
         let ret = unstyle(ret);
@@ -589,7 +571,7 @@ mod tests {
     // When there is no binding, we print no shortcut either
     fn full_length_shortcut_without_key() {
         let keyvec = vec![];
-        let palette = get_palette();
+        let palette = Styling::default();
 
         let ret = full_length_shortcut(false, keyvec, "Foobar", palette);
         let ret = unstyle(ret);
@@ -600,7 +582,7 @@ mod tests {
     #[test]
     fn full_length_shortcut_with_key_unprintable_1() {
         let keyvec = vec![KeyWithModifier::new(BareKey::Enter)];
-        let palette = get_palette();
+        let palette = Styling::default();
 
         let ret = full_length_shortcut(false, keyvec, "Foobar", palette);
         let ret = unstyle(ret);
@@ -611,7 +593,7 @@ mod tests {
     #[test]
     fn full_length_shortcut_with_key_unprintable_2() {
         let keyvec = vec![KeyWithModifier::new(BareKey::Backspace)];
-        let palette = get_palette();
+        let palette = Styling::default();
 
         let ret = full_length_shortcut(false, keyvec, "Foobar", palette);
         let ret = unstyle(ret);
@@ -622,7 +604,7 @@ mod tests {
     #[test]
     fn full_length_shortcut_with_ctrl_key() {
         let keyvec = vec![KeyWithModifier::new(BareKey::Char('a')).with_ctrl_modifier()];
-        let palette = get_palette();
+        let palette = Styling::default();
 
         let ret = full_length_shortcut(false, keyvec, "Foobar", palette);
         let ret = unstyle(ret);
@@ -633,7 +615,7 @@ mod tests {
     #[test]
     fn full_length_shortcut_with_alt_key() {
         let keyvec = vec![KeyWithModifier::new(BareKey::Char('a')).with_alt_modifier()];
-        let palette = get_palette();
+        let palette = Styling::default();
 
         let ret = full_length_shortcut(false, keyvec, "Foobar", palette);
         let ret = unstyle(ret);
@@ -648,7 +630,7 @@ mod tests {
             KeyWithModifier::new(BareKey::Char('b')),
             KeyWithModifier::new(BareKey::Char('c')),
         ];
-        let palette = get_palette();
+        let palette = Styling::default();
 
         let ret = full_length_shortcut(false, keyvec, "Foobar", palette);
         let ret = unstyle(ret);
@@ -663,7 +645,7 @@ mod tests {
             KeyWithModifier::new(BareKey::Char('b')).with_ctrl_modifier(),
             KeyWithModifier::new(BareKey::Enter),
         ];
-        let palette = get_palette();
+        let palette = Styling::default();
 
         let ret = full_length_shortcut(false, keyvec, "Foobar", palette);
         let ret = unstyle(ret);
@@ -678,7 +660,7 @@ mod tests {
             KeyWithModifier::new(BareKey::Char('b')).with_ctrl_modifier(),
             KeyWithModifier::new(BareKey::Char('c')).with_ctrl_modifier(),
         ];
-        let palette = get_palette();
+        let palette = Styling::default();
 
         let ret = full_length_shortcut(false, keyvec, "Foobar", palette);
         let ret = unstyle(ret);
diff --git a/default-plugins/status-bar/src/tip/data/compact_layout.rs b/default-plugins/status-bar/src/tip/data/compact_layout.rs
index 77dec8a60f..ac85ca6364 100644
--- a/default-plugins/status-bar/src/tip/data/compact_layout.rs
+++ b/default-plugins/status-bar/src/tip/data/compact_layout.rs
@@ -25,7 +25,7 @@ macro_rules! strings {
 pub fn compact_layout_full(help: &ModeInfo) -> LinePart {
     // Tip: UI taking up too much space? Start Zellij with
     // zellij -l compact or remove pane frames with Ctrl + <p> + <z>
-    let green_color = palette_match!(help.style.colors.green);
+    let green_color = palette_match!(help.style.styling.text_unselected[1]);
 
     let mut bits = vec![
         Style::new().paint(" Tip: "),
@@ -43,7 +43,7 @@ pub fn compact_layout_full(help: &ModeInfo) -> LinePart {
 pub fn compact_layout_medium(help: &ModeInfo) -> LinePart {
     // Tip: To save screen space, start Zellij with
     // zellij -l compact or remove pane frames with Ctrl + <p> + <z>
-    let green_color = palette_match!(help.style.colors.green);
+    let green_color = palette_match!(help.style.styling.text_unselected[1]);
 
     let mut bits = vec![
         Style::new().paint(" Tip: "),
@@ -61,7 +61,7 @@ pub fn compact_layout_medium(help: &ModeInfo) -> LinePart {
 pub fn compact_layout_short(help: &ModeInfo) -> LinePart {
     // Save screen space, start Zellij with
     // zellij -l compact or remove pane frames with Ctrl + <p> + <z>
-    let green_color = palette_match!(help.style.colors.green);
+    let green_color = palette_match!(help.style.styling.text_unselected[1]);
 
     let mut bits = vec![
         Style::new().paint(" Save screen space, start with: "),
@@ -93,11 +93,11 @@ fn add_keybinds(help: &ModeInfo) -> Vec<ANSIString> {
     }
 
     let mut bits = vec![];
-    bits.extend(style_key_with_modifier(&to_pane, &help.style.colors, None));
+    bits.extend(style_key_with_modifier(&to_pane, &help.style.styling, None));
     bits.push(Style::new().paint(", "));
     bits.extend(style_key_with_modifier(
         &pane_frames,
-        &help.style.colors,
+        &help.style.styling,
         None,
     ));
     bits
diff --git a/default-plugins/status-bar/src/tip/data/edit_scrollbuffer.rs b/default-plugins/status-bar/src/tip/data/edit_scrollbuffer.rs
index ebd944b779..7d7def374e 100644
--- a/default-plugins/status-bar/src/tip/data/edit_scrollbuffer.rs
+++ b/default-plugins/status-bar/src/tip/data/edit_scrollbuffer.rs
@@ -24,7 +24,7 @@ macro_rules! strings {
 pub fn edit_scrollbuffer_full(help: &ModeInfo) -> LinePart {
     // Tip: Search through the scrollbuffer using your default $EDITOR with
     // Ctrl + <s> + <e>
-    let green_color = palette_match!(help.style.colors.green);
+    let green_color = palette_match!(help.style.styling.text_unselected[1]);
 
     let mut bits = vec![
         Style::new().paint(" Tip: "),
@@ -39,7 +39,7 @@ pub fn edit_scrollbuffer_full(help: &ModeInfo) -> LinePart {
 pub fn edit_scrollbuffer_medium(help: &ModeInfo) -> LinePart {
     // Tip: Search the scrollbuffer using your $EDITOR with
     // Ctrl + <s> + <e>
-    let green_color = palette_match!(help.style.colors.green);
+    let green_color = palette_match!(help.style.styling.text_unselected[1]);
 
     let mut bits = vec![
         Style::new().paint(" Tip: "),
@@ -54,7 +54,7 @@ pub fn edit_scrollbuffer_medium(help: &ModeInfo) -> LinePart {
 pub fn edit_scrollbuffer_short(help: &ModeInfo) -> LinePart {
     // Search using $EDITOR with
     // Ctrl + <s> + <e>
-    let green_color = palette_match!(help.style.colors.green);
+    let green_color = palette_match!(help.style.styling.text_unselected[1]);
 
     let mut bits = vec![
         Style::new().paint(" Search using "),
@@ -83,11 +83,11 @@ fn add_keybinds(help: &ModeInfo) -> Vec<ANSIString> {
     }
 
     let mut bits = vec![];
-    bits.extend(style_key_with_modifier(&to_pane, &help.style.colors, None));
+    bits.extend(style_key_with_modifier(&to_pane, &help.style.styling, None));
     bits.push(Style::new().paint(", "));
     bits.extend(style_key_with_modifier(
         &edit_buffer,
-        &help.style.colors,
+        &help.style.styling,
         None,
     ));
     bits
diff --git a/default-plugins/status-bar/src/tip/data/floating_panes_mouse.rs b/default-plugins/status-bar/src/tip/data/floating_panes_mouse.rs
index 4bf4a143dc..3956d8ba07 100644
--- a/default-plugins/status-bar/src/tip/data/floating_panes_mouse.rs
+++ b/default-plugins/status-bar/src/tip/data/floating_panes_mouse.rs
@@ -62,11 +62,11 @@ fn add_keybinds(help: &ModeInfo) -> Vec<ANSIString> {
     }
 
     let mut bits = vec![];
-    bits.extend(style_key_with_modifier(&to_pane, &help.style.colors, None));
+    bits.extend(style_key_with_modifier(&to_pane, &help.style.styling, None));
     bits.push(Style::new().paint(", "));
     bits.extend(style_key_with_modifier(
         &floating_toggle,
-        &help.style.colors,
+        &help.style.styling,
         None,
     ));
     bits
diff --git a/default-plugins/status-bar/src/tip/data/move_focus_hjkl_tab_switch.rs b/default-plugins/status-bar/src/tip/data/move_focus_hjkl_tab_switch.rs
index c39ea302e1..fbf229ad76 100644
--- a/default-plugins/status-bar/src/tip/data/move_focus_hjkl_tab_switch.rs
+++ b/default-plugins/status-bar/src/tip/data/move_focus_hjkl_tab_switch.rs
@@ -70,8 +70,8 @@ fn add_keybinds(help: &ModeInfo) -> Vec<ANSIString> {
             letters.push(key);
         }
     }
-    let arrows = style_key_with_modifier(&arrows, &help.style.colors, None);
-    let letters = style_key_with_modifier(&letters, &help.style.colors, None);
+    let arrows = style_key_with_modifier(&arrows, &help.style.styling, None);
+    let letters = style_key_with_modifier(&letters, &help.style.styling, None);
     if arrows.is_empty() && letters.is_empty() {
         vec![Style::new().bold().paint("UNBOUND")]
     } else if arrows.is_empty() || letters.is_empty() {
diff --git a/default-plugins/status-bar/src/tip/data/quicknav.rs b/default-plugins/status-bar/src/tip/data/quicknav.rs
index 9d66754e2b..4e1c205391 100644
--- a/default-plugins/status-bar/src/tip/data/quicknav.rs
+++ b/default-plugins/status-bar/src/tip/data/quicknav.rs
@@ -66,7 +66,7 @@ fn add_keybinds(help: &ModeInfo) -> Keygroups {
     let new_pane = if new_pane_keys.is_empty() {
         vec![Style::new().bold().paint("UNBOUND")]
     } else {
-        style_key_with_modifier(&new_pane_keys, &help.style.colors, None)
+        style_key_with_modifier(&new_pane_keys, &help.style.styling, None)
     };
 
     let mut resize_keys = action_key_group(
@@ -84,7 +84,7 @@ fn add_keybinds(help: &ModeInfo) -> Keygroups {
     let resize = if resize_keys.is_empty() {
         vec![Style::new().bold().paint("UNBOUND")]
     } else {
-        style_key_with_modifier(&resize_keys, &help.style.colors, None)
+        style_key_with_modifier(&resize_keys, &help.style.styling, None)
     };
 
     let move_focus_keys = action_key_group(
@@ -113,8 +113,8 @@ fn add_keybinds(help: &ModeInfo) -> Keygroups {
             letters.push(key);
         }
     }
-    let arrows = style_key_with_modifier(&arrows, &help.style.colors, None);
-    let letters = style_key_with_modifier(&letters, &help.style.colors, None);
+    let arrows = style_key_with_modifier(&arrows, &help.style.styling, None);
+    let letters = style_key_with_modifier(&letters, &help.style.styling, None);
     let move_focus = if arrows.is_empty() && letters.is_empty() {
         vec![Style::new().bold().paint("UNBOUND")]
     } else if arrows.is_empty() || letters.is_empty() {
diff --git a/default-plugins/status-bar/src/tip/data/sync_tab.rs b/default-plugins/status-bar/src/tip/data/sync_tab.rs
index 486e2aa242..7094c3c23d 100644
--- a/default-plugins/status-bar/src/tip/data/sync_tab.rs
+++ b/default-plugins/status-bar/src/tip/data/sync_tab.rs
@@ -61,11 +61,11 @@ fn add_keybinds(help: &ModeInfo) -> Vec<ANSIString> {
     }
 
     let mut bits = vec![];
-    bits.extend(style_key_with_modifier(&to_tab, &help.style.colors, None));
+    bits.extend(style_key_with_modifier(&to_tab, &help.style.styling, None));
     bits.push(Style::new().paint(", "));
     bits.extend(style_key_with_modifier(
         &sync_tabs,
-        &help.style.colors,
+        &help.style.styling,
         None,
     ));
     bits

From 8cb4bad056f2addb676ae881f613d4694af0610b Mon Sep 17 00:00:00 2001
From: Mark Grey <mgthesecond@spotify.com>
Date: Fri, 29 Mar 2024 15:11:31 -0400
Subject: [PATCH 06/40] initial conversion palette->styling

---
 default-plugins/status-bar/src/main.rs        |  2 +-
 default-plugins/status-bar/src/second_line.rs |  6 +--
 zellij-utils/src/data.rs                      | 53 ++++++++++++++++++-
 zellij-utils/src/kdl/mod.rs                   | 12 +----
 4 files changed, 57 insertions(+), 16 deletions(-)

diff --git a/default-plugins/status-bar/src/main.rs b/default-plugins/status-bar/src/main.rs
index f773228575..c7538593d4 100644
--- a/default-plugins/status-bar/src/main.rs
+++ b/default-plugins/status-bar/src/main.rs
@@ -395,7 +395,7 @@ pub fn style_key_with_modifier(
     }
 
     let text_color = palette_match!(palette.text_unselected[0]);
-    let green_color = palette_match!(palette.text_unselected[1]);
+    let green_color = palette_match!(palette.text_unselected[3]); 
     let orange_color = palette_match!(palette.text_unselected[2]);
     let mut ret = vec![];
 
diff --git a/default-plugins/status-bar/src/second_line.rs b/default-plugins/status-bar/src/second_line.rs
index 3a2998fe0f..37fb898d65 100644
--- a/default-plugins/status-bar/src/second_line.rs
+++ b/default-plugins/status-bar/src/second_line.rs
@@ -349,7 +349,7 @@ pub fn keybinds(help: &ModeInfo, tip_name: &str, max_width: usize) -> LinePart {
 }
 
 pub fn text_copied_hint(palette: &Styling, copy_destination: CopyDestination) -> LinePart {
-    let green_color = palette_match!(palette.text_unselected[1]);
+    let green_color = palette_match!(palette.text_unselected[3]); 
     let hint = match copy_destination {
         CopyDestination::Command => "Text piped to external command",
         #[cfg(not(target_os = "macos"))]
@@ -375,7 +375,7 @@ pub fn system_clipboard_error(palette: &Styling) -> LinePart {
 
 pub fn fullscreen_panes_to_hide(palette: &Styling, panes_to_hide: usize) -> LinePart {
     let text_color = palette_match!(palette.text_unselected[0]);
-    let green_color = palette_match!(palette.text_unselected[1]);
+    let green_color = palette_match!(palette.text_unselected[3]); 
     let orange_color = palette_match!(palette.text_unselected[2]);
     let shortcut_left_separator = Style::new().fg(text_color).bold().paint(" (");
     let shortcut_right_separator = Style::new().fg(text_color).bold().paint("): ");
@@ -470,7 +470,7 @@ pub fn floating_panes_are_visible(mode_info: &ModeInfo) -> LinePart {
 
 pub fn locked_fullscreen_panes_to_hide(palette: &Styling, panes_to_hide: usize) -> LinePart {
     let text_color = palette_match!(palette.text_unselected[0]);
-    let green_color = palette_match!(palette.text_unselected[1]);
+    let green_color = palette_match!(palette.text_unselected[3]); 
     let orange_color = palette_match!(palette.text_unselected[2]);
     let locked_text = " -- INTERFACE LOCKED -- ";
     let shortcut_left_separator = Style::new().fg(text_color).bold().paint(" (");
diff --git a/zellij-utils/src/data.rs b/zellij-utils/src/data.rs
index 75e1643641..198f1df0e7 100644
--- a/zellij-utils/src/data.rs
+++ b/zellij-utils/src/data.rs
@@ -1162,11 +1162,62 @@ pub struct StyleDeclaration {
 
 impl From<Styling> for Palette {
     // TODO: Implement mapping of old colors -> styling
-    fn from(_value: Styling) -> Self {
+    fn from(_palette: Styling) -> Self {
         default_palette()
     }
 }
 
+impl From<Palette> for Styling {
+    fn from(palette: Palette) -> Self {
+        Styling {
+            text_unselected: [
+                palette.white,
+                palette.orange,
+                palette.cyan,
+                palette.green,
+                palette.magenta,
+                palette.bg,
+            ],
+            // TODO: update
+            text_selected: [
+                palette.white,
+                palette.orange,
+                palette.cyan,
+                palette.green,
+                palette.magenta,
+                palette.bg,
+            ],
+            ribbon_unselected: [
+                palette.black,
+                palette.red,
+                palette.white,
+                palette.blue,
+                palette.magenta,
+                palette.fg,
+            ],
+            ribbon_selected: [
+                palette.black,
+                palette.red,
+                palette.white,
+                palette.blue,
+                palette.magenta,
+                palette.green,
+            ],
+            ..Default::default() /*
+                                 table_title: (),
+                                 table_cell_unselected: (),
+                                 table_cell_selected: (),
+                                 list_unselected: (),
+                                 list_selected: (),
+                                 frame_unselected: (),
+                                 frame_selected: (),
+                                 exit_code_success: (),
+                                 exit_code_error: (),
+                                 */
+        }
+    }
+}
+
 // FIXME: Poor devs hashtable since HashTable can't derive `Default`...
 pub type KeybindsVec = Vec<(InputMode, Vec<(KeyWithModifier, Vec<Action>)>)>;
 
diff --git a/zellij-utils/src/kdl/mod.rs b/zellij-utils/src/kdl/mod.rs
index 10ea48b908..68aa18bdcb 100644
--- a/zellij-utils/src/kdl/mod.rs
+++ b/zellij-utils/src/kdl/mod.rs
@@ -2095,17 +2095,7 @@ impl Themes {
                     Theme {
                         palette,
                         // TODO: inverse palette -> styling
-                        styling: Styling {
-                            ribbon_unselected: [
-                                PaletteColor::EightBit(colors::BLUE),
-                                PaletteColor::EightBit(colors::BLUE),
-                                PaletteColor::EightBit(colors::BLUE),
-                                PaletteColor::EightBit(colors::BLUE),
-                                PaletteColor::EightBit(colors::BLUE),
-                                PaletteColor::EightBit(colors::BLUE),
-                            ],
-                            ..Default::default()
-                        },
+                        styling: palette.into(),
                     }
                 },
             };

From ec4554454ccee5929d8066a2651dae4e5ec84b8e Mon Sep 17 00:00:00 2001
From: Mark Grey <mgthesecond@spotify.com>
Date: Fri, 29 Mar 2024 17:18:09 -0400
Subject: [PATCH 07/40] further style corrections to status bar

---
 default-plugins/status-bar/src/first_line.rs  |  8 +++---
 default-plugins/status-bar/src/main.rs        |  2 +-
 default-plugins/status-bar/src/second_line.rs | 27 +++++++------------
 zellij-utils/src/kdl/mod.rs                   | 18 +------------
 zellij-utils/src/plugin_api/style.rs          |  3 ---
 5 files changed, 14 insertions(+), 44 deletions(-)

diff --git a/default-plugins/status-bar/src/first_line.rs b/default-plugins/status-bar/src/first_line.rs
index 718eec1761..8444c6ba4a 100644
--- a/default-plugins/status-bar/src/first_line.rs
+++ b/default-plugins/status-bar/src/first_line.rs
@@ -345,7 +345,7 @@ fn key_indicators(
     line_part
 }
 
-fn swap_layout_keycode(mode_info: &ModeInfo, palette: &Palette) -> LinePart {
+fn swap_layout_keycode(mode_info: &ModeInfo) -> LinePart {
     let mode_keybinds = mode_info.get_mode_keybinds();
     let prev_next_keys = action_key_group(
         &mode_keybinds,
@@ -354,7 +354,7 @@ fn swap_layout_keycode(mode_info: &ModeInfo, palette: &Palette) -> LinePart {
     let prev_next_keys_indicator = style_key_with_modifier(
         &prev_next_keys,
         &mode_info.style.styling,
-        Some(palette.black),
+        Some(mode_info.style.styling.text_unselected[5]),
     );
     let keycode = ANSIStrings(&prev_next_keys_indicator);
     let len = unstyled_len(&keycode);
@@ -368,14 +368,13 @@ fn swap_layout_status(
     is_swap_layout_damaged: bool,
     mode_info: &ModeInfo,
     colored_elements: ColoredElements,
-    palette: &Palette,
     separator: &str,
 ) -> Option<LinePart> {
     match swap_layout_name {
         Some(swap_layout_name) => {
             let mut swap_layout_name = format!(" {} ", swap_layout_name);
             swap_layout_name.make_ascii_uppercase();
-            let keycode = swap_layout_keycode(mode_info, palette);
+            let keycode = swap_layout_keycode(mode_info);
             let swap_layout_name_len = swap_layout_name.len() + 3; // 2 for the arrow separators, one for the screen end buffer
                                                                    //
             macro_rules! style_swap_layout_indicator {
@@ -705,7 +704,6 @@ pub fn first_line(
                 tab_info.is_swap_layout_dirty,
                 help,
                 colored_elements,
-                &help.style.colors,
                 separator,
             ) {
                 remaining_space -= swap_layout_status.len;
diff --git a/default-plugins/status-bar/src/main.rs b/default-plugins/status-bar/src/main.rs
index c7538593d4..12279e4369 100644
--- a/default-plugins/status-bar/src/main.rs
+++ b/default-plugins/status-bar/src/main.rs
@@ -396,7 +396,7 @@ pub fn style_key_with_modifier(
 
     let text_color = palette_match!(palette.text_unselected[0]);
     let green_color = palette_match!(palette.text_unselected[3]); 
-    let orange_color = palette_match!(palette.text_unselected[2]);
+    let orange_color = palette_match!(palette.text_unselected[1]);
     let mut ret = vec![];
 
     let common_modifiers = get_common_modifiers(keyvec.iter().collect());
diff --git a/default-plugins/status-bar/src/second_line.rs b/default-plugins/status-bar/src/second_line.rs
index 37fb898d65..d35e517c92 100644
--- a/default-plugins/status-bar/src/second_line.rs
+++ b/default-plugins/status-bar/src/second_line.rs
@@ -349,7 +349,7 @@ pub fn keybinds(help: &ModeInfo, tip_name: &str, max_width: usize) -> LinePart {
 }
 
 pub fn text_copied_hint(palette: &Styling, copy_destination: CopyDestination) -> LinePart {
-    let green_color = palette_match!(palette.text_unselected[3]); 
+    let green_color = palette_match!(palette.text_unselected[3]);
     let hint = match copy_destination {
         CopyDestination::Command => "Text piped to external command",
         #[cfg(not(target_os = "macos"))]
@@ -375,8 +375,8 @@ pub fn system_clipboard_error(palette: &Styling) -> LinePart {
 
 pub fn fullscreen_panes_to_hide(palette: &Styling, panes_to_hide: usize) -> LinePart {
     let text_color = palette_match!(palette.text_unselected[0]);
-    let green_color = palette_match!(palette.text_unselected[3]); 
-    let orange_color = palette_match!(palette.text_unselected[2]);
+    let green_color = palette_match!(palette.text_unselected[3]);
+    let orange_color = palette_match!(palette.text_unselected[1]);
     let shortcut_left_separator = Style::new().fg(text_color).bold().paint(" (");
     let shortcut_right_separator = Style::new().fg(text_color).bold().paint("): ");
     let fullscreen = "FULLSCREEN";
@@ -403,20 +403,11 @@ pub fn fullscreen_panes_to_hide(palette: &Styling, panes_to_hide: usize) -> Line
 }
 
 pub fn floating_panes_are_visible(mode_info: &ModeInfo) -> LinePart {
-    let palette = mode_info.style.colors;
+    let palette = mode_info.style.styling;
     let km = &mode_info.get_mode_keybinds();
-    let white_color = match palette.white {
-        PaletteColor::Rgb((r, g, b)) => RGB(r, g, b),
-        PaletteColor::EightBit(color) => Fixed(color),
-    };
-    let green_color = match palette.green {
-        PaletteColor::Rgb((r, g, b)) => RGB(r, g, b),
-        PaletteColor::EightBit(color) => Fixed(color),
-    };
-    let orange_color = match palette.orange {
-        PaletteColor::Rgb((r, g, b)) => RGB(r, g, b),
-        PaletteColor::EightBit(color) => Fixed(color),
-    };
+    let white_color = palette_match!(palette.text_unselected[0]);
+    let green_color = palette_match!(palette.text_unselected[3]);
+    let orange_color = palette_match!(palette.text_unselected[1]);
     let shortcut_left_separator = Style::new().fg(white_color).bold().paint(" (");
     let shortcut_right_separator = Style::new().fg(white_color).bold().paint("): ");
     let floating_panes = "FLOATING PANES VISIBLE";
@@ -470,8 +461,8 @@ pub fn floating_panes_are_visible(mode_info: &ModeInfo) -> LinePart {
 
 pub fn locked_fullscreen_panes_to_hide(palette: &Styling, panes_to_hide: usize) -> LinePart {
     let text_color = palette_match!(palette.text_unselected[0]);
-    let green_color = palette_match!(palette.text_unselected[3]); 
-    let orange_color = palette_match!(palette.text_unselected[2]);
+    let green_color = palette_match!(palette.text_unselected[3]);
+    let orange_color = palette_match!(palette.text_unselected[1]);
     let locked_text = " -- INTERFACE LOCKED -- ";
     let shortcut_left_separator = Style::new().fg(text_color).bold().paint(" (");
     let shortcut_right_separator = Style::new().fg(text_color).bold().paint("): ");
diff --git a/zellij-utils/src/kdl/mod.rs b/zellij-utils/src/kdl/mod.rs
index 68aa18bdcb..56fd64b148 100644
--- a/zellij-utils/src/kdl/mod.rs
+++ b/zellij-utils/src/kdl/mod.rs
@@ -2016,7 +2016,7 @@ impl Themes {
     ) -> Result<[PaletteColor; 5], ConfigError> {
         let colors = kdl_children_or_error!(
             kdl_child_with_name_or_error!(style_node, style_descriptor)?,
-            "foo"
+            format!("Missing colors for {}", style_descriptor)
         );
         Ok([
             PaletteColor::try_from(("base", colors))?,
@@ -2033,22 +2033,6 @@ impl Themes {
             let theme_name = kdl_name!(theme_config);
             let theme_colors = kdl_children_or_error!(theme_config, "empty theme");
             let styling = kdl_child_with_name!(theme_config, "styling");
-            /*
-            let styling_node =
-                kdl_child_with_name!(theme_config, "styling").ok_or(ConfigError::new_kdl_error(
-                    "Styling block invalid".into(),
-                    theme_config.span().offset(),
-                    theme_config.span().len(),
-                ))?;
-
-            let mut colors = BTreeMap::new();
-            let color_nodes = kdl_children_nodes_or_error!(theme_config, "Palette is empty").iter();
-            for color in color_nodes.filter(|n| n.name().value() != "styling") {
-                let color_name = kdl_name!(color);
-                let color = PaletteColor::try_from(color)?;
-                colors.insert(color_name.to_owned(), color);
-            }
-            */
             let theme = match styling {
                 // Newer theme definition with named styles
                 Some(style) => {
diff --git a/zellij-utils/src/plugin_api/style.rs b/zellij-utils/src/plugin_api/style.rs
index f05e7a8f0a..ae4298550a 100644
--- a/zellij-utils/src/plugin_api/style.rs
+++ b/zellij-utils/src/plugin_api/style.rs
@@ -27,9 +27,7 @@ impl TryFrom<ProtobufStyle> for Style {
 impl TryFrom<Style> for ProtobufStyle {
     type Error = &'static str;
     fn try_from(style: Style) -> Result<Self, &'static str> {
-        log::info!("{:?}", style.styling.ribbon_unselected);
         let s = ProtobufStyling::try_from(style.styling)?;
-        log::info!("{:?}", s.ribbon_unselected);
         Ok(ProtobufStyle {
             palette: Some(style.colors.try_into()?),
             rounded_corners: style.rounded_corners,
@@ -60,7 +58,6 @@ impl TryFrom<ProtobufStyling> for Styling {
     type Error = &'static str;
 
     fn try_from(proto: ProtobufStyling) -> std::result::Result<Self, Self::Error> {
-        log::info!("{:?}", proto);
         Ok(Styling {
             text_unselected: color_definitions!(proto, text_unselected, 6),
             text_selected: color_definitions!(proto, text_selected, 6),

From d1f0030eb0e97bcc1600080e4c8646cdee82fd11 Mon Sep 17 00:00:00 2001
From: Mark Grey <mgthesecond@spotify.com>
Date: Mon, 1 Apr 2024 11:43:17 -0400
Subject: [PATCH 08/40] support alternate tab coloration

---
 default-plugins/status-bar/src/main.rs | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/default-plugins/status-bar/src/main.rs b/default-plugins/status-bar/src/main.rs
index 12279e4369..00a8b7aceb 100644
--- a/default-plugins/status-bar/src/main.rs
+++ b/default-plugins/status-bar/src/main.rs
@@ -90,7 +90,11 @@ pub struct SegmentStyle {
 fn color_elements(palette: Styling, different_color_alternates: bool) -> ColoredElements {
     let background = palette.text_unselected[5];
     let foreground = palette.text_unselected[0];
-    let alternate_background_color = palette.text_unselected[5];
+    let alternate_background_color = if different_color_alternates {
+        palette.text_unselected[1]
+    } else {
+        palette.text_unselected[5]
+    };
     ColoredElements {
         selected: SegmentStyle {
             prefix_separator: style!(palette.ribbon_selected[0], palette.ribbon_selected[5]),
@@ -118,19 +122,14 @@ fn color_elements(palette: Styling, different_color_alternates: bool) -> Colored
                 .bold(),
         },
         unselected_alternate: SegmentStyle {
-            prefix_separator: style!(palette.ribbon_unselected[0], palette.ribbon_unselected[5]),
-            char_left_separator: style!(palette.ribbon_unselected[0], palette.ribbon_unselected[5])
-                .bold(),
-            char_shortcut: style!(palette.ribbon_unselected[1], palette.ribbon_unselected[5])
+            prefix_separator: style!(palette.ribbon_unselected[0], alternate_background_color),
+            char_left_separator: style!(palette.ribbon_unselected[0], alternate_background_color)
                 .bold(),
-            char_right_separator: style!(
-                palette.ribbon_unselected[0],
-                palette.ribbon_unselected[5]
-            )
-            .bold(),
-            styled_text: style!(palette.ribbon_unselected[0], palette.ribbon_unselected[5]).bold(),
-            suffix_separator: style!(palette.ribbon_unselected[5], palette.ribbon_selected[0])
+            char_shortcut: style!(palette.ribbon_unselected[1], alternate_background_color).bold(),
+            char_right_separator: style!(palette.ribbon_unselected[0], alternate_background_color)
                 .bold(),
+            styled_text: style!(palette.ribbon_unselected[0], alternate_background_color).bold(),
+            suffix_separator: style!(alternate_background_color, background).bold(),
         },
         disabled: SegmentStyle {
             prefix_separator: style!(background, foreground),
@@ -395,7 +394,7 @@ pub fn style_key_with_modifier(
     }
 
     let text_color = palette_match!(palette.text_unselected[0]);
-    let green_color = palette_match!(palette.text_unselected[3]); 
+    let green_color = palette_match!(palette.text_unselected[3]);
     let orange_color = palette_match!(palette.text_unselected[1]);
     let mut ret = vec![];
 

From ac21871b1de754f75e66c16f7c543b392caf63c6 Mon Sep 17 00:00:00 2001
From: Mark Grey <mgthesecond@spotify.com>
Date: Mon, 1 Apr 2024 12:48:46 -0400
Subject: [PATCH 09/40] tab bar and compact bar themeing

---
 default-plugins/compact-bar/src/main.rs       |  2 +-
 default-plugins/compact-bar/src/tab.rs        | 25 ++++-----
 default-plugins/status-bar/src/main.rs        |  4 +-
 default-plugins/tab-bar/src/line.rs           | 51 ++++++++-----------
 default-plugins/tab-bar/src/main.rs           |  9 ++--
 default-plugins/tab-bar/src/tab.rs            | 29 ++++++-----
 zellij-server/src/ui/pane_boundaries_frame.rs |  6 +--
 zellij-server/src/ui/pane_contents_and_ui.rs  |  6 +--
 zellij-utils/src/data.rs                      |  6 ++-
 9 files changed, 67 insertions(+), 71 deletions(-)

diff --git a/default-plugins/compact-bar/src/main.rs b/default-plugins/compact-bar/src/main.rs
index a7a19bd019..2eb6b9df74 100644
--- a/default-plugins/compact-bar/src/main.rs
+++ b/default-plugins/compact-bar/src/main.rs
@@ -109,7 +109,7 @@ impl ZellijPlugin for State {
                 tabname,
                 t,
                 is_alternate_tab,
-                self.mode_info.style.colors,
+                self.mode_info.style.styling,
                 self.mode_info.capabilities,
             );
             is_alternate_tab = !is_alternate_tab;
diff --git a/default-plugins/compact-bar/src/tab.rs b/default-plugins/compact-bar/src/tab.rs
index 1aa13d4c33..9479f7fb12 100644
--- a/default-plugins/compact-bar/src/tab.rs
+++ b/default-plugins/compact-bar/src/tab.rs
@@ -4,7 +4,7 @@ use unicode_width::UnicodeWidthStr;
 use zellij_tile::prelude::*;
 use zellij_tile_utils::style;
 
-fn cursors(focused_clients: &[ClientId], palette: Palette) -> (Vec<ANSIString>, usize) {
+fn cursors(focused_clients: &[ClientId], palette: Styling) -> (Vec<ANSIString>, usize) {
     // cursor section, text length
     let mut len = 0;
     let mut cursors = vec![];
@@ -21,26 +21,27 @@ pub fn render_tab(
     text: String,
     tab: &TabInfo,
     is_alternate_tab: bool,
-    palette: Palette,
+    palette: Styling,
     separator: &str,
 ) -> LinePart {
     let focused_clients = tab.other_focused_clients.as_slice();
     let separator_width = separator.width();
-    let alternate_tab_color = match palette.theme_hue {
-        // TODO: only do this if we don't have the arrow capabilities
-        ThemeHue::Dark => palette.white,
-        ThemeHue::Light => palette.black,
+    let alternate_tab_color = if is_alternate_tab {
+        palette.ribbon_unselected[1]
+    } else {
+        palette.ribbon_unselected[5]
     };
     let background_color = if tab.active {
-        palette.green
+        palette.ribbon_selected[5]
     } else if is_alternate_tab {
         alternate_tab_color
     } else {
-        palette.fg
+        palette.ribbon_unselected[5]
     };
-    let foreground_color = match palette.theme_hue {
-        ThemeHue::Dark => palette.black,
-        ThemeHue::Light => palette.white,
+    let foreground_color = if tab.active {
+        palette.ribbon_selected[0]
+    } else {
+        palette.ribbon_unselected[0]
     };
     let left_separator = style!(foreground_color, background_color).paint(separator);
     let mut tab_text_len = text.width() + (separator_width * 2) + 2; // + 2 for padding
@@ -85,7 +86,7 @@ pub fn tab_style(
     mut tabname: String,
     tab: &TabInfo,
     mut is_alternate_tab: bool,
-    palette: Palette,
+    palette: Styling,
     capabilities: PluginCapabilities,
 ) -> LinePart {
     let separator = tab_separator(capabilities);
diff --git a/default-plugins/status-bar/src/main.rs b/default-plugins/status-bar/src/main.rs
index 00a8b7aceb..6a7fae40b0 100644
--- a/default-plugins/status-bar/src/main.rs
+++ b/default-plugins/status-bar/src/main.rs
@@ -91,9 +91,9 @@ fn color_elements(palette: Styling, different_color_alternates: bool) -> Colored
     let background = palette.text_unselected[5];
     let foreground = palette.text_unselected[0];
     let alternate_background_color = if different_color_alternates {
-        palette.text_unselected[1]
+        palette.ribbon_unselected[3]
     } else {
-        palette.text_unselected[5]
+        palette.ribbon_unselected[5]
     };
     ColoredElements {
         selected: SegmentStyle {
diff --git a/default-plugins/tab-bar/src/line.rs b/default-plugins/tab-bar/src/line.rs
index 349981f4d8..c4ccbae1c5 100644
--- a/default-plugins/tab-bar/src/line.rs
+++ b/default-plugins/tab-bar/src/line.rs
@@ -21,7 +21,7 @@ fn populate_tabs_in_tab_line(
     tabs_after_active: &mut Vec<LinePart>,
     tabs_to_render: &mut Vec<LinePart>,
     cols: usize,
-    palette: Palette,
+    palette: Styling,
     capabilities: PluginCapabilities,
 ) {
     let mut middle_size = get_current_title_len(tabs_to_render);
@@ -113,7 +113,7 @@ fn populate_tabs_in_tab_line(
 
 fn left_more_message(
     tab_count_to_the_left: usize,
-    palette: Palette,
+    palette: Styling,
     separator: &str,
     tab_index: usize,
 ) -> LinePart {
@@ -128,13 +128,12 @@ fn left_more_message(
     // 238
     // chars length plus separator length on both sides
     let more_text_len = more_text.width() + 2 * separator.width();
-    let (text_color, sep_color) = match palette.theme_hue {
-        ThemeHue::Dark => (palette.white, palette.black),
-        ThemeHue::Light => (palette.black, palette.white),
-    };
-    let left_separator = style!(sep_color, palette.orange).paint(separator);
-    let more_styled_text = style!(text_color, palette.orange).bold().paint(more_text);
-    let right_separator = style!(palette.orange, sep_color).paint(separator);
+    let (text_color, sep_color) = (palette.text_unselected[0], palette.text_unselected[5]);
+    let left_separator = style!(sep_color, palette.ribbon_unselected[5]).paint(separator);
+    let more_styled_text = style!(text_color, palette.ribbon_unselected[5])
+        .bold()
+        .paint(more_text);
+    let right_separator = style!(palette.ribbon_unselected[5], sep_color).paint(separator);
     let more_styled_text =
         ANSIStrings(&[left_separator, more_styled_text, right_separator]).to_string();
     LinePart {
@@ -146,7 +145,7 @@ fn left_more_message(
 
 fn right_more_message(
     tab_count_to_the_right: usize,
-    palette: Palette,
+    palette: Styling,
     separator: &str,
     tab_index: usize,
 ) -> LinePart {
@@ -160,13 +159,12 @@ fn right_more_message(
     };
     // chars length plus separator length on both sides
     let more_text_len = more_text.width() + 2 * separator.width();
-    let (text_color, sep_color) = match palette.theme_hue {
-        ThemeHue::Dark => (palette.white, palette.black),
-        ThemeHue::Light => (palette.black, palette.white),
-    };
-    let left_separator = style!(sep_color, palette.orange).paint(separator);
-    let more_styled_text = style!(text_color, palette.orange).bold().paint(more_text);
-    let right_separator = style!(palette.orange, sep_color).paint(separator);
+    let (text_color, sep_color) = (palette.text_unselected[0], palette.text_unselected[5]);
+    let left_separator = style!(sep_color, palette.ribbon_unselected[5]).paint(separator);
+    let more_styled_text = style!(text_color, palette.ribbon_unselected[5])
+        .bold()
+        .paint(more_text);
+    let right_separator = style!(palette.ribbon_unselected[5], sep_color).paint(separator);
     let more_styled_text =
         ANSIStrings(&[left_separator, more_styled_text, right_separator]).to_string();
     LinePart {
@@ -176,18 +174,12 @@ fn right_more_message(
     }
 }
 
-fn tab_line_prefix(session_name: Option<&str>, palette: Palette, cols: usize) -> Vec<LinePart> {
+fn tab_line_prefix(session_name: Option<&str>, palette: Styling, cols: usize) -> Vec<LinePart> {
     let prefix_text = " Zellij ".to_string();
 
     let prefix_text_len = prefix_text.chars().count();
-    let text_color = match palette.theme_hue {
-        ThemeHue::Dark => palette.white,
-        ThemeHue::Light => palette.black,
-    };
-    let bg_color = match palette.theme_hue {
-        ThemeHue::Dark => palette.black,
-        ThemeHue::Light => palette.white,
-    };
+    let text_color = palette.text_unselected[0];
+    let bg_color = palette.text_unselected[5];
     let prefix_styled_text = style!(text_color, bg_color).bold().paint(prefix_text);
     let mut parts = vec![LinePart {
         part: prefix_styled_text.to_string(),
@@ -197,10 +189,7 @@ fn tab_line_prefix(session_name: Option<&str>, palette: Palette, cols: usize) ->
     if let Some(name) = session_name {
         let name_part = format!("({}) ", name);
         let name_part_len = name_part.width();
-        let text_color = match palette.theme_hue {
-            ThemeHue::Dark => palette.white,
-            ThemeHue::Light => palette.black,
-        };
+        let text_color = palette.text_unselected[0];
         let name_part_styled_text = style!(text_color, bg_color).bold().paint(name_part);
         if cols.saturating_sub(prefix_text_len) >= name_part_len {
             parts.push(LinePart {
@@ -226,7 +215,7 @@ pub fn tab_line(
     mut all_tabs: Vec<LinePart>,
     active_tab_index: usize,
     cols: usize,
-    palette: Palette,
+    palette: Styling,
     capabilities: PluginCapabilities,
     hide_session_name: bool,
     tab_info: Option<&TabInfo>,
diff --git a/default-plugins/tab-bar/src/main.rs b/default-plugins/tab-bar/src/main.rs
index 8230467d1a..e7d794a314 100644
--- a/default-plugins/tab-bar/src/main.rs
+++ b/default-plugins/tab-bar/src/main.rs
@@ -118,7 +118,7 @@ impl ZellijPlugin for State {
                 tabname,
                 t,
                 is_alternate_tab,
-                self.mode_info.style.colors,
+                self.mode_info.style.styling,
                 self.mode_info.capabilities,
             );
             is_alternate_tab = !is_alternate_tab;
@@ -129,7 +129,7 @@ impl ZellijPlugin for State {
             all_tabs,
             active_tab_index,
             cols.saturating_sub(1),
-            self.mode_info.style.colors,
+            self.mode_info.style.styling,
             self.mode_info.capabilities,
             self.mode_info.style.hide_session_name,
             self.tabs.iter().find(|t| t.active),
@@ -142,10 +142,7 @@ impl ZellijPlugin for State {
             .iter()
             .fold(String::new(), |output, part| output + &part.part);
 
-        let background = match self.mode_info.style.colors.theme_hue {
-            ThemeHue::Dark => self.mode_info.style.colors.black,
-            ThemeHue::Light => self.mode_info.style.colors.white,
-        };
+        let background = self.mode_info.style.styling.text_unselected[5];
         match background {
             PaletteColor::Rgb((r, g, b)) => {
                 print!("{}\u{1b}[48;2;{};{};{}m\u{1b}[0K", output, r, g, b);
diff --git a/default-plugins/tab-bar/src/tab.rs b/default-plugins/tab-bar/src/tab.rs
index 5044ac8722..86215efd95 100644
--- a/default-plugins/tab-bar/src/tab.rs
+++ b/default-plugins/tab-bar/src/tab.rs
@@ -4,7 +4,7 @@ use unicode_width::UnicodeWidthStr;
 use zellij_tile::prelude::*;
 use zellij_tile_utils::style;
 
-fn cursors(focused_clients: &[ClientId], palette: Palette) -> (Vec<ANSIString>, usize) {
+fn cursors(focused_clients: &[ClientId], palette: Styling) -> (Vec<ANSIString>, usize) {
     // cursor section, text length
     let mut len = 0;
     let mut cursors = vec![];
@@ -21,26 +21,31 @@ pub fn render_tab(
     text: String,
     tab: &TabInfo,
     is_alternate_tab: bool,
-    palette: Palette,
+    palette: Styling,
     separator: &str,
 ) -> LinePart {
     let focused_clients = tab.other_focused_clients.as_slice();
     let separator_width = separator.width();
-    let alternate_tab_color = match palette.theme_hue {
-        // TODO: only do this if we don't have the arrow capabilities
-        ThemeHue::Dark => palette.white,
-        ThemeHue::Light => palette.black,
+
+    let alternate_tab_color = if is_alternate_tab {
+        palette.ribbon_unselected[1]
+    } else {
+        palette.ribbon_unselected[5]
     };
     let background_color = if tab.active {
-        palette.green
+        palette.ribbon_selected[5]
     } else if is_alternate_tab {
         alternate_tab_color
     } else {
-        palette.fg
+        palette.ribbon_unselected[5]
     };
-    let foreground_color = match palette.theme_hue {
-        ThemeHue::Dark => palette.black,
-        ThemeHue::Light => palette.white,
+    let foreground_color = if tab.active {
+        palette.ribbon_selected[0]
+    } else {
+        palette.ribbon_unselected[0]
+    };
+    let alternate_tab_color = if is_alternate_tab {
+        // TODO: only do this if we don't have the arrow capabilities
     };
     let left_separator = style!(foreground_color, background_color).paint(separator);
     let mut tab_text_len = text.width() + (separator_width * 2) + 2; // +2 for padding
@@ -84,7 +89,7 @@ pub fn tab_style(
     mut tabname: String,
     tab: &TabInfo,
     mut is_alternate_tab: bool,
-    palette: Palette,
+    palette: Styling,
     capabilities: PluginCapabilities,
 ) -> LinePart {
     let separator = tab_separator(capabilities);
diff --git a/zellij-server/src/ui/pane_boundaries_frame.rs b/zellij-server/src/ui/pane_boundaries_frame.rs
index 57cff1ce42..08ff6ae2d8 100644
--- a/zellij-server/src/ui/pane_boundaries_frame.rs
+++ b/zellij-server/src/ui/pane_boundaries_frame.rs
@@ -117,7 +117,7 @@ impl PaneFrame {
         self.color = Some(color);
     }
     fn client_cursor(&self, client_id: ClientId) -> Vec<TerminalCharacter> {
-        let color = client_id_to_colors(client_id, self.style.colors);
+        let color = client_id_to_colors(client_id, self.style.styling);
         background_color(" ", color.map(|c| c.0))
     }
     fn get_corner(&self, corner: &'static str) -> &'static str {
@@ -773,9 +773,9 @@ impl PaneFrame {
                 let exited_text = "EXIT CODE: ";
                 let exit_code_text = format!("{}", exit_code);
                 let exit_code_color = if exit_code == 0 {
-                    self.style.colors.green
+                    self.style.styling.exit_code_success[0]
                 } else {
-                    self.style.colors.red
+                    self.style.styling.exit_code_error[0]
                 };
                 let right_bracket = " ] ";
                 first_part.append(&mut foreground_color(left_bracket, self.color));
diff --git a/zellij-server/src/ui/pane_contents_and_ui.rs b/zellij-server/src/ui/pane_contents_and_ui.rs
index 6ff0e920b7..0f4ac2073b 100644
--- a/zellij-server/src/ui/pane_contents_and_ui.rs
+++ b/zellij-server/src/ui/pane_contents_and_ui.rs
@@ -135,7 +135,7 @@ impl<'a> PaneContentsAndUi<'a> {
                 .with_context(|| {
                     format!("failed to render fake cursor if needed for client {client_id}")
                 })?;
-            if let Some(colors) = client_id_to_colors(*fake_cursor_client_id, self.style.colors) {
+            if let Some(colors) = client_id_to_colors(*fake_cursor_client_id, self.style.styling) {
                 if let Some(vte_output) = self.pane.render_fake_cursor(colors.0, colors.1) {
                     self.output.add_post_vte_instruction_to_client(
                         client_id,
@@ -261,11 +261,11 @@ impl<'a> PaneContentsAndUi<'a> {
                     if session_is_mirrored || !self.multiple_users_exist_in_session {
                         Some(self.style.styling.frame_selected[0])
                     } else {
-                        let colors = client_id_to_colors(client_id, self.style.colors);
+                        let colors = client_id_to_colors(client_id, self.style.styling);
                         colors.map(|colors| colors.0)
                     }
                 },
-                _ => Some(self.style.colors.orange),
+                _ => Some(self.style.styling.frame_unselected[0]),
             }
         } else {
             None
diff --git a/zellij-utils/src/data.rs b/zellij-utils/src/data.rs
index 198f1df0e7..a7f3ff62f8 100644
--- a/zellij-utils/src/data.rs
+++ b/zellij-utils/src/data.rs
@@ -23,10 +23,13 @@ pub type ClientId = u16; // TODO: merge with crate type?
 
 pub fn client_id_to_colors(
     client_id: ClientId,
-    colors: Palette,
+    colors: Styling,
 ) -> Option<(PaletteColor, PaletteColor)> {
     // (primary color, secondary color)
+    // TODO: mapping of client colors
     match client_id {
+        _ => Some((colors.text_unselected[0], colors.text_unselected[5])),
+        /*
         1 => Some((colors.magenta, colors.black)),
         2 => Some((colors.blue, colors.black)),
         3 => Some((colors.purple, colors.black)),
@@ -38,6 +41,7 @@ pub fn client_id_to_colors(
         9 => Some((colors.pink, colors.black)),
         10 => Some((colors.brown, colors.black)),
         _ => None,
+        */
     }
 }
 

From 3c270756cdf96b7a4c05547c93d3660ad265ffea Mon Sep 17 00:00:00 2001
From: Mark Grey <mgthesecond@spotify.com>
Date: Mon, 1 Apr 2024 12:57:36 -0400
Subject: [PATCH 10/40] plugin loading indication coloration

---
 zellij-server/src/panes/plugin_pane.rs     |  2 +-
 zellij-server/src/ui/loading_indication.rs | 22 +++++++++++++++-------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/zellij-server/src/panes/plugin_pane.rs b/zellij-server/src/panes/plugin_pane.rs
index f7ad387114..eb46f832a8 100644
--- a/zellij-server/src/panes/plugin_pane.rs
+++ b/zellij-server/src/panes/plugin_pane.rs
@@ -120,7 +120,7 @@ impl PluginPane {
         arrow_fonts: bool,
         styled_underlines: bool,
     ) -> Self {
-        let loading_indication = LoadingIndication::new(title.clone()).with_colors(style.colors);
+        let loading_indication = LoadingIndication::new(title.clone()).with_colors(style.styling);
         let initial_loading_message = loading_indication.to_string();
         let mut plugin = PluginPane {
             pid,
diff --git a/zellij-server/src/ui/loading_indication.rs b/zellij-server/src/ui/loading_indication.rs
index 1c77d03983..0ba21ca87e 100644
--- a/zellij-server/src/ui/loading_indication.rs
+++ b/zellij-server/src/ui/loading_indication.rs
@@ -1,7 +1,7 @@
 use std::fmt::{Display, Error, Formatter};
 
 use zellij_utils::{
-    data::{Palette, PaletteColor},
+    data::{PaletteColor, Styling},
     errors::prelude::*,
 };
 
@@ -24,7 +24,7 @@ pub struct LoadingIndication {
     error: Option<String>,
     animation_offset: usize,
     plugin_name: String,
-    terminal_emulator_colors: Option<Palette>,
+    terminal_emulator_colors: Option<Styling>,
     override_previous_error: bool,
 }
 
@@ -39,7 +39,7 @@ impl LoadingIndication {
     pub fn set_name(&mut self, plugin_name: String) {
         self.plugin_name = plugin_name;
     }
-    pub fn with_colors(mut self, terminal_emulator_colors: Palette) -> Self {
+    pub fn with_colors(mut self, terminal_emulator_colors: Styling) -> Self {
         self.terminal_emulator_colors = Some(terminal_emulator_colors);
         self
     }
@@ -142,19 +142,27 @@ macro_rules! style {
 impl Display for LoadingIndication {
     fn fmt(&self, f: &mut Formatter) -> Result<(), Error> {
         let cyan = match self.terminal_emulator_colors {
-            Some(terminal_emulator_colors) => style!(terminal_emulator_colors.cyan).bold(),
+            Some(terminal_emulator_colors) => {
+                style!(terminal_emulator_colors.exit_code_success[1]).bold()
+            },
             None => ansi_term::Style::new(),
         };
         let green = match self.terminal_emulator_colors {
-            Some(terminal_emulator_colors) => style!(terminal_emulator_colors.green).bold(),
+            Some(terminal_emulator_colors) => {
+                style!(terminal_emulator_colors.exit_code_success[0]).bold()
+            },
             None => ansi_term::Style::new(),
         };
         let yellow = match self.terminal_emulator_colors {
-            Some(terminal_emulator_colors) => style!(terminal_emulator_colors.yellow).bold(),
+            Some(terminal_emulator_colors) => {
+                style!(terminal_emulator_colors.exit_code_error[1]).bold()
+            },
             None => ansi_term::Style::new(),
         };
         let red = match self.terminal_emulator_colors {
-            Some(terminal_emulator_colors) => style!(terminal_emulator_colors.red).bold(),
+            Some(terminal_emulator_colors) => {
+                style!(terminal_emulator_colors.exit_code_error[0]).bold()
+            },
             None => ansi_term::Style::new(),
         };
         let bold = ansi_term::Style::new().bold().italic();

From 5c5f6c9bdc70e48d78295a0f15dd67bd31929450 Mon Sep 17 00:00:00 2001
From: Mark Grey <mgthesecond@spotify.com>
Date: Mon, 1 Apr 2024 13:51:45 -0400
Subject: [PATCH 11/40] correct handling of arrow dividers

---
 default-plugins/status-bar/src/main.rs    | 42 ++++++++++++++---------
 zellij-server/src/ui/components/ribbon.rs |  9 ++---
 2 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/default-plugins/status-bar/src/main.rs b/default-plugins/status-bar/src/main.rs
index 6a7fae40b0..76bb64f1ab 100644
--- a/default-plugins/status-bar/src/main.rs
+++ b/default-plugins/status-bar/src/main.rs
@@ -97,18 +97,18 @@ fn color_elements(palette: Styling, different_color_alternates: bool) -> Colored
     };
     ColoredElements {
         selected: SegmentStyle {
-            prefix_separator: style!(palette.ribbon_selected[0], palette.ribbon_selected[5]),
+            prefix_separator: style!(background, palette.ribbon_selected[5]),
             char_left_separator: style!(palette.ribbon_selected[0], palette.ribbon_selected[5])
                 .bold(),
             char_shortcut: style!(palette.ribbon_selected[1], palette.ribbon_selected[5]).bold(),
             char_right_separator: style!(palette.ribbon_selected[0], palette.ribbon_selected[5])
                 .bold(),
             styled_text: style!(palette.ribbon_selected[0], palette.ribbon_selected[5]).bold(),
-            suffix_separator: style!(palette.ribbon_selected[5], palette.ribbon_selected[0]).bold(),
+            suffix_separator: style!(palette.ribbon_selected[5], background).bold(),
         },
         unselected: SegmentStyle {
-            prefix_separator: style!(palette.ribbon_unselected[0], palette.ribbon_unselected[5]),
-            char_left_separator: style!(palette.ribbon_unselected[0], palette.ribbon_unselected[5])
+            prefix_separator: style!(background, palette.ribbon_unselected[5]),
+            char_left_separator: style!(palette.ribbon_unselected[1], palette.ribbon_unselected[5])
                 .bold(),
             char_shortcut: style!(palette.ribbon_unselected[2], palette.ribbon_unselected[5])
                 .bold(),
@@ -118,26 +118,36 @@ fn color_elements(palette: Styling, different_color_alternates: bool) -> Colored
             )
             .bold(),
             styled_text: style!(palette.ribbon_unselected[0], palette.ribbon_unselected[5]).bold(),
-            suffix_separator: style!(palette.ribbon_unselected[5], palette.ribbon_selected[0])
-                .bold(),
+            suffix_separator: style!(palette.ribbon_unselected[5], background).bold(),
         },
         unselected_alternate: SegmentStyle {
-            prefix_separator: style!(palette.ribbon_unselected[0], alternate_background_color),
-            char_left_separator: style!(palette.ribbon_unselected[0], alternate_background_color)
+            prefix_separator: style!(background, alternate_background_color),
+            char_left_separator: style!(palette.ribbon_unselected[1], alternate_background_color)
                 .bold(),
-            char_shortcut: style!(palette.ribbon_unselected[1], alternate_background_color).bold(),
-            char_right_separator: style!(palette.ribbon_unselected[0], alternate_background_color)
+            char_shortcut: style!(palette.ribbon_unselected[2], alternate_background_color).bold(),
+            char_right_separator: style!(palette.ribbon_unselected[1], alternate_background_color)
                 .bold(),
             styled_text: style!(palette.ribbon_unselected[0], alternate_background_color).bold(),
             suffix_separator: style!(alternate_background_color, background).bold(),
         },
         disabled: SegmentStyle {
-            prefix_separator: style!(background, foreground),
-            char_left_separator: style!(background, foreground).dimmed().italic(),
-            char_shortcut: style!(background, foreground).dimmed().italic(),
-            char_right_separator: style!(background, foreground).dimmed().italic(),
-            styled_text: style!(background, foreground).dimmed().italic(),
-            suffix_separator: style!(foreground, background),
+            prefix_separator: style!(background, palette.ribbon_unselected[5]),
+            char_left_separator: style!(palette.ribbon_unselected[0], palette.ribbon_unselected[5])
+                .dimmed()
+                .italic(),
+            char_shortcut: style!(palette.ribbon_unselected[0], palette.ribbon_unselected[5])
+                .dimmed()
+                .italic(),
+            char_right_separator: style!(
+                palette.ribbon_unselected[0],
+                palette.ribbon_unselected[5]
+            )
+            .dimmed()
+            .italic(),
+            styled_text: style!(palette.ribbon_unselected[0], palette.ribbon_unselected[5])
+                .dimmed()
+                .italic(),
+            suffix_separator: style!(palette.ribbon_unselected[5], background),
         },
         superkey_prefix: style!(foreground, background).bold(),
         superkey_suffix_separator: style!(background, background),
diff --git a/zellij-server/src/ui/components/ribbon.rs b/zellij-server/src/ui/components/ribbon.rs
index 640b54a8b8..78fcf79ca1 100644
--- a/zellij-server/src/ui/components/ribbon.rs
+++ b/zellij-server/src/ui/components/ribbon.rs
@@ -12,17 +12,18 @@ pub fn ribbon(
     component_coordinates: Option<Coordinates>,
 ) -> Vec<u8> {
     let colors = style.styling;
+    let background = colors.text_unselected[5];
     let (first_arrow_styles, text_style, last_arrow_styles) = if content.selected {
         (
+            character_style(background, colors.ribbon_selected[5]),
             character_style(colors.ribbon_selected[0], colors.ribbon_selected[5]),
-            character_style(colors.ribbon_selected[0], colors.ribbon_selected[5]),
-            character_style(colors.ribbon_selected[5], colors.ribbon_selected[0]),
+            character_style(colors.ribbon_selected[5], background),
         )
     } else {
         (
+            character_style(background, colors.ribbon_unselected[5]),
             character_style(colors.ribbon_unselected[0], colors.ribbon_unselected[5]),
-            character_style(colors.ribbon_unselected[0], colors.ribbon_unselected[5]),
-            character_style(colors.ribbon_unselected[5], colors.ribbon_unselected[0]),
+            character_style(colors.ribbon_unselected[5], background),
         )
     };
     let (text, _text_width) =

From 4e67c80cc3beeeba650764b1d7643228958bbe2a Mon Sep 17 00:00:00 2001
From: Mark Grey <mgthesecond@spotify.com>
Date: Mon, 1 Apr 2024 16:11:29 -0400
Subject: [PATCH 12/40] session manager prompt coloration

---
 default-plugins/session-manager/src/main.rs   |   2 +-
 .../session-manager/src/ui/components.rs      | 154 ++++++++++--------
 2 files changed, 85 insertions(+), 71 deletions(-)

diff --git a/default-plugins/session-manager/src/main.rs b/default-plugins/session-manager/src/main.rs
index 9aebb6df52..66000ac5f2 100644
--- a/default-plugins/session-manager/src/main.rs
+++ b/default-plugins/session-manager/src/main.rs
@@ -93,7 +93,7 @@ impl ZellijPlugin for State {
         let mut should_render = false;
         match event {
             Event::ModeUpdate(mode_info) => {
-                self.colors = Colors::new(mode_info.style.colors);
+                self.colors = Colors::new(mode_info.style.styling);
                 should_render = true;
             },
             Event::Key(key) => {
diff --git a/default-plugins/session-manager/src/ui/components.rs b/default-plugins/session-manager/src/ui/components.rs
index 5c265f5426..f295399ded 100644
--- a/default-plugins/session-manager/src/ui/components.rs
+++ b/default-plugins/session-manager/src/ui/components.rs
@@ -83,9 +83,12 @@ impl ListItem {
             let mut remaining_cols = max_cols;
             for span in session_name {
                 span.render(
-                    indices
-                        .clone()
-                        .map(|i| (SpanStyle::ForegroundBold(self.colors.palette.magenta), i)),
+                    indices.clone().map(|i| {
+                        (
+                            SpanStyle::ForegroundBold(self.colors.palette.text_unselected[4]),
+                            i,
+                        )
+                    }),
                     &mut line_to_render,
                     &mut remaining_cols,
                 );
@@ -102,9 +105,12 @@ impl ListItem {
             let mut remaining_cols = max_cols;
             for span in tab_name {
                 span.render(
-                    indices
-                        .clone()
-                        .map(|i| (SpanStyle::ForegroundBold(self.colors.palette.magenta), i)),
+                    indices.clone().map(|i| {
+                        (
+                            SpanStyle::ForegroundBold(self.colors.palette.text_unselected[4]),
+                            i,
+                        )
+                    }),
                     &mut line_to_render,
                     &mut remaining_cols,
                 );
@@ -116,9 +122,12 @@ impl ListItem {
             let mut remaining_cols = max_cols;
             for span in pane_name {
                 span.render(
-                    indices
-                        .clone()
-                        .map(|i| (SpanStyle::ForegroundBold(self.colors.palette.magenta), i)),
+                    indices.clone().map(|i| {
+                        (
+                            SpanStyle::ForegroundBold(self.colors.palette.text_unselected[4]),
+                            i,
+                        )
+                    }),
                     &mut line_to_render,
                     &mut remaining_cols,
                 );
@@ -297,11 +306,11 @@ impl LineToRender {
     pub fn make_selected_as_search(&mut self, add_arrows: bool) {
         self.is_selected = true;
         let arrows = if add_arrows {
-            self.colors.magenta(" <↓↑> ")
+            self.colors.shortcuts(" <↓↑> ")
         } else {
             "      ".to_owned()
         };
-        match self.colors.palette.bg {
+        match self.colors.palette.text_selected[5] {
             PaletteColor::EightBit(byte) => {
                 self.line = format!(
                     "\u{1b}[48;5;{byte}m\u{1b}[K\u{1b}[48;5;{byte}m{arrows}{}",
@@ -319,11 +328,11 @@ impl LineToRender {
     pub fn make_selected(&mut self, add_arrows: bool) {
         self.is_selected = true;
         let arrows = if add_arrows {
-            self.colors.magenta("<←↓↑→>")
+            self.colors.shortcuts("<←↓↑→>")
         } else {
             "      ".to_owned()
         };
-        match self.colors.palette.bg {
+        match self.colors.palette.text_selected[5] {
             PaletteColor::EightBit(byte) => {
                 self.line = format!(
                     "\u{1b}[48;5;{byte}m\u{1b}[K\u{1b}[48;5;{byte}m{arrows}{}",
@@ -343,7 +352,7 @@ impl LineToRender {
 
         let more = if self.truncated_result_count > 0 {
             self.colors
-                .red(&format!(" [+{}]", self.truncated_result_count))
+                .exit_code_error(&format!(" [+{}]", self.truncated_result_count))
         } else {
             String::new()
         };
@@ -368,12 +377,12 @@ pub fn build_session_ui_line(session_ui_info: &SessionUiInfo, colors: Colors) ->
         .iter()
         .fold(0, |acc, tab| acc + tab.panes.len());
     let tab_count = format!("{}", tab_count_text);
-    let tab_count_styled = colors.cyan(&tab_count);
+    let tab_count_styled = colors.tab_count(&tab_count);
     let total_pane_count = format!("{}", total_pane_count_text);
-    let total_pane_count_styled = colors.green(&total_pane_count);
+    let total_pane_count_styled = colors.pane_count_search_prompt(&total_pane_count);
     let session_name = &session_ui_info.name;
     let connected_users = format!("{}", session_ui_info.connected_users);
-    let connected_users_styled = colors.orange(&connected_users);
+    let connected_users_styled = colors.connected_users(&connected_users);
     let session_bullet_span =
         UiSpan::UiSpanTelescope(UiSpanTelescope::new(vec![StringAndLength::new(
             format!(" > "),
@@ -381,7 +390,7 @@ pub fn build_session_ui_line(session_ui_info: &SessionUiInfo, colors: Colors) ->
         )]));
     let session_name_span = UiSpan::TruncatableUiSpan(TruncatableUiSpan::new(
         session_name.clone(),
-        SpanStyle::ForegroundBold(colors.palette.orange),
+        SpanStyle::ForegroundBold(colors.palette.exit_code_success[0]),
     ));
     let tab_and_pane_count = UiSpan::UiSpanTelescope(UiSpanTelescope::new(vec![
         StringAndLength::new(
@@ -409,9 +418,9 @@ pub fn build_session_ui_line(session_ui_info: &SessionUiInfo, colors: Colors) ->
     ui_spans.push(connected_users_count);
     if session_ui_info.is_current_session {
         let current_session_indication = UiSpan::UiSpanTelescope(UiSpanTelescope::new(vec![
-            StringAndLength::new(colors.orange(&format!(" <CURRENT SESSION>")), 18),
-            StringAndLength::new(colors.orange(&format!(" <CURRENT>")), 10),
-            StringAndLength::new(colors.orange(&format!(" <C>")), 4),
+            StringAndLength::new(colors.connected_users(&format!(" <CURRENT SESSION>")), 18),
+            StringAndLength::new(colors.connected_users(&format!(" <CURRENT>")), 10),
+            StringAndLength::new(colors.connected_users(&format!(" <C>")), 4),
         ]));
         ui_spans.push(current_session_indication);
     }
@@ -423,7 +432,7 @@ pub fn build_tab_ui_line(tab_ui_info: &TabUiInfo, colors: Colors) -> Vec<UiSpan>
     let tab_name = &tab_ui_info.name;
     let pane_count_text = tab_ui_info.panes.len();
     let pane_count = format!("{}", pane_count_text);
-    let pane_count_styled = colors.green(&pane_count);
+    let pane_count_styled = colors.pane_count_search_prompt(&pane_count);
     let tab_bullet_span =
         UiSpan::UiSpanTelescope(UiSpanTelescope::new(vec![StringAndLength::new(
             format!("  - "),
@@ -431,7 +440,7 @@ pub fn build_tab_ui_line(tab_ui_info: &TabUiInfo, colors: Colors) -> Vec<UiSpan>
         )]));
     let tab_name_span = UiSpan::TruncatableUiSpan(TruncatableUiSpan::new(
         tab_name.clone(),
-        SpanStyle::ForegroundBold(colors.palette.cyan),
+        SpanStyle::ForegroundBold(colors.palette.text_unselected[2]),
     ));
     let connected_users_count_span = UiSpan::UiSpanTelescope(UiSpanTelescope::new(vec![
         StringAndLength::new(
@@ -455,9 +464,9 @@ pub fn build_pane_ui_line(pane_ui_info: &PaneUiInfo, colors: Colors) -> Vec<UiSp
     let exit_code = pane_ui_info.exit_code.map(|exit_code_number| {
         let exit_code = format!("{}", exit_code_number);
         let exit_code = if exit_code_number == 0 {
-            colors.green(&exit_code)
+            colors.pane_count_search_prompt(&exit_code)
         } else {
-            colors.red(&exit_code)
+            colors.exit_code_error(&exit_code)
         };
         exit_code
     });
@@ -505,7 +514,7 @@ pub fn minimize_lines(
 }
 
 pub fn render_prompt(search_term: &str, colors: Colors, x: usize, y: usize) {
-    let prompt = colors.green(&format!("Search:"));
+    let prompt = colors.pane_count_search_prompt(&format!("Search:"));
     let search_term = colors.bold(&format!("{}_", search_term));
     println!("\u{1b}[{};{}H{} {}\n", y + 1, x, prompt, search_term);
 }
@@ -564,10 +573,10 @@ fn render_new_session_folder_prompt(
             let new_session_path = new_session_folder.clone();
             let new_session_folder = new_session_folder.display().to_string();
             let change_folder_shortcut_text = "<Ctrl f>";
-            let change_folder_shortcut = colors.magenta(&change_folder_shortcut_text);
+            let change_folder_shortcut = colors.shortcuts(&change_folder_shortcut_text);
             let to_change = "to change";
             let reset_folder_shortcut_text = "<Ctrl c>";
-            let reset_folder_shortcut = colors.magenta(reset_folder_shortcut_text);
+            let reset_folder_shortcut = colors.shortcuts(reset_folder_shortcut_text);
             let to_reset = "to reset";
             if max_cols
                 >= folder_prompt.width()
@@ -581,8 +590,8 @@ fn render_new_session_folder_prompt(
                 print!(
                     "\u{1b}[m{}{} {} ({} {}, {} {})",
                     format!("\u{1b}[{};{}H", y + 1, x + 1),
-                    colors.green(folder_prompt),
-                    colors.orange(&new_session_folder),
+                    colors.session_name(folder_prompt),
+                    colors.pane_count_search_prompt(&new_session_folder),
                     change_folder_shortcut,
                     to_change,
                     reset_folder_shortcut,
@@ -600,8 +609,8 @@ fn render_new_session_folder_prompt(
                 print!(
                     "\u{1b}[m{}{} {} ({} {}, {} {})",
                     format!("\u{1b}[{};{}H", y + 1, x + 1),
-                    colors.green(short_folder_prompt),
-                    colors.orange(&new_session_folder),
+                    colors.session_name(short_folder_prompt),
+                    colors.pane_count_search_prompt(&new_session_folder),
                     change_folder_shortcut,
                     to_change,
                     reset_folder_shortcut,
@@ -617,8 +626,8 @@ fn render_new_session_folder_prompt(
                 print!(
                     "\u{1b}[m{}{} {} ({}/{})",
                     format!("\u{1b}[{};{}H", y + 1, x + 1),
-                    colors.green(short_folder_prompt),
-                    colors.orange(&new_session_folder),
+                    colors.session_name(short_folder_prompt),
+                    colors.pane_count_search_prompt(&new_session_folder),
                     change_folder_shortcut,
                     reset_folder_shortcut,
                 );
@@ -635,8 +644,8 @@ fn render_new_session_folder_prompt(
                 print!(
                     "\u{1b}[m{}{} {} ({}/{})",
                     format!("\u{1b}[{};{}H", y + 1, x + 1),
-                    colors.green(short_folder_prompt),
-                    colors.orange(&truncated_path),
+                    colors.session_name(short_folder_prompt),
+                    colors.pane_count_search_prompt(&truncated_path),
                     change_folder_shortcut,
                     reset_folder_shortcut,
                 );
@@ -646,7 +655,7 @@ fn render_new_session_folder_prompt(
             let folder_prompt = "New session folder:";
             let short_folder_prompt = "Folder:";
             let change_folder_shortcut_text = "<Ctrl f>";
-            let change_folder_shortcut = colors.magenta(change_folder_shortcut_text);
+            let change_folder_shortcut = colors.shortcuts(change_folder_shortcut_text);
             let to_set = "to set";
 
             if max_cols
@@ -655,7 +664,7 @@ fn render_new_session_folder_prompt(
                 print!(
                     "\u{1b}[m{}{} ({} {})",
                     format!("\u{1b}[{};{}H", y + 1, x + 1),
-                    colors.green(folder_prompt),
+                    colors.session_name(folder_prompt),
                     change_folder_shortcut,
                     to_set,
                 );
@@ -668,7 +677,7 @@ fn render_new_session_folder_prompt(
                 print!(
                     "\u{1b}[m{}{} ({} {})",
                     format!("\u{1b}[{};{}H", y + 1, x + 1),
-                    colors.green(short_folder_prompt),
+                    colors.session_name(short_folder_prompt),
                     change_folder_shortcut,
                     to_set,
                 );
@@ -676,7 +685,7 @@ fn render_new_session_folder_prompt(
                 print!(
                     "\u{1b}[m{}{} {}",
                     format!("\u{1b}[{};{}H", y + 1, x + 1),
-                    colors.green(short_folder_prompt),
+                    colors.session_name(short_folder_prompt),
                     change_folder_shortcut,
                 );
             }
@@ -692,7 +701,7 @@ pub fn render_new_session_block(
     x: usize,
     y: usize,
 ) {
-    let enter = colors.magenta("<ENTER>");
+    let enter = colors.shortcuts("<ENTER>");
     if new_session_info.entering_new_session_name() {
         let prompt = "New session name:";
         let long_instruction = "when done, blank for random";
@@ -703,8 +712,8 @@ pub fn render_new_session_block(
             println!(
                 "\u{1b}[m{}{} {}_ ({} {})",
                 format!("\u{1b}[{};{}H", y + 1, x + 1),
-                colors.green(prompt),
-                colors.orange(&new_session_name),
+                colors.session_name(prompt),
+                colors.pane_count_search_prompt(&new_session_name),
                 enter,
                 long_instruction,
             );
@@ -729,8 +738,8 @@ pub fn render_new_session_block(
             println!(
                 "\u{1b}[m{}{} {}_ {}",
                 format!("\u{1b}[{};{}H", y + 1, x + 1),
-                colors.green(prompt),
-                colors.orange(&new_session_name),
+                colors.session_name(prompt),
+                colors.pane_count_search_prompt(&new_session_name),
                 enter,
             );
         }
@@ -742,23 +751,23 @@ pub fn render_new_session_block(
         };
         let prompt = "New session name:";
         let long_instruction = "to correct";
-        let esc = colors.magenta("<ESC>");
+        let esc = colors.shortcuts("<ESC>");
         if max_cols_of_new_session_block
             > prompt.width() + long_instruction.width() + new_session_name.width() + 15
         {
             println!(
                 "\u{1b}[m{}{}: {} ({} to correct)",
                 format!("\u{1b}[{};{}H", y + 1, x + 1),
-                colors.green("New session name"),
-                colors.orange(new_session_name),
+                colors.session_name("New session name"),
+                colors.pane_count_search_prompt(new_session_name),
                 esc,
             );
         } else {
             println!(
                 "\u{1b}[m{}{}: {} {}",
                 format!("\u{1b}[{};{}H", y + 1, x + 1),
-                colors.green("New session name"),
-                colors.orange(new_session_name),
+                colors.session_name("New session name"),
+                colors.pane_count_search_prompt(new_session_name),
                 esc,
             );
         }
@@ -892,13 +901,13 @@ pub fn render_controls_line(
             }
         },
         ActiveScreen::AttachToSession => {
-            let rename = colors.magenta("<Ctrl r>");
+            let rename = colors.shortcuts("<Ctrl r>");
             let rename_text = colors.bold("Rename");
-            let disconnect = colors.magenta("<Ctrl x>");
+            let disconnect = colors.shortcuts("<Ctrl x>");
             let disconnect_text = colors.bold("Disconnect others");
-            let kill = colors.magenta("<Del>");
+            let kill = colors.shortcuts("<Del>");
             let kill_text = colors.bold("Kill");
-            let kill_all = colors.magenta("<Ctrl d>");
+            let kill_all = colors.shortcuts("<Ctrl d>");
             let kill_all_text = colors.bold("Kill all");
 
             if max_cols > 90 {
@@ -910,13 +919,13 @@ pub fn render_controls_line(
             }
         },
         ActiveScreen::ResurrectSession => {
-            let arrows = colors.magenta("<↓↑>");
+            let arrows = colors.shortcuts("<↓↑>");
             let navigate = colors.bold("Navigate");
-            let enter = colors.magenta("<ENTER>");
+            let enter = colors.shortcuts("<ENTER>");
             let select = colors.bold("Resurrect");
-            let del = colors.magenta("<DEL>");
+            let del = colors.shortcuts("<DEL>");
             let del_text = colors.bold("Delete");
-            let del_all = colors.magenta("<Ctrl d>");
+            let del_all = colors.shortcuts("<Ctrl d>");
             let del_all_text = colors.bold("Delete all");
 
             if max_cols > 83 {
@@ -932,10 +941,10 @@ pub fn render_controls_line(
 
 #[derive(Debug, Default, Clone, Copy)]
 pub struct Colors {
-    pub palette: Palette,
+    pub palette: Styling,
 }
 impl Colors {
-    pub fn new(palette: Palette) -> Self {
+    pub fn new(palette: Styling) -> Self {
         Colors { palette }
     }
     pub fn bold(&self, text: &str) -> String {
@@ -952,24 +961,29 @@ impl Colors {
             },
         }
     }
-    pub fn orange(&self, text: &str) -> String {
-        self.color(&self.palette.orange, text)
+
+    pub fn session_name(&self, text: &str) -> String {
+        self.color(&self.palette.exit_code_success[1], text)
+    }
+
+    pub fn connected_users(&self, text: &str) -> String {
+        self.color(&self.palette.text_unselected[3], text)
     }
 
-    pub fn green(&self, text: &str) -> String {
-        self.color(&self.palette.green, text)
+    pub fn pane_count_search_prompt(&self, text: &str) -> String {
+        self.color(&self.palette.text_unselected[3], text)
     }
 
-    pub fn red(&self, text: &str) -> String {
-        self.color(&self.palette.red, text)
+    pub fn exit_code_error(&self, text: &str) -> String {
+        self.color(&self.palette.exit_code_error[0], text)
     }
 
-    pub fn cyan(&self, text: &str) -> String {
-        self.color(&self.palette.cyan, text)
+    pub fn tab_count(&self, text: &str) -> String {
+        self.color(&self.palette.text_unselected[2], text)
     }
 
-    pub fn magenta(&self, text: &str) -> String {
-        self.color(&self.palette.magenta, text)
+    pub fn shortcuts(&self, text: &str) -> String {
+        self.color(&self.palette.text_unselected[4], text)
     }
 }
 

From f550aec22044292e10f6675eccc24d64b1028a4d Mon Sep 17 00:00:00 2001
From: Mark Grey <mgthesecond@spotify.com>
Date: Tue, 2 Apr 2024 08:42:28 -0400
Subject: [PATCH 13/40] client id based coloration draft

---
 default-plugins/compact-bar/src/tab.rs        |  2 +-
 default-plugins/tab-bar/src/tab.rs            |  2 +-
 zellij-server/src/ui/pane_boundaries_frame.rs |  2 +-
 zellij-server/src/ui/pane_contents_and_ui.rs  |  8 ++--
 zellij-utils/src/data.rs                      | 48 +++++++++++--------
 5 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/default-plugins/compact-bar/src/tab.rs b/default-plugins/compact-bar/src/tab.rs
index 9479f7fb12..5700b5cb8d 100644
--- a/default-plugins/compact-bar/src/tab.rs
+++ b/default-plugins/compact-bar/src/tab.rs
@@ -9,7 +9,7 @@ fn cursors(focused_clients: &[ClientId], palette: Styling) -> (Vec<ANSIString>,
     let mut len = 0;
     let mut cursors = vec![];
     for client_id in focused_clients.iter() {
-        if let Some(color) = client_id_to_colors(*client_id, palette) {
+        if let Some(color) = client_id_to_colors(*client_id) {
             cursors.push(style!(color.1, color.0).paint(" "));
             len += 1;
         }
diff --git a/default-plugins/tab-bar/src/tab.rs b/default-plugins/tab-bar/src/tab.rs
index 86215efd95..5866c46e8a 100644
--- a/default-plugins/tab-bar/src/tab.rs
+++ b/default-plugins/tab-bar/src/tab.rs
@@ -9,7 +9,7 @@ fn cursors(focused_clients: &[ClientId], palette: Styling) -> (Vec<ANSIString>,
     let mut len = 0;
     let mut cursors = vec![];
     for client_id in focused_clients.iter() {
-        if let Some(color) = client_id_to_colors(*client_id, palette) {
+        if let Some(color) = client_id_to_colors(*client_id) {
             cursors.push(style!(color.1, color.0).paint(" "));
             len += 1;
         }
diff --git a/zellij-server/src/ui/pane_boundaries_frame.rs b/zellij-server/src/ui/pane_boundaries_frame.rs
index 08ff6ae2d8..3c9f798abd 100644
--- a/zellij-server/src/ui/pane_boundaries_frame.rs
+++ b/zellij-server/src/ui/pane_boundaries_frame.rs
@@ -117,7 +117,7 @@ impl PaneFrame {
         self.color = Some(color);
     }
     fn client_cursor(&self, client_id: ClientId) -> Vec<TerminalCharacter> {
-        let color = client_id_to_colors(client_id, self.style.styling);
+        let color = client_id_to_colors(client_id);
         background_color(" ", color.map(|c| c.0))
     }
     fn get_corner(&self, corner: &'static str) -> &'static str {
diff --git a/zellij-server/src/ui/pane_contents_and_ui.rs b/zellij-server/src/ui/pane_contents_and_ui.rs
index 0f4ac2073b..ed6593d2ca 100644
--- a/zellij-server/src/ui/pane_contents_and_ui.rs
+++ b/zellij-server/src/ui/pane_contents_and_ui.rs
@@ -5,9 +5,7 @@ use crate::ui::boundaries::Boundaries;
 use crate::ui::pane_boundaries_frame::FrameParams;
 use crate::ClientId;
 use std::collections::HashMap;
-use zellij_utils::data::{
-    client_id_to_colors, single_client_color, InputMode, PaletteColor, Style,
-};
+use zellij_utils::data::{client_id_to_colors, InputMode, PaletteColor, Style};
 use zellij_utils::errors::prelude::*;
 pub struct PaneContentsAndUi<'a> {
     pane: &'a mut Box<dyn Pane>,
@@ -135,7 +133,7 @@ impl<'a> PaneContentsAndUi<'a> {
                 .with_context(|| {
                     format!("failed to render fake cursor if needed for client {client_id}")
                 })?;
-            if let Some(colors) = client_id_to_colors(*fake_cursor_client_id, self.style.styling) {
+            if let Some(colors) = client_id_to_colors(*fake_cursor_client_id) {
                 if let Some(vte_output) = self.pane.render_fake_cursor(colors.0, colors.1) {
                     self.output.add_post_vte_instruction_to_client(
                         client_id,
@@ -261,7 +259,7 @@ impl<'a> PaneContentsAndUi<'a> {
                     if session_is_mirrored || !self.multiple_users_exist_in_session {
                         Some(self.style.styling.frame_selected[0])
                     } else {
-                        let colors = client_id_to_colors(client_id, self.style.styling);
+                        let colors = client_id_to_colors(client_id);
                         colors.map(|colors| colors.0)
                     }
                 },
diff --git a/zellij-utils/src/data.rs b/zellij-utils/src/data.rs
index a7f3ff62f8..d90e5a32a7 100644
--- a/zellij-utils/src/data.rs
+++ b/zellij-utils/src/data.rs
@@ -2,7 +2,7 @@ use crate::input::actions::Action;
 use crate::input::config::ConversionError;
 use crate::input::keybinds::Keybinds;
 use crate::input::layout::SplitSize;
-use crate::shared::default_palette;
+use crate::shared::{colors as default_colors, default_palette};
 use clap::ArgEnum;
 use serde::{Deserialize, Serialize};
 use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};
@@ -21,27 +21,22 @@ use termwiz::{
 
 pub type ClientId = u16; // TODO: merge with crate type?
 
-pub fn client_id_to_colors(
-    client_id: ClientId,
-    colors: Styling,
-) -> Option<(PaletteColor, PaletteColor)> {
+pub fn client_id_to_colors(client_id: ClientId) -> Option<(PaletteColor, PaletteColor)> {
     // (primary color, secondary color)
-    // TODO: mapping of client colors
+    // TODO: revisit client_id coloration
+    let black = PaletteColor::EightBit(default_colors::BLACK);
     match client_id {
-        _ => Some((colors.text_unselected[0], colors.text_unselected[5])),
-        /*
-        1 => Some((colors.magenta, colors.black)),
-        2 => Some((colors.blue, colors.black)),
-        3 => Some((colors.purple, colors.black)),
-        4 => Some((colors.yellow, colors.black)),
-        5 => Some((colors.cyan, colors.black)),
-        6 => Some((colors.gold, colors.black)),
-        7 => Some((colors.red, colors.black)),
-        8 => Some((colors.silver, colors.black)),
-        9 => Some((colors.pink, colors.black)),
-        10 => Some((colors.brown, colors.black)),
+        1 => Some((PaletteColor::EightBit(default_colors::MAGENTA), black)),
+        2 => Some((PaletteColor::EightBit(default_colors::BLUE), black)),
+        3 => Some((PaletteColor::EightBit(default_colors::PURPLE), black)),
+        4 => Some((PaletteColor::EightBit(default_colors::YELLOW), black)),
+        5 => Some((PaletteColor::EightBit(default_colors::CYAN), black)),
+        6 => Some((PaletteColor::EightBit(default_colors::GOLD), black)),
+        7 => Some((PaletteColor::EightBit(default_colors::RED), black)),
+        8 => Some((PaletteColor::EightBit(default_colors::SILVER), black)),
+        9 => Some((PaletteColor::EightBit(default_colors::PINK), black)),
+        10 => Some((PaletteColor::EightBit(default_colors::BROWN), black)),
         _ => None,
-        */
     }
 }
 
@@ -1182,7 +1177,6 @@ impl From<Palette> for Styling {
                 palette.magenta,
                 palette.bg,
             ],
-            // TODO: update
             text_selected: [
                 palette.white,
                 palette.orange,
@@ -1207,6 +1201,20 @@ impl From<Palette> for Styling {
                 palette.magenta,
                 palette.green,
             ],
+            exit_code_success: [
+                palette.green,
+                palette.cyan,
+                palette.black,
+                palette.magenta,
+                palette.blue,
+            ],
+            exit_code_error: [
+                palette.red,
+                palette.yellow,
+                palette.gold,
+                palette.silver,
+                palette.purple,
+            ],
             ..Default::default() /*
                                  table_title: (),
                                  table_cell_unselected: (),

From 14fd2f93b7daf026775d66b8ffbf230f5ded60f8 Mon Sep 17 00:00:00 2001
From: Mark Grey <mgthesecond@spotify.com>
Date: Tue, 2 Apr 2024 11:31:15 -0400
Subject: [PATCH 14/40] naming for style specification

---
 zellij-utils/src/input/config.rs     | 122 +++++++++++++--------------
 zellij-utils/src/kdl/mod.rs          |  64 ++++++++------
 zellij-utils/src/plugin_api/style.rs |   3 +-
 3 files changed, 102 insertions(+), 87 deletions(-)

diff --git a/zellij-utils/src/input/config.rs b/zellij-utils/src/input/config.rs
index 6ee285fb57..0bb73e3e1e 100644
--- a/zellij-utils/src/input/config.rs
+++ b/zellij-utils/src/input/config.rs
@@ -607,103 +607,103 @@ mod config_test {
                     styling {
                         text_unselected {
                             base "#DCD7BA"
-                            emp1 "#DCD7CD"
-                            emp2 "#DCD8DD"
-                            emp3 "#DCD899"
-                            emp4 "#ACD7CD"
-                            bg   "#1F1F28"
+                            emphasis_1 "#DCD7CD"
+                            emphasis_2 "#DCD8DD"
+                            emphasis_3 "#DCD899"
+                            emphasis_4 "#ACD7CD"
+                            background   "#1F1F28"
                         }
                         text_selected {
                             base "#16161D"
-                            emp1 "#16161D"
-                            emp2 "#16161D"
-                            emp3 "#16161D"
-                            emp4 "#16161D"
-                            bg   "#9CABCA"
+                            emphasis_1 "#16161D"
+                            emphasis_2 "#16161D"
+                            emphasis_3 "#16161D"
+                            emphasis_4 "#16161D"
+                            background   "#9CABCA"
                         }
                         ribbon_unselected {
                             base "#DCD7BA"
-                            emp1 "#7FB4CA"
-                            emp2 "#A3D4D5"
-                            emp3 "#7AA89F"
-                            emp4 "#DCD819"
-                            bg   "#252535"
+                            emphasis_1 "#7FB4CA"
+                            emphasis_2 "#A3D4D5"
+                            emphasis_3 "#7AA89F"
+                            emphasis_4 "#DCD819"
+                            background   "#252535"
                         }
                         ribbon_selected {
                             base "#16161D"
-                            emp1 "#181820"
-                            emp2 "#1A1A22"
-                            emp3 "#2A2A37"
-                            emp4 "#363646"
-                            bg   "#76946A"
+                            emphasis_1 "#181820"
+                            emphasis_2 "#1A1A22"
+                            emphasis_3 "#2A2A37"
+                            emphasis_4 "#363646"
+                            background   "#76946A"
                         }
                         table_title {
                             base "#DCD7BA"
-                            emp1 "#7FB4CA"
-                            emp2 "#A3D4D5"
-                            emp3 "#7AA89F"
-                            emp4 "#DCD819"
-                            bg   "#252535"
+                            emphasis_1 "#7FB4CA"
+                            emphasis_2 "#A3D4D5"
+                            emphasis_3 "#7AA89F"
+                            emphasis_4 "#DCD819"
+                            background   "#252535"
                         }
                         table_cell_unselected {
                             base "#DCD7BA"
-                            emp1 "#DCD7CD"
-                            emp2 "#DCD8DD"
-                            emp3 "#DCD899"
-                            emp4 "#ACD7CD"
-                            bg   "#1F1F28"
+                            emphasis_1 "#DCD7CD"
+                            emphasis_2 "#DCD8DD"
+                            emphasis_3 "#DCD899"
+                            emphasis_4 "#ACD7CD"
+                            background   "#1F1F28"
                         }
                         table_cell_selected {
                             base "#16161D"
-                            emp1 "#181820"
-                            emp2 "#1A1A22"
-                            emp3 "#2A2A37"
-                            emp4 "#363646"
-                            bg   "#76946A"
+                            emphasis_1 "#181820"
+                            emphasis_2 "#1A1A22"
+                            emphasis_3 "#2A2A37"
+                            emphasis_4 "#363646"
+                            background   "#76946A"
                         }
                         list_unselected {
                             base "#DCD7BA"
-                            emp1 "#DCD7CD"
-                            emp2 "#DCD8DD"
-                            emp3 "#DCD899"
-                            emp4 "#ACD7CD"
-                            bg   "#1F1F28"
+                            emphasis_1 "#DCD7CD"
+                            emphasis_2 "#DCD8DD"
+                            emphasis_3 "#DCD899"
+                            emphasis_4 "#ACD7CD"
+                            background   "#1F1F28"
                         }
                         list_selected {
                             base "#16161D"
-                            emp1 "#181820"
-                            emp2 "#1A1A22"
-                            emp3 "#2A2A37"
-                            emp4 "#363646"
-                            bg   "#76946A"
+                            emphasis_1 "#181820"
+                            emphasis_2 "#1A1A22"
+                            emphasis_3 "#2A2A37"
+                            emphasis_4 "#363646"
+                            background   "#76946A"
                         }
                         frame_unselected {
                             base "#DCD8DD"
-                            emp1 "#7FB4CA"
-                            emp2 "#A3D4D5"
-                            emp3 "#7AA89F"
-                            emp4 "#DCD819"
+                            emphasis_1 "#7FB4CA"
+                            emphasis_2 "#A3D4D5"
+                            emphasis_3 "#7AA89F"
+                            emphasis_4 "#DCD819"
                         }
                         frame_selected {
                             base "#76946A"
-                            emp1 "#C34043"
-                            emp2 "#C8C093"
-                            emp3 "#ACD7CD"
-                            emp4 "#DCD819"
+                            emphasis_1 "#C34043"
+                            emphasis_2 "#C8C093"
+                            emphasis_3 "#ACD7CD"
+                            emphasis_4 "#DCD819"
                         }
                         exit_code_success {
                             base "#76946A"
-                            emp1 "#76946A"
-                            emp2 "#76946A"
-                            emp3 "#76946A"
-                            emp4 "#76946A"
+                            emphasis_1 "#76946A"
+                            emphasis_2 "#76946A"
+                            emphasis_3 "#76946A"
+                            emphasis_4 "#76946A"
                         }
                         exit_code_error {
                             base "#C34043"
-                            emp1 "#C34043"
-                            emp2 "#C34043"
-                            emp3 "#C34043"
-                            emp4 "#C34043"
+                            emphasis_1 "#C34043"
+                            emphasis_2 "#C34043"
+                            emphasis_3 "#C34043"
+                            emphasis_4 "#C34043"
                         }
                     }
                 }
diff --git a/zellij-utils/src/kdl/mod.rs b/zellij-utils/src/kdl/mod.rs
index 56fd64b148..8b5acfd094 100644
--- a/zellij-utils/src/kdl/mod.rs
+++ b/zellij-utils/src/kdl/mod.rs
@@ -1991,7 +1991,7 @@ impl UiConfig {
 }
 
 impl Themes {
-    fn color_from_node(
+    fn colors_with_bg_from_node(
         style_node: &KdlNode,
         style_descriptor: &str,
     ) -> Result<[PaletteColor; 6], ConfigError> {
@@ -2001,16 +2001,15 @@ impl Themes {
         );
         Ok([
             PaletteColor::try_from(("base", colors))?,
-            PaletteColor::try_from(("emp1", colors))?,
-            PaletteColor::try_from(("emp2", colors))?,
-            PaletteColor::try_from(("emp3", colors))?,
-            PaletteColor::try_from(("emp4", colors))?,
-            PaletteColor::try_from(("bg", colors))?,
+            PaletteColor::try_from(("emphasis_1", colors))?,
+            PaletteColor::try_from(("emphasis_2", colors))?,
+            PaletteColor::try_from(("emphasis_3", colors))?,
+            PaletteColor::try_from(("emphasis_4", colors))?,
+            PaletteColor::try_from(("background", colors))?,
         ])
     }
 
-    // TODO: const generics etc?
-    fn color_from_node_2(
+    fn colors_from_node(
         style_node: &KdlNode,
         style_descriptor: &str,
     ) -> Result<[PaletteColor; 5], ConfigError> {
@@ -2020,10 +2019,10 @@ impl Themes {
         );
         Ok([
             PaletteColor::try_from(("base", colors))?,
-            PaletteColor::try_from(("emp1", colors))?,
-            PaletteColor::try_from(("emp2", colors))?,
-            PaletteColor::try_from(("emp3", colors))?,
-            PaletteColor::try_from(("emp4", colors))?,
+            PaletteColor::try_from(("emphasis_1", colors))?,
+            PaletteColor::try_from(("emphasis_2", colors))?,
+            PaletteColor::try_from(("emphasis_3", colors))?,
+            PaletteColor::try_from(("emphasis_4", colors))?,
         ])
     }
 
@@ -2037,22 +2036,37 @@ impl Themes {
                 // Newer theme definition with named styles
                 Some(style) => {
                     let s = Styling {
-                        text_unselected: Themes::color_from_node(style, "text_unselected")?,
-                        text_selected: Themes::color_from_node(style, "text_selected")?,
-                        ribbon_unselected: Themes::color_from_node(style, "ribbon_unselected")?,
-                        ribbon_selected: Themes::color_from_node(style, "ribbon_selected")?,
-                        table_title: Themes::color_from_node(style, "table_title")?,
-                        table_cell_unselected: Themes::color_from_node(
+                        text_unselected: Themes::colors_with_bg_from_node(
+                            style,
+                            "text_unselected",
+                        )?,
+                        text_selected: Themes::colors_with_bg_from_node(style, "text_selected")?,
+                        ribbon_unselected: Themes::colors_with_bg_from_node(
+                            style,
+                            "ribbon_unselected",
+                        )?,
+                        ribbon_selected: Themes::colors_with_bg_from_node(
+                            style,
+                            "ribbon_selected",
+                        )?,
+                        table_title: Themes::colors_with_bg_from_node(style, "table_title")?,
+                        table_cell_unselected: Themes::colors_with_bg_from_node(
                             style,
                             "table_cell_unselected",
                         )?,
-                        table_cell_selected: Themes::color_from_node(style, "table_cell_selected")?,
-                        list_unselected: Themes::color_from_node(style, "list_unselected")?,
-                        list_selected: Themes::color_from_node(style, "list_selected")?,
-                        frame_unselected: Themes::color_from_node_2(style, "frame_unselected")?,
-                        frame_selected: Themes::color_from_node_2(style, "frame_selected")?,
-                        exit_code_success: Themes::color_from_node_2(style, "exit_code_success")?,
-                        exit_code_error: Themes::color_from_node_2(style, "exit_code_error")?,
+                        table_cell_selected: Themes::colors_with_bg_from_node(
+                            style,
+                            "table_cell_selected",
+                        )?,
+                        list_unselected: Themes::colors_with_bg_from_node(
+                            style,
+                            "list_unselected",
+                        )?,
+                        list_selected: Themes::colors_with_bg_from_node(style, "list_selected")?,
+                        frame_unselected: Themes::colors_from_node(style, "frame_unselected")?,
+                        frame_selected: Themes::colors_from_node(style, "frame_selected")?,
+                        exit_code_success: Themes::colors_from_node(style, "exit_code_success")?,
+                        exit_code_error: Themes::colors_from_node(style, "exit_code_error")?,
                     };
 
                     Theme {
diff --git a/zellij-utils/src/plugin_api/style.rs b/zellij-utils/src/plugin_api/style.rs
index ae4298550a..fb368e30a3 100644
--- a/zellij-utils/src/plugin_api/style.rs
+++ b/zellij-utils/src/plugin_api/style.rs
@@ -38,7 +38,8 @@ impl TryFrom<Style> for ProtobufStyle {
 }
 
 fn to_array<T, const N: usize>(v: Vec<T>) -> std::result::Result<[T; N], &'static str> {
-    v.try_into().map_err(|_| "darn")
+    v.try_into()
+        .map_err(|_| "Could not obtain array from protobuf field")
 }
 
 #[macro_export]

From ed5a0b62fd58ee9289bd37b2e1be3208c4064a46 Mon Sep 17 00:00:00 2001
From: Mark Grey <mgthesecond@spotify.com>
Date: Tue, 2 Apr 2024 12:00:55 -0400
Subject: [PATCH 15/40] clean up unused params + vars

---
 default-plugins/compact-bar/src/tab.rs | 4 ++--
 default-plugins/tab-bar/src/tab.rs     | 3 ---
 zellij-utils/src/kdl/mod.rs            | 3 +--
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/default-plugins/compact-bar/src/tab.rs b/default-plugins/compact-bar/src/tab.rs
index 5700b5cb8d..51b6ebe3af 100644
--- a/default-plugins/compact-bar/src/tab.rs
+++ b/default-plugins/compact-bar/src/tab.rs
@@ -4,7 +4,7 @@ use unicode_width::UnicodeWidthStr;
 use zellij_tile::prelude::*;
 use zellij_tile_utils::style;
 
-fn cursors(focused_clients: &[ClientId], palette: Styling) -> (Vec<ANSIString>, usize) {
+fn cursors(focused_clients: &[ClientId]) -> (Vec<ANSIString>, usize) {
     // cursor section, text length
     let mut len = 0;
     let mut cursors = vec![];
@@ -52,7 +52,7 @@ pub fn render_tab(
 
     let right_separator = style!(background_color, foreground_color).paint(separator);
     let tab_styled_text = if !focused_clients.is_empty() {
-        let (cursor_section, extra_length) = cursors(focused_clients, palette);
+        let (cursor_section, extra_length) = cursors(focused_clients);
         tab_text_len += extra_length;
         let mut s = String::new();
         let cursor_beginning = style!(foreground_color, background_color)
diff --git a/default-plugins/tab-bar/src/tab.rs b/default-plugins/tab-bar/src/tab.rs
index 5866c46e8a..1a77b9abd3 100644
--- a/default-plugins/tab-bar/src/tab.rs
+++ b/default-plugins/tab-bar/src/tab.rs
@@ -44,9 +44,6 @@ pub fn render_tab(
     } else {
         palette.ribbon_unselected[0]
     };
-    let alternate_tab_color = if is_alternate_tab {
-        // TODO: only do this if we don't have the arrow capabilities
-    };
     let left_separator = style!(foreground_color, background_color).paint(separator);
     let mut tab_text_len = text.width() + (separator_width * 2) + 2; // +2 for padding
     let tab_styled_text = style!(foreground_color, background_color)
diff --git a/zellij-utils/src/kdl/mod.rs b/zellij-utils/src/kdl/mod.rs
index 8b5acfd094..74831ed19b 100644
--- a/zellij-utils/src/kdl/mod.rs
+++ b/zellij-utils/src/kdl/mod.rs
@@ -12,7 +12,6 @@ use crate::input::options::{Clipboard, OnForceClose, Options};
 use crate::input::permission::{GrantedPermission, PermissionCache};
 use crate::input::plugins::PluginAliases;
 use crate::input::theme::{FrameConfig, Theme, Themes, UiConfig};
-use crate::shared::colors;
 use kdl_layout_parser::KdlLayoutParser;
 use std::collections::{BTreeMap, HashMap, HashSet};
 use strum::IntoEnumIterator;
@@ -1997,7 +1996,7 @@ impl Themes {
     ) -> Result<[PaletteColor; 6], ConfigError> {
         let colors = kdl_children_or_error!(
             kdl_child_with_name_or_error!(style_node, style_descriptor)?,
-            "foo"
+            format!("Missing colors for {}", style_descriptor)
         );
         Ok([
             PaletteColor::try_from(("base", colors))?,

From c38061c4f39292f3705bd53da8d1cd8a7a0db3d3 Mon Sep 17 00:00:00 2001
From: Mark Grey <mgthesecond@spotify.com>
Date: Tue, 2 Apr 2024 12:03:08 -0400
Subject: [PATCH 16/40] corrections to exit code coloration

---
 default-plugins/status-bar/src/main.rs        | 16 +++++++---------
 default-plugins/tab-bar/src/tab.rs            |  2 +-
 zellij-server/src/ui/pane_boundaries_frame.rs |  8 ++++----
 zellij-utils/src/data.rs                      | 16 +++++++++++++++-
 4 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/default-plugins/status-bar/src/main.rs b/default-plugins/status-bar/src/main.rs
index 76bb64f1ab..ce2e9d71ee 100644
--- a/default-plugins/status-bar/src/main.rs
+++ b/default-plugins/status-bar/src/main.rs
@@ -91,7 +91,7 @@ fn color_elements(palette: Styling, different_color_alternates: bool) -> Colored
     let background = palette.text_unselected[5];
     let foreground = palette.text_unselected[0];
     let alternate_background_color = if different_color_alternates {
-        palette.ribbon_unselected[3]
+        palette.ribbon_unselected[0]
     } else {
         palette.ribbon_unselected[5]
     };
@@ -108,9 +108,9 @@ fn color_elements(palette: Styling, different_color_alternates: bool) -> Colored
         },
         unselected: SegmentStyle {
             prefix_separator: style!(background, palette.ribbon_unselected[5]),
-            char_left_separator: style!(palette.ribbon_unselected[1], palette.ribbon_unselected[5])
+            char_left_separator: style!(palette.ribbon_unselected[0], palette.ribbon_unselected[5])
                 .bold(),
-            char_shortcut: style!(palette.ribbon_unselected[2], palette.ribbon_unselected[5])
+            char_shortcut: style!(palette.ribbon_unselected[1], palette.ribbon_unselected[5])
                 .bold(),
             char_right_separator: style!(
                 palette.ribbon_unselected[0],
@@ -122,12 +122,10 @@ fn color_elements(palette: Styling, different_color_alternates: bool) -> Colored
         },
         unselected_alternate: SegmentStyle {
             prefix_separator: style!(background, alternate_background_color),
-            char_left_separator: style!(palette.ribbon_unselected[1], alternate_background_color)
-                .bold(),
-            char_shortcut: style!(palette.ribbon_unselected[2], alternate_background_color).bold(),
-            char_right_separator: style!(palette.ribbon_unselected[1], alternate_background_color)
-                .bold(),
-            styled_text: style!(palette.ribbon_unselected[0], alternate_background_color).bold(),
+            char_left_separator: style!(background, alternate_background_color).bold(),
+            char_shortcut: style!(palette.ribbon_unselected[1], alternate_background_color).bold(),
+            char_right_separator: style!(background, alternate_background_color).bold(),
+            styled_text: style!(background, alternate_background_color).bold(),
             suffix_separator: style!(alternate_background_color, background).bold(),
         },
         disabled: SegmentStyle {
diff --git a/default-plugins/tab-bar/src/tab.rs b/default-plugins/tab-bar/src/tab.rs
index 1a77b9abd3..74b0bf74fb 100644
--- a/default-plugins/tab-bar/src/tab.rs
+++ b/default-plugins/tab-bar/src/tab.rs
@@ -28,7 +28,7 @@ pub fn render_tab(
     let separator_width = separator.width();
 
     let alternate_tab_color = if is_alternate_tab {
-        palette.ribbon_unselected[1]
+        palette.text_unselected[5]
     } else {
         palette.ribbon_unselected[5]
     };
diff --git a/zellij-server/src/ui/pane_boundaries_frame.rs b/zellij-server/src/ui/pane_boundaries_frame.rs
index 3c9f798abd..5730ee9a48 100644
--- a/zellij-server/src/ui/pane_boundaries_frame.rs
+++ b/zellij-server/src/ui/pane_boundaries_frame.rs
@@ -801,7 +801,7 @@ impl PaneFrame {
                 first_part.append(&mut foreground_color(left_bracket, self.color));
                 first_part.append(&mut foreground_color(
                     exited_text,
-                    Some(self.style.colors.red),
+                    Some(self.style.styling.exit_code_error[0]),
                 ));
                 first_part.append(&mut foreground_color(right_bracket, self.color));
                 (
@@ -836,7 +836,7 @@ impl PaneFrame {
         second_part.append(&mut foreground_color(left_enter_bracket, self.color));
         second_part.append(&mut foreground_color(
             enter_text,
-            Some(self.style.colors.orange),
+            Some(self.style.styling.text_unselected[4]),
         ));
         second_part.append(&mut foreground_color(right_enter_bracket, self.color));
         second_part.append(&mut foreground_color(enter_tip, self.color));
@@ -844,7 +844,7 @@ impl PaneFrame {
         second_part.append(&mut foreground_color(left_esc_bracket, self.color));
         second_part.append(&mut foreground_color(
             esc_text,
-            Some(self.style.colors.orange),
+            Some(self.style.styling.text_unselected[4]),
         ));
         second_part.append(&mut foreground_color(right_esc_bracket, self.color));
         second_part.append(&mut foreground_color(esc_tip, self.color));
@@ -852,7 +852,7 @@ impl PaneFrame {
         second_part.append(&mut foreground_color(left_break_bracket, self.color));
         second_part.append(&mut foreground_color(
             break_text,
-            Some(self.style.colors.orange),
+            Some(self.style.styling.text_unselected[4]),
         ));
         second_part.append(&mut foreground_color(right_break_bracket, self.color));
         second_part.append(&mut foreground_color(break_tip, self.color));
diff --git a/zellij-utils/src/data.rs b/zellij-utils/src/data.rs
index d90e5a32a7..af1d497d14 100644
--- a/zellij-utils/src/data.rs
+++ b/zellij-utils/src/data.rs
@@ -1175,7 +1175,7 @@ impl From<Palette> for Styling {
                 palette.cyan,
                 palette.green,
                 palette.magenta,
-                palette.bg,
+                palette.black,
             ],
             text_selected: [
                 palette.white,
@@ -1215,6 +1215,20 @@ impl From<Palette> for Styling {
                 palette.silver,
                 palette.purple,
             ],
+            frame_unselected: [
+                palette.orange,
+                palette.pink,
+                palette.gray,
+                palette.brown,
+                palette.black,
+            ],
+            frame_selected: [
+                palette.green,
+                palette.orange,
+                palette.cyan,
+                palette.magenta,
+                palette.brown,
+            ],
             ..Default::default() /*
                                  table_title: (),
                                  table_cell_unselected: (),

From f8a6792ae286b160fa86f77818ee4e2fdcb25c74 Mon Sep 17 00:00:00 2001
From: Mark Grey <mgthesecond@spotify.com>
Date: Wed, 3 Apr 2024 11:45:50 -0400
Subject: [PATCH 17/40] tip coloration

---
 default-plugins/status-bar/src/tip/data/move_tabs.rs |  6 +++---
 .../src/tip/data/send_mouse_click_to_terminal.rs     | 12 ++++++------
 default-plugins/status-bar/src/tip/data/use_mouse.rs |  6 +++---
 .../status-bar/src/tip/data/zellij_setup_check.rs    |  6 +++---
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/default-plugins/status-bar/src/tip/data/move_tabs.rs b/default-plugins/status-bar/src/tip/data/move_tabs.rs
index 6ad119e49c..462c1902d4 100644
--- a/default-plugins/status-bar/src/tip/data/move_tabs.rs
+++ b/default-plugins/status-bar/src/tip/data/move_tabs.rs
@@ -25,7 +25,7 @@ macro_rules! strings {
 pub fn move_tabs_full(help: &ModeInfo) -> LinePart {
     // Tip: Wrong order of tabs? You can move them to left and right with:
     // Alt + i (left) and Alt + o (right)
-    let green_color = palette_match!(help.style.colors.green);
+    let green_color = palette_match!(help.style.styling.text_unselected[3]);
 
     let bits = vec![
         Style::new().paint(" Tip: "),
@@ -41,7 +41,7 @@ pub fn move_tabs_full(help: &ModeInfo) -> LinePart {
 pub fn move_tabs_medium(help: &ModeInfo) -> LinePart {
     // Tip: You can move tabs to left and right with:
     // Alt + i (left) and Alt + o (right)
-    let green_color = palette_match!(help.style.colors.green);
+    let green_color = palette_match!(help.style.styling.text_unselected[3]);
 
     let bits = vec![
         Style::new().paint(" Tip: "),
@@ -56,7 +56,7 @@ pub fn move_tabs_medium(help: &ModeInfo) -> LinePart {
 
 pub fn move_tabs_short(help: &ModeInfo) -> LinePart {
     // Move tabs with: Alt + i (left) and Alt + o (right)
-    let green_color = palette_match!(help.style.colors.green);
+    let green_color = palette_match!(help.style.styling.text_unselected[3]);
 
     let bits = vec![
         Style::new().paint(" Move tabs with: "),
diff --git a/default-plugins/status-bar/src/tip/data/send_mouse_click_to_terminal.rs b/default-plugins/status-bar/src/tip/data/send_mouse_click_to_terminal.rs
index 7daabeb6dd..b948c2567b 100644
--- a/default-plugins/status-bar/src/tip/data/send_mouse_click_to_terminal.rs
+++ b/default-plugins/status-bar/src/tip/data/send_mouse_click_to_terminal.rs
@@ -23,8 +23,8 @@ macro_rules! strings {
 
 pub fn mouse_click_to_terminal_full(help: &ModeInfo) -> LinePart {
     // Tip: SHIFT + <mouse-click> bypasses Zellij and sends the mouse click directly to the terminal
-    let green_color = palette_match!(help.style.colors.green);
-    let orange_color = palette_match!(help.style.colors.orange);
+    let green_color = palette_match!(help.style.styling.text_unselected[3]);
+    let orange_color = palette_match!(help.style.styling.text_unselected[1]);
 
     strings!(&[
         Style::new().paint(" Tip: "),
@@ -37,8 +37,8 @@ pub fn mouse_click_to_terminal_full(help: &ModeInfo) -> LinePart {
 
 pub fn mouse_click_to_terminal_medium(help: &ModeInfo) -> LinePart {
     // Tip: SHIFT + <mouse-click> sends the click directly to the terminal
-    let green_color = palette_match!(help.style.colors.green);
-    let orange_color = palette_match!(help.style.colors.orange);
+    let green_color = palette_match!(help.style.styling.text_unselected[3]);
+    let orange_color = palette_match!(help.style.styling.text_unselected[1]);
     strings!(&[
         Style::new().paint(" Tip: "),
         Style::new().fg(orange_color).bold().paint("Shift"),
@@ -50,8 +50,8 @@ pub fn mouse_click_to_terminal_medium(help: &ModeInfo) -> LinePart {
 
 pub fn mouse_click_to_terminal_short(help: &ModeInfo) -> LinePart {
     // Tip: SHIFT + <mouse-click>  => sends click to terminal.
-    let green_color = palette_match!(help.style.colors.green);
-    let orange_color = palette_match!(help.style.colors.orange);
+    let green_color = palette_match!(help.style.styling.text_unselected[3]);
+    let orange_color = palette_match!(help.style.styling.text_unselected[1]);
 
     strings!(&[
         Style::new().paint(" Tip: "),
diff --git a/default-plugins/status-bar/src/tip/data/use_mouse.rs b/default-plugins/status-bar/src/tip/data/use_mouse.rs
index 4bbfbf948d..240d0df74a 100644
--- a/default-plugins/status-bar/src/tip/data/use_mouse.rs
+++ b/default-plugins/status-bar/src/tip/data/use_mouse.rs
@@ -24,7 +24,7 @@ macro_rules! strings {
 pub fn use_mouse_full(help: &ModeInfo) -> LinePart {
     // Tip: Use the mouse to switch pane focus, scroll through the pane
     // scrollbuffer, switch or scroll through tabs
-    let green_color = palette_match!(help.style.colors.green);
+    let green_color = palette_match!(help.style.styling.text_unselected[3]);
 
     strings!(&[
         Style::new().paint(" Tip: "),
@@ -36,7 +36,7 @@ pub fn use_mouse_full(help: &ModeInfo) -> LinePart {
 pub fn use_mouse_medium(help: &ModeInfo) -> LinePart {
     // Tip: Use the mouse to switch panes/tabs or scroll through the pane
     // scrollbuffer
-    let green_color = palette_match!(help.style.colors.green);
+    let green_color = palette_match!(help.style.styling.text_unselected[3]);
 
     strings!(&[
         Style::new().paint(" Tip: "),
@@ -47,7 +47,7 @@ pub fn use_mouse_medium(help: &ModeInfo) -> LinePart {
 
 pub fn use_mouse_short(help: &ModeInfo) -> LinePart {
     // Tip: Use the mouse to switch panes/tabs or scroll
-    let green_color = palette_match!(help.style.colors.green);
+    let green_color = palette_match!(help.style.styling.text_unselected[3]);
 
     strings!(&[
         Style::new().fg(green_color).bold().paint(" Use the mouse"),
diff --git a/default-plugins/status-bar/src/tip/data/zellij_setup_check.rs b/default-plugins/status-bar/src/tip/data/zellij_setup_check.rs
index 3dd7b6d853..bfa39544c1 100644
--- a/default-plugins/status-bar/src/tip/data/zellij_setup_check.rs
+++ b/default-plugins/status-bar/src/tip/data/zellij_setup_check.rs
@@ -23,7 +23,7 @@ macro_rules! strings {
 
 pub fn zellij_setup_check_full(help: &ModeInfo) -> LinePart {
     // Tip: Having issues with Zellij? Try running "zellij setup --check"
-    let orange_color = palette_match!(help.style.colors.orange);
+    let orange_color = palette_match!(help.style.styling.text_unselected[1]);
 
     strings!(&[
         Style::new().paint(" Tip: "),
@@ -37,7 +37,7 @@ pub fn zellij_setup_check_full(help: &ModeInfo) -> LinePart {
 
 pub fn zellij_setup_check_medium(help: &ModeInfo) -> LinePart {
     // Tip: Run "zellij setup --check" to find issues
-    let orange_color = palette_match!(help.style.colors.orange);
+    let orange_color = palette_match!(help.style.styling.text_unselected[1]);
 
     strings!(&[
         Style::new().paint(" Tip: "),
@@ -52,7 +52,7 @@ pub fn zellij_setup_check_medium(help: &ModeInfo) -> LinePart {
 
 pub fn zellij_setup_check_short(help: &ModeInfo) -> LinePart {
     // Run "zellij setup --check" to find issues
-    let orange_color = palette_match!(help.style.colors.orange);
+    let orange_color = palette_match!(help.style.styling.text_unselected[1]);
 
     strings!(&[
         Style::new().paint(" Run "),

From 651aad6c09551cb57c4b9f4a641161c479b43f75 Mon Sep 17 00:00:00 2001
From: Mark Grey <mgthesecond@spotify.com>
Date: Wed, 3 Apr 2024 11:46:04 -0400
Subject: [PATCH 18/40] selected list coloration

---
 zellij-server/src/ui/components/nested_list.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/zellij-server/src/ui/components/nested_list.rs b/zellij-server/src/ui/components/nested_list.rs
index 9b60d57421..ec6a6f99d4 100644
--- a/zellij-server/src/ui/components/nested_list.rs
+++ b/zellij-server/src/ui/components/nested_list.rs
@@ -56,7 +56,8 @@ pub fn nested_list(
                 }
             });
         if line_item.text.selected {
-            let selected_background = RESET_STYLES.background(Some(style.colors.bg.into()));
+            let selected_background =
+                RESET_STYLES.background(Some(style.styling.list_selected[5].into()));
             stringified.push_str(&format!(
                 "{}{}{}{:padding$}{bulletin}{}{text}{}",
                 go_to_row_instruction,

From 4469079a7c8c49144870e53f62d558ea3981ebec Mon Sep 17 00:00:00 2001
From: Mark Grey <mgthesecond@spotify.com>
Date: Wed, 3 Apr 2024 12:19:50 -0400
Subject: [PATCH 19/40] handle ThemeHue in palette conversion

---
 default-plugins/compact-bar/src/line.rs | 88 ++++++++++---------------
 default-plugins/compact-bar/src/main.rs |  2 +-
 zellij-utils/src/data.rs                | 10 ++-
 3 files changed, 44 insertions(+), 56 deletions(-)

diff --git a/default-plugins/compact-bar/src/line.rs b/default-plugins/compact-bar/src/line.rs
index fa5fd3e932..c13f2ed183 100644
--- a/default-plugins/compact-bar/src/line.rs
+++ b/default-plugins/compact-bar/src/line.rs
@@ -16,7 +16,7 @@ fn populate_tabs_in_tab_line(
     tabs_after_active: &mut Vec<LinePart>,
     tabs_to_render: &mut Vec<LinePart>,
     cols: usize,
-    palette: Palette,
+    palette: Styling,
     capabilities: PluginCapabilities,
 ) {
     let mut middle_size = get_current_title_len(tabs_to_render);
@@ -107,7 +107,7 @@ fn populate_tabs_in_tab_line(
 
 fn left_more_message(
     tab_count_to_the_left: usize,
-    palette: Palette,
+    palette: Styling,
     separator: &str,
     tab_index: usize,
 ) -> LinePart {
@@ -122,13 +122,11 @@ fn left_more_message(
     // 238
     // chars length plus separator length on both sides
     let more_text_len = more_text.width() + 2 * separator.width();
-    let (text_color, sep_color) = match palette.theme_hue {
-        ThemeHue::Dark => (palette.white, palette.black),
-        ThemeHue::Light => (palette.black, palette.white),
-    };
-    let left_separator = style!(sep_color, palette.orange).paint(separator);
-    let more_styled_text = style!(text_color, palette.orange).bold().paint(more_text);
-    let right_separator = style!(palette.orange, sep_color).paint(separator);
+    let (text_color, sep_color) = (palette.ribbon_unselected[0], palette.text_unselected[5]);
+    let plus_ribbon_bg = palette.text_selected[1];
+    let left_separator = style!(sep_color, plus_ribbon_bg).paint(separator);
+    let more_styled_text = style!(text_color, plus_ribbon_bg).bold().paint(more_text);
+    let right_separator = style!(plus_ribbon_bg, sep_color).paint(separator);
     let more_styled_text =
         ANSIStrings(&[left_separator, more_styled_text, right_separator]).to_string();
     LinePart {
@@ -140,7 +138,7 @@ fn left_more_message(
 
 fn right_more_message(
     tab_count_to_the_right: usize,
-    palette: Palette,
+    palette: Styling,
     separator: &str,
     tab_index: usize,
 ) -> LinePart {
@@ -154,13 +152,12 @@ fn right_more_message(
     };
     // chars length plus separator length on both sides
     let more_text_len = more_text.width() + 2 * separator.width();
-    let (text_color, sep_color) = match palette.theme_hue {
-        ThemeHue::Dark => (palette.white, palette.black),
-        ThemeHue::Light => (palette.black, palette.white),
-    };
-    let left_separator = style!(sep_color, palette.orange).paint(separator);
-    let more_styled_text = style!(text_color, palette.orange).bold().paint(more_text);
-    let right_separator = style!(palette.orange, sep_color).paint(separator);
+
+    let (text_color, sep_color) = (palette.ribbon_unselected[0], palette.text_unselected[5]);
+    let plus_ribbon_bg = palette.text_selected[1];
+    let left_separator = style!(sep_color, plus_ribbon_bg).paint(separator);
+    let more_styled_text = style!(text_color, plus_ribbon_bg).bold().paint(more_text);
+    let right_separator = style!(plus_ribbon_bg, sep_color).paint(separator);
     let more_styled_text =
         ANSIStrings(&[left_separator, more_styled_text, right_separator]).to_string();
     LinePart {
@@ -173,24 +170,17 @@ fn right_more_message(
 fn tab_line_prefix(
     session_name: Option<&str>,
     mode: InputMode,
-    palette: Palette,
+    palette: Styling,
     cols: usize,
 ) -> Vec<LinePart> {
     let prefix_text = " Zellij ".to_string();
 
     let prefix_text_len = prefix_text.chars().count();
-    let text_color = match palette.theme_hue {
-        ThemeHue::Dark => palette.white,
-        ThemeHue::Light => palette.black,
-    };
-    let bg_color = match palette.theme_hue {
-        ThemeHue::Dark => palette.black,
-        ThemeHue::Light => palette.white,
-    };
-
-    let locked_mode_color = palette.magenta;
-    let normal_mode_color = palette.green;
-    let other_modes_color = palette.orange;
+    let text_color = palette.text_unselected[0];
+    let bg_color = palette.text_unselected[5];
+    let locked_mode_color = palette.text_unselected[4];
+    let normal_mode_color = palette.text_unselected[3];
+    let other_modes_color = palette.text_unselected[1];
 
     let prefix_styled_text = style!(text_color, bg_color).bold().paint(prefix_text);
     let mut parts = vec![LinePart {
@@ -201,10 +191,6 @@ fn tab_line_prefix(
     if let Some(name) = session_name {
         let name_part = format!("({})", name);
         let name_part_len = name_part.width();
-        let text_color = match palette.theme_hue {
-            ThemeHue::Dark => palette.white,
-            ThemeHue::Light => palette.black,
-        };
         let name_part_styled_text = style!(text_color, bg_color).bold().paint(name_part);
         if cols.saturating_sub(prefix_text_len) >= name_part_len {
             parts.push(LinePart {
@@ -253,7 +239,7 @@ pub fn tab_line(
     mut all_tabs: Vec<LinePart>,
     active_tab_index: usize,
     cols: usize,
-    palette: Palette,
+    palette: Styling,
     capabilities: PluginCapabilities,
     hide_session_name: bool,
     mode: InputMode,
@@ -293,6 +279,7 @@ pub fn tab_line(
     let current_title_len = get_current_title_len(&prefix);
     if current_title_len < cols {
         let mut remaining_space = cols - current_title_len;
+        let remaining_bg = palette.text_unselected[5];
         if let Some(swap_layout_status) = swap_layout_status(
             remaining_space,
             active_swap_layout_name,
@@ -304,7 +291,7 @@ pub fn tab_line(
             remaining_space -= swap_layout_status.len;
             let mut buffer = String::new();
             for _ in 0..remaining_space {
-                buffer.push_str(&style!(palette.black, palette.black).paint(" ").to_string());
+                buffer.push_str(&style!(remaining_bg, remaining_bg).paint(" ").to_string());
             }
             prefix.push(LinePart {
                 part: buffer,
@@ -323,7 +310,7 @@ fn swap_layout_status(
     swap_layout_name: &Option<String>,
     is_swap_layout_damaged: bool,
     input_mode: InputMode,
-    palette: &Palette,
+    palette: &Styling,
     separator: &str,
 ) -> Option<LinePart> {
     match swap_layout_name {
@@ -331,31 +318,28 @@ fn swap_layout_status(
             let mut swap_layout_name = format!(" {} ", swap_layout_name);
             swap_layout_name.make_ascii_uppercase();
             let swap_layout_name_len = swap_layout_name.len() + 3;
+            let bg = palette.text_unselected[5];
+            let fg = palete.ribbon_unselected[5];
+            let green = palette.ribbon_selected[5];
 
             let (prefix_separator, swap_layout_name, suffix_separator) =
                 if input_mode == InputMode::Locked {
                     (
-                        style!(palette.black, palette.fg).paint(separator),
-                        style!(palette.black, palette.fg)
-                            .italic()
-                            .paint(&swap_layout_name),
-                        style!(palette.fg, palette.black).paint(separator),
+                        style!(bg, fg).paint(separator),
+                        style!(bg, fg).italic().paint(&swap_layout_name),
+                        style!(fg, bg).paint(separator),
                     )
                 } else if is_swap_layout_damaged {
                     (
-                        style!(palette.black, palette.fg).paint(separator),
-                        style!(palette.black, palette.fg)
-                            .bold()
-                            .paint(&swap_layout_name),
-                        style!(palette.fg, palette.black).paint(separator),
+                        style!(bg, fg).paint(separator),
+                        style!(bg, fg).bold().paint(&swap_layout_name),
+                        style!(fg, bg).paint(separator),
                     )
                 } else {
                     (
-                        style!(palette.black, palette.green).paint(separator),
-                        style!(palette.black, palette.green)
-                            .bold()
-                            .paint(&swap_layout_name),
-                        style!(palette.green, palette.black).paint(separator),
+                        style!(bg, green).paint(separator),
+                        style!(bg, green).bold().paint(&swap_layout_name),
+                        style!(green, bg).paint(separator),
                     )
                 };
             let swap_layout_indicator = format!(
diff --git a/default-plugins/compact-bar/src/main.rs b/default-plugins/compact-bar/src/main.rs
index 2eb6b9df74..ed6f71f482 100644
--- a/default-plugins/compact-bar/src/main.rs
+++ b/default-plugins/compact-bar/src/main.rs
@@ -120,7 +120,7 @@ impl ZellijPlugin for State {
             all_tabs,
             active_tab_index,
             cols.saturating_sub(1),
-            self.mode_info.style.colors,
+            self.mode_info.style.styling,
             self.mode_info.capabilities,
             self.mode_info.style.hide_session_name,
             self.mode_info.mode,
diff --git a/zellij-utils/src/data.rs b/zellij-utils/src/data.rs
index af1d497d14..1f866defdc 100644
--- a/zellij-utils/src/data.rs
+++ b/zellij-utils/src/data.rs
@@ -1168,17 +1168,21 @@ impl From<Styling> for Palette {
 
 impl From<Palette> for Styling {
     fn from(palette: Palette) -> Self {
+        let (fg, bg) = match palette.theme_hue {
+            ThemeHue::Light => (palette.black, palette.white),
+            ThemeHue::Dark => (palette.white, palette.black),
+        };
         Styling {
             text_unselected: [
-                palette.white,
+                fg,
                 palette.orange,
                 palette.cyan,
                 palette.green,
                 palette.magenta,
-                palette.black,
+                bg,
             ],
             text_selected: [
-                palette.white,
+                fg,
                 palette.orange,
                 palette.cyan,
                 palette.green,

From 96951fdb43a61c6ade2aec1881f67fd928524665 Mon Sep 17 00:00:00 2001
From: Mark Grey <mgthesecond@spotify.com>
Date: Wed, 3 Apr 2024 12:20:57 -0400
Subject: [PATCH 20/40] further compact bar coloration

---
 default-plugins/compact-bar/src/line.rs | 2 +-
 default-plugins/compact-bar/src/main.rs | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/default-plugins/compact-bar/src/line.rs b/default-plugins/compact-bar/src/line.rs
index c13f2ed183..49f63f4c3c 100644
--- a/default-plugins/compact-bar/src/line.rs
+++ b/default-plugins/compact-bar/src/line.rs
@@ -319,7 +319,7 @@ fn swap_layout_status(
             swap_layout_name.make_ascii_uppercase();
             let swap_layout_name_len = swap_layout_name.len() + 3;
             let bg = palette.text_unselected[5];
-            let fg = palete.ribbon_unselected[5];
+            let fg = palette.ribbon_unselected[5];
             let green = palette.ribbon_selected[5];
 
             let (prefix_separator, swap_layout_name, suffix_separator) =
diff --git a/default-plugins/compact-bar/src/main.rs b/default-plugins/compact-bar/src/main.rs
index ed6f71f482..4cef964050 100644
--- a/default-plugins/compact-bar/src/main.rs
+++ b/default-plugins/compact-bar/src/main.rs
@@ -131,10 +131,7 @@ impl ZellijPlugin for State {
             .tab_line
             .iter()
             .fold(String::new(), |output, part| output + &part.part);
-        let background = match self.mode_info.style.colors.theme_hue {
-            ThemeHue::Dark => self.mode_info.style.colors.black,
-            ThemeHue::Light => self.mode_info.style.colors.white,
-        };
+        let background = self.mode_info.style.styling.text_unselected[5];
         match background {
             PaletteColor::Rgb((r, g, b)) => {
                 print!("{}\u{1b}[48;2;{};{};{}m\u{1b}[0K", output, r, g, b);

From f1cc1173ed463b7f26e16e4063aab008a7d1ddf9 Mon Sep 17 00:00:00 2001
From: Mark Grey <mgthesecond@spotify.com>
Date: Wed, 3 Apr 2024 12:36:13 -0400
Subject: [PATCH 21/40] panes coloration

---
 zellij-server/src/panes/grid.rs               | 12 +++++++++---
 zellij-server/src/panes/plugin_pane.rs        | 10 +++++-----
 zellij-server/src/panes/terminal_character.rs |  6 +++---
 zellij-server/src/panes/terminal_pane.rs      |  2 +-
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/zellij-server/src/panes/grid.rs b/zellij-server/src/panes/grid.rs
index c22cb4808c..d1dd986f0f 100644
--- a/zellij-server/src/panes/grid.rs
+++ b/zellij-server/src/panes/grid.rs
@@ -1085,7 +1085,7 @@ impl Grid {
                 .selection
                 .contains_row(character_chunk.y.saturating_sub(content_y))
             {
-                let background_color = match style.colors.bg {
+                let background_color = match style.styling.text_unselected[5] {
                     PaletteColor::Rgb(rgb) => AnsiCode::RgbCode(rgb),
                     PaletteColor::EightBit(col) => AnsiCode::ColorIndex(col),
                 };
@@ -1101,9 +1101,15 @@ impl Grid {
                     if res.contains_row(character_chunk.y.saturating_sub(content_y)) {
                         let (select_background_palette, select_foreground_palette) =
                             if Some(res) == self.search_results.active.as_ref() {
-                                (style.colors.orange, style.colors.black)
+                                (
+                                    style.styling.text_unselected[1],
+                                    style.styling.text_unselected[5],
+                                )
                             } else {
-                                (style.colors.green, style.colors.black)
+                                (
+                                    style.styling.text_unselected[3],
+                                    style.styling.text_unselected[5],
+                                )
                             };
                         let background_color = match select_background_palette {
                             PaletteColor::Rgb(rgb) => AnsiCode::RgbCode(rgb),
diff --git a/zellij-server/src/panes/plugin_pane.rs b/zellij-server/src/panes/plugin_pane.rs
index eb46f832a8..c431a818fa 100644
--- a/zellij-server/src/panes/plugin_pane.rs
+++ b/zellij-server/src/panes/plugin_pane.rs
@@ -617,7 +617,7 @@ impl Pane for PluginPane {
             .unwrap();
     }
     fn add_red_pane_frame_color_override(&mut self, error_text: Option<String>) {
-        self.pane_frame_color_override = Some((self.style.colors.red, error_text));
+        self.pane_frame_color_override = Some((self.style.styling.exit_code_error[0], error_text));
     }
     fn clear_pane_frame_color_override(&mut self) {
         self.pane_frame_color_override = None;
@@ -696,10 +696,10 @@ impl PluginPane {
         }
     }
     fn display_request_permission_message(&self, plugin_permission: &PluginPermission) -> String {
-        let bold_white = style!(self.style.colors.white).bold();
-        let cyan = style!(self.style.colors.cyan).bold();
-        let orange = style!(self.style.colors.orange).bold();
-        let green = style!(self.style.colors.green).bold();
+        let bold_white = style!(self.style.styling.text_unselected[0]).bold();
+        let cyan = style!(self.style.styling.text_unselected[2]).bold();
+        let orange = style!(self.style.styling.text_unselected[1]).bold();
+        let green = style!(self.style.styling.text_unselected[3]).bold();
 
         let mut messages = String::new();
         let permissions: BTreeSet<PermissionType> =
diff --git a/zellij-server/src/panes/terminal_character.rs b/zellij-server/src/panes/terminal_character.rs
index 3bdc6559fd..2098f56a51 100644
--- a/zellij-server/src/panes/terminal_character.rs
+++ b/zellij-server/src/panes/terminal_character.rs
@@ -977,7 +977,7 @@ pub fn render_first_run_banner(
         Some(run_command) => {
             let bold_text = RESET_STYLES.bold(Some(AnsiCode::On));
             let command_color_text = RESET_STYLES
-                .foreground(Some(AnsiCode::from(style.colors.green)))
+                .foreground(Some(AnsiCode::from(style.styling.text_unselected[3])))
                 .bold(Some(AnsiCode::On));
             let waiting_to_run_text = "Waiting to run: ";
             let command_text = run_command.to_string();
@@ -1002,7 +1002,7 @@ pub fn render_first_run_banner(
             let ctrl_c_bare_text = "Ctrl-c";
             let controls_bare_text_fourth_part = "> exit";
             let controls_color = RESET_STYLES
-                .foreground(Some(AnsiCode::from(style.colors.orange)))
+                .foreground(Some(AnsiCode::from(style.styling.text_unselected[1])))
                 .bold(Some(AnsiCode::On));
             let controls_line_length = controls_bare_text_first_part.len()
                 + enter_bare_text.len()
@@ -1054,7 +1054,7 @@ pub fn render_first_run_banner(
             let ctrl_c_bare_text = "Ctrl-c";
             let controls_bare_text_fourth_part = "> exit";
             let controls_color = RESET_STYLES
-                .foreground(Some(AnsiCode::from(style.colors.orange)))
+                .foreground(Some(AnsiCode::from(style.styling.text_unselected[1])))
                 .bold(Some(AnsiCode::On));
             let controls_line_length = controls_bare_text_first_part.len()
                 + enter_bare_text.len()
diff --git a/zellij-server/src/panes/terminal_pane.rs b/zellij-server/src/panes/terminal_pane.rs
index 4df0552129..26d9dca908 100644
--- a/zellij-server/src/panes/terminal_pane.rs
+++ b/zellij-server/src/panes/terminal_pane.rs
@@ -714,7 +714,7 @@ impl Pane for TerminalPane {
         self.set_should_render(true);
     }
     fn add_red_pane_frame_color_override(&mut self, error_text: Option<String>) {
-        self.pane_frame_color_override = Some((self.style.colors.red, error_text));
+        self.pane_frame_color_override = Some((self.style.styling.exit_code_error[0], error_text));
     }
     fn clear_pane_frame_color_override(&mut self) {
         self.pane_frame_color_override = None;

From 3f7f8eb456c2696c0821f63f304136743ce03da2 Mon Sep 17 00:00:00 2001
From: Mark Grey <mgthesecond@spotify.com>
Date: Wed, 3 Apr 2024 13:36:20 -0400
Subject: [PATCH 22/40] styling -> palette into

---
 zellij-client/src/lib.rs    |  2 +-
 zellij-utils/src/data.rs    | 19 ++++++++++++++++---
 zellij-utils/src/kdl/mod.rs |  1 -
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/zellij-client/src/lib.rs b/zellij-client/src/lib.rs
index e1c6eccbcc..a6928aea0a 100644
--- a/zellij-client/src/lib.rs
+++ b/zellij-client/src/lib.rs
@@ -208,7 +208,7 @@ pub fn start_client(
 
     let (palette, styling) = config
         .theme_config(&config_options)
-        .unwrap_or_else(|| (os_input.load_palette(), Default::default()));
+        .unwrap_or_else(|| (os_input.load_palette(), os_input.load_palette().into()));
 
     let full_screen_ws = os_input.get_terminal_size_using_fd(0);
     let client_attributes = ClientAttributes {
diff --git a/zellij-utils/src/data.rs b/zellij-utils/src/data.rs
index 1f866defdc..31637afb0c 100644
--- a/zellij-utils/src/data.rs
+++ b/zellij-utils/src/data.rs
@@ -1152,6 +1152,7 @@ pub struct Styling {
     pub exit_code_error: [PaletteColor; 5],
 }
 
+// TODO: possibly better Struct type for caller rather than indexing?
 #[derive(Debug, Copy, Default, Clone, PartialEq, Eq, Hash, Deserialize, Serialize)]
 pub struct StyleDeclaration {
     pub base: PaletteColor,
@@ -1160,9 +1161,21 @@ pub struct StyleDeclaration {
 }
 
 impl From<Styling> for Palette {
-    // TODO: Implement mapping of old colors -> styling
-    fn from(_palette: Styling) -> Self {
-        default_palette()
+    fn from(styling: Styling) -> Self {
+        Palette {
+            fg: styling.ribbon_unselected[5],
+            bg: styling.text_unselected[5],
+            red: styling.exit_code_error[0],
+            green: styling.text_unselected[3],
+            yellow: styling.exit_code_error[1],
+            blue: styling.ribbon_unselected[3],
+            magenta: styling.text_unselected[4],
+            orange: styling.text_unselected[1],
+            cyan: styling.text_unselected[2],
+            black: styling.ribbon_unselected[0],
+            white: styling.ribbon_selected[2],
+            ..Default::default()
+        }
     }
 }
 
diff --git a/zellij-utils/src/kdl/mod.rs b/zellij-utils/src/kdl/mod.rs
index 74831ed19b..d87cf246b2 100644
--- a/zellij-utils/src/kdl/mod.rs
+++ b/zellij-utils/src/kdl/mod.rs
@@ -2091,7 +2091,6 @@ impl Themes {
                     };
                     Theme {
                         palette,
-                        // TODO: inverse palette -> styling
                         styling: palette.into(),
                     }
                 },

From 6e8a5c6c7d855348f5ae0cda9f2e11136473ba2e Mon Sep 17 00:00:00 2001
From: Mark Grey <mgthesecond@spotify.com>
Date: Wed, 3 Apr 2024 13:53:45 -0400
Subject: [PATCH 23/40] migrate palette backwards compat to plugin-api

---
 default-plugins/compact-bar/src/main.rs       |  6 ++--
 default-plugins/session-manager/src/main.rs   |  2 +-
 default-plugins/status-bar/src/first_line.rs  |  6 ++--
 default-plugins/status-bar/src/main.rs        | 12 +++----
 default-plugins/status-bar/src/second_line.rs | 12 +++----
 .../status-bar/src/tip/data/compact_layout.rs | 10 +++---
 .../src/tip/data/edit_scrollbuffer.rs         | 10 +++---
 .../src/tip/data/floating_panes_mouse.rs      |  4 +--
 .../tip/data/move_focus_hjkl_tab_switch.rs    |  4 +--
 .../status-bar/src/tip/data/move_tabs.rs      |  6 ++--
 .../status-bar/src/tip/data/quicknav.rs       |  8 ++---
 .../tip/data/send_mouse_click_to_terminal.rs  | 12 +++----
 .../status-bar/src/tip/data/sync_tab.rs       |  4 +--
 .../status-bar/src/tip/data/use_mouse.rs      |  6 ++--
 .../src/tip/data/zellij_setup_check.rs        |  6 ++--
 default-plugins/tab-bar/src/main.rs           |  6 ++--
 zellij-client/src/lib.rs                      |  7 ++---
 zellij-server/src/panes/grid.rs               | 10 +++---
 zellij-server/src/panes/plugin_pane.rs        | 12 +++----
 zellij-server/src/panes/terminal_character.rs |  6 ++--
 zellij-server/src/panes/terminal_pane.rs      |  2 +-
 zellij-server/src/ui/components/mod.rs        |  2 +-
 .../src/ui/components/nested_list.rs          |  2 +-
 zellij-server/src/ui/components/ribbon.rs     | 18 +++++------
 zellij-server/src/ui/components/table.rs      |  6 ++--
 zellij-server/src/ui/components/text.rs       | 16 +++++-----
 zellij-server/src/ui/pane_boundaries_frame.rs | 12 +++----
 zellij-server/src/ui/pane_contents_and_ui.rs  |  4 +--
 zellij-utils/src/data.rs                      |  3 +-
 zellij-utils/src/input/config.rs              | 31 +++++++------------
 zellij-utils/src/input/theme.rs               |  3 +-
 zellij-utils/src/kdl/mod.rs                   |  8 ++---
 zellij-utils/src/plugin_api/event.rs          |  4 +--
 zellij-utils/src/plugin_api/style.rs          | 16 +++++-----
 34 files changed, 131 insertions(+), 145 deletions(-)

diff --git a/default-plugins/compact-bar/src/main.rs b/default-plugins/compact-bar/src/main.rs
index 4cef964050..270bfde759 100644
--- a/default-plugins/compact-bar/src/main.rs
+++ b/default-plugins/compact-bar/src/main.rs
@@ -109,7 +109,7 @@ impl ZellijPlugin for State {
                 tabname,
                 t,
                 is_alternate_tab,
-                self.mode_info.style.styling,
+                self.mode_info.style.colors,
                 self.mode_info.capabilities,
             );
             is_alternate_tab = !is_alternate_tab;
@@ -120,7 +120,7 @@ impl ZellijPlugin for State {
             all_tabs,
             active_tab_index,
             cols.saturating_sub(1),
-            self.mode_info.style.styling,
+            self.mode_info.style.colors,
             self.mode_info.capabilities,
             self.mode_info.style.hide_session_name,
             self.mode_info.mode,
@@ -131,7 +131,7 @@ impl ZellijPlugin for State {
             .tab_line
             .iter()
             .fold(String::new(), |output, part| output + &part.part);
-        let background = self.mode_info.style.styling.text_unselected[5];
+        let background = self.mode_info.style.colors.text_unselected[5];
         match background {
             PaletteColor::Rgb((r, g, b)) => {
                 print!("{}\u{1b}[48;2;{};{};{}m\u{1b}[0K", output, r, g, b);
diff --git a/default-plugins/session-manager/src/main.rs b/default-plugins/session-manager/src/main.rs
index 66000ac5f2..9aebb6df52 100644
--- a/default-plugins/session-manager/src/main.rs
+++ b/default-plugins/session-manager/src/main.rs
@@ -93,7 +93,7 @@ impl ZellijPlugin for State {
         let mut should_render = false;
         match event {
             Event::ModeUpdate(mode_info) => {
-                self.colors = Colors::new(mode_info.style.styling);
+                self.colors = Colors::new(mode_info.style.colors);
                 should_render = true;
             },
             Event::Key(key) => {
diff --git a/default-plugins/status-bar/src/first_line.rs b/default-plugins/status-bar/src/first_line.rs
index 8444c6ba4a..469e157ac8 100644
--- a/default-plugins/status-bar/src/first_line.rs
+++ b/default-plugins/status-bar/src/first_line.rs
@@ -353,8 +353,8 @@ fn swap_layout_keycode(mode_info: &ModeInfo) -> LinePart {
     );
     let prev_next_keys_indicator = style_key_with_modifier(
         &prev_next_keys,
-        &mode_info.style.styling,
-        Some(mode_info.style.styling.text_unselected[5]),
+        &mode_info.style.colors,
+        Some(mode_info.style.colors.text_unselected[5]),
     );
     let keycode = ANSIStrings(&prev_next_keys_indicator);
     let len = unstyled_len(&keycode);
@@ -614,7 +614,7 @@ pub fn first_line(
     separator: &str,
 ) -> LinePart {
     let supports_arrow_fonts = !help.capabilities.arrow_fonts;
-    let colored_elements = color_elements(help.style.styling, !supports_arrow_fonts);
+    let colored_elements = color_elements(help.style.colors, !supports_arrow_fonts);
     let binds = &help.get_mode_keybinds();
     // Unselect all by default
     let mut default_keys = vec![
diff --git a/default-plugins/status-bar/src/main.rs b/default-plugins/status-bar/src/main.rs
index ce2e9d71ee..6d028dff8f 100644
--- a/default-plugins/status-bar/src/main.rs
+++ b/default-plugins/status-bar/src/main.rs
@@ -245,7 +245,7 @@ impl ZellijPlugin for State {
         let first_line = first_line(&self.mode_info, active_tab, cols, separator);
         let second_line = self.second_line(cols);
 
-        let background = self.mode_info.style.styling.text_unselected[5];
+        let background = self.mode_info.style.colors.text_unselected[5];
         // [48;5;238m is white background, [0K is so that it fills the rest of the line
         // [m is background reset, [0K is so that it clears the rest of the line
         match background {
@@ -284,18 +284,18 @@ impl State {
         let active_tab = self.tabs.iter().find(|t| t.active);
 
         if let Some(copy_destination) = self.text_copy_destination {
-            text_copied_hint(&self.mode_info.style.styling, copy_destination)
+            text_copied_hint(&self.mode_info.style.colors, copy_destination)
         } else if self.display_system_clipboard_failure {
-            system_clipboard_error(&self.mode_info.style.styling)
+            system_clipboard_error(&self.mode_info.style.colors)
         } else if let Some(active_tab) = active_tab {
             if active_tab.is_fullscreen_active {
                 match self.mode_info.mode {
                     InputMode::Normal => fullscreen_panes_to_hide(
-                        &self.mode_info.style.styling,
+                        &self.mode_info.style.colors,
                         active_tab.panes_to_hide,
                     ),
                     InputMode::Locked => locked_fullscreen_panes_to_hide(
-                        &self.mode_info.style.styling,
+                        &self.mode_info.style.colors,
                         active_tab.panes_to_hide,
                     ),
                     _ => keybinds(&self.mode_info, &self.tip_name, cols),
@@ -304,7 +304,7 @@ impl State {
                 match self.mode_info.mode {
                     InputMode::Normal => floating_panes_are_visible(&self.mode_info),
                     InputMode::Locked => {
-                        locked_floating_panes_are_visible(&self.mode_info.style.styling)
+                        locked_floating_panes_are_visible(&self.mode_info.style.colors)
                     },
                     _ => keybinds(&self.mode_info, &self.tip_name, cols),
                 }
diff --git a/default-plugins/status-bar/src/second_line.rs b/default-plugins/status-bar/src/second_line.rs
index d35e517c92..ebb09c3054 100644
--- a/default-plugins/status-bar/src/second_line.rs
+++ b/default-plugins/status-bar/src/second_line.rs
@@ -60,9 +60,9 @@ fn add_shortcut(
     keys: Vec<KeyWithModifier>,
 ) -> LinePart {
     let shortcut = if linepart.len == 0 {
-        full_length_shortcut(true, keys, text, help.style.styling)
+        full_length_shortcut(true, keys, text, help.style.colors)
     } else {
-        full_length_shortcut(false, keys, text, help.style.styling)
+        full_length_shortcut(false, keys, text, help.style.colors)
     };
 
     let mut new_linepart = LinePart::default();
@@ -270,7 +270,7 @@ fn get_keys_and_hints(mi: &ModeInfo) -> Vec<(String, String, Vec<KeyWithModifier
 fn full_shortcut_list(help: &ModeInfo, tip: TipFn) -> LinePart {
     match help.mode {
         InputMode::Normal => tip(help),
-        InputMode::Locked => locked_interface_indication(help.style.styling),
+        InputMode::Locked => locked_interface_indication(help.style.colors),
         _ => full_shortcut_list_nonstandard_mode(help),
     }
 }
@@ -288,7 +288,7 @@ fn shortened_shortcut_list_nonstandard_mode(help: &ModeInfo) -> LinePart {
 fn shortened_shortcut_list(help: &ModeInfo, tip: TipFn) -> LinePart {
     match help.mode {
         InputMode::Normal => tip(help),
-        InputMode::Locked => locked_interface_indication(help.style.styling),
+        InputMode::Locked => locked_interface_indication(help.style.colors),
         _ => shortened_shortcut_list_nonstandard_mode(help),
     }
 }
@@ -320,7 +320,7 @@ fn best_effort_shortcut_list(help: &ModeInfo, tip: TipFn, max_len: usize) -> Lin
             }
         },
         InputMode::Locked => {
-            let line_part = locked_interface_indication(help.style.styling);
+            let line_part = locked_interface_indication(help.style.colors);
             if line_part.len <= max_len {
                 line_part
             } else {
@@ -403,7 +403,7 @@ pub fn fullscreen_panes_to_hide(palette: &Styling, panes_to_hide: usize) -> Line
 }
 
 pub fn floating_panes_are_visible(mode_info: &ModeInfo) -> LinePart {
-    let palette = mode_info.style.styling;
+    let palette = mode_info.style.colors;
     let km = &mode_info.get_mode_keybinds();
     let white_color = palette_match!(palette.text_unselected[0]);
     let green_color = palette_match!(palette.text_unselected[3]);
diff --git a/default-plugins/status-bar/src/tip/data/compact_layout.rs b/default-plugins/status-bar/src/tip/data/compact_layout.rs
index ac85ca6364..ab8e33cc38 100644
--- a/default-plugins/status-bar/src/tip/data/compact_layout.rs
+++ b/default-plugins/status-bar/src/tip/data/compact_layout.rs
@@ -25,7 +25,7 @@ macro_rules! strings {
 pub fn compact_layout_full(help: &ModeInfo) -> LinePart {
     // Tip: UI taking up too much space? Start Zellij with
     // zellij -l compact or remove pane frames with Ctrl + <p> + <z>
-    let green_color = palette_match!(help.style.styling.text_unselected[1]);
+    let green_color = palette_match!(help.style.colors.text_unselected[1]);
 
     let mut bits = vec![
         Style::new().paint(" Tip: "),
@@ -43,7 +43,7 @@ pub fn compact_layout_full(help: &ModeInfo) -> LinePart {
 pub fn compact_layout_medium(help: &ModeInfo) -> LinePart {
     // Tip: To save screen space, start Zellij with
     // zellij -l compact or remove pane frames with Ctrl + <p> + <z>
-    let green_color = palette_match!(help.style.styling.text_unselected[1]);
+    let green_color = palette_match!(help.style.colors.text_unselected[1]);
 
     let mut bits = vec![
         Style::new().paint(" Tip: "),
@@ -61,7 +61,7 @@ pub fn compact_layout_medium(help: &ModeInfo) -> LinePart {
 pub fn compact_layout_short(help: &ModeInfo) -> LinePart {
     // Save screen space, start Zellij with
     // zellij -l compact or remove pane frames with Ctrl + <p> + <z>
-    let green_color = palette_match!(help.style.styling.text_unselected[1]);
+    let green_color = palette_match!(help.style.colors.text_unselected[1]);
 
     let mut bits = vec![
         Style::new().paint(" Save screen space, start with: "),
@@ -93,11 +93,11 @@ fn add_keybinds(help: &ModeInfo) -> Vec<ANSIString> {
     }
 
     let mut bits = vec![];
-    bits.extend(style_key_with_modifier(&to_pane, &help.style.styling, None));
+    bits.extend(style_key_with_modifier(&to_pane, &help.style.colors, None));
     bits.push(Style::new().paint(", "));
     bits.extend(style_key_with_modifier(
         &pane_frames,
-        &help.style.styling,
+        &help.style.colors,
         None,
     ));
     bits
diff --git a/default-plugins/status-bar/src/tip/data/edit_scrollbuffer.rs b/default-plugins/status-bar/src/tip/data/edit_scrollbuffer.rs
index 7d7def374e..e3a0303bd0 100644
--- a/default-plugins/status-bar/src/tip/data/edit_scrollbuffer.rs
+++ b/default-plugins/status-bar/src/tip/data/edit_scrollbuffer.rs
@@ -24,7 +24,7 @@ macro_rules! strings {
 pub fn edit_scrollbuffer_full(help: &ModeInfo) -> LinePart {
     // Tip: Search through the scrollbuffer using your default $EDITOR with
     // Ctrl + <s> + <e>
-    let green_color = palette_match!(help.style.styling.text_unselected[1]);
+    let green_color = palette_match!(help.style.colors.text_unselected[1]);
 
     let mut bits = vec![
         Style::new().paint(" Tip: "),
@@ -39,7 +39,7 @@ pub fn edit_scrollbuffer_full(help: &ModeInfo) -> LinePart {
 pub fn edit_scrollbuffer_medium(help: &ModeInfo) -> LinePart {
     // Tip: Search the scrollbuffer using your $EDITOR with
     // Ctrl + <s> + <e>
-    let green_color = palette_match!(help.style.styling.text_unselected[1]);
+    let green_color = palette_match!(help.style.colors.text_unselected[1]);
 
     let mut bits = vec![
         Style::new().paint(" Tip: "),
@@ -54,7 +54,7 @@ pub fn edit_scrollbuffer_medium(help: &ModeInfo) -> LinePart {
 pub fn edit_scrollbuffer_short(help: &ModeInfo) -> LinePart {
     // Search using $EDITOR with
     // Ctrl + <s> + <e>
-    let green_color = palette_match!(help.style.styling.text_unselected[1]);
+    let green_color = palette_match!(help.style.colors.text_unselected[1]);
 
     let mut bits = vec![
         Style::new().paint(" Search using "),
@@ -83,11 +83,11 @@ fn add_keybinds(help: &ModeInfo) -> Vec<ANSIString> {
     }
 
     let mut bits = vec![];
-    bits.extend(style_key_with_modifier(&to_pane, &help.style.styling, None));
+    bits.extend(style_key_with_modifier(&to_pane, &help.style.colors, None));
     bits.push(Style::new().paint(", "));
     bits.extend(style_key_with_modifier(
         &edit_buffer,
-        &help.style.styling,
+        &help.style.colors,
         None,
     ));
     bits
diff --git a/default-plugins/status-bar/src/tip/data/floating_panes_mouse.rs b/default-plugins/status-bar/src/tip/data/floating_panes_mouse.rs
index 3956d8ba07..4bf4a143dc 100644
--- a/default-plugins/status-bar/src/tip/data/floating_panes_mouse.rs
+++ b/default-plugins/status-bar/src/tip/data/floating_panes_mouse.rs
@@ -62,11 +62,11 @@ fn add_keybinds(help: &ModeInfo) -> Vec<ANSIString> {
     }
 
     let mut bits = vec![];
-    bits.extend(style_key_with_modifier(&to_pane, &help.style.styling, None));
+    bits.extend(style_key_with_modifier(&to_pane, &help.style.colors, None));
     bits.push(Style::new().paint(", "));
     bits.extend(style_key_with_modifier(
         &floating_toggle,
-        &help.style.styling,
+        &help.style.colors,
         None,
     ));
     bits
diff --git a/default-plugins/status-bar/src/tip/data/move_focus_hjkl_tab_switch.rs b/default-plugins/status-bar/src/tip/data/move_focus_hjkl_tab_switch.rs
index fbf229ad76..c39ea302e1 100644
--- a/default-plugins/status-bar/src/tip/data/move_focus_hjkl_tab_switch.rs
+++ b/default-plugins/status-bar/src/tip/data/move_focus_hjkl_tab_switch.rs
@@ -70,8 +70,8 @@ fn add_keybinds(help: &ModeInfo) -> Vec<ANSIString> {
             letters.push(key);
         }
     }
-    let arrows = style_key_with_modifier(&arrows, &help.style.styling, None);
-    let letters = style_key_with_modifier(&letters, &help.style.styling, None);
+    let arrows = style_key_with_modifier(&arrows, &help.style.colors, None);
+    let letters = style_key_with_modifier(&letters, &help.style.colors, None);
     if arrows.is_empty() && letters.is_empty() {
         vec![Style::new().bold().paint("UNBOUND")]
     } else if arrows.is_empty() || letters.is_empty() {
diff --git a/default-plugins/status-bar/src/tip/data/move_tabs.rs b/default-plugins/status-bar/src/tip/data/move_tabs.rs
index 462c1902d4..3850c12fe1 100644
--- a/default-plugins/status-bar/src/tip/data/move_tabs.rs
+++ b/default-plugins/status-bar/src/tip/data/move_tabs.rs
@@ -25,7 +25,7 @@ macro_rules! strings {
 pub fn move_tabs_full(help: &ModeInfo) -> LinePart {
     // Tip: Wrong order of tabs? You can move them to left and right with:
     // Alt + i (left) and Alt + o (right)
-    let green_color = palette_match!(help.style.styling.text_unselected[3]);
+    let green_color = palette_match!(help.style.colors.text_unselected[3]);
 
     let bits = vec![
         Style::new().paint(" Tip: "),
@@ -41,7 +41,7 @@ pub fn move_tabs_full(help: &ModeInfo) -> LinePart {
 pub fn move_tabs_medium(help: &ModeInfo) -> LinePart {
     // Tip: You can move tabs to left and right with:
     // Alt + i (left) and Alt + o (right)
-    let green_color = palette_match!(help.style.styling.text_unselected[3]);
+    let green_color = palette_match!(help.style.colors.text_unselected[3]);
 
     let bits = vec![
         Style::new().paint(" Tip: "),
@@ -56,7 +56,7 @@ pub fn move_tabs_medium(help: &ModeInfo) -> LinePart {
 
 pub fn move_tabs_short(help: &ModeInfo) -> LinePart {
     // Move tabs with: Alt + i (left) and Alt + o (right)
-    let green_color = palette_match!(help.style.styling.text_unselected[3]);
+    let green_color = palette_match!(help.style.colors.text_unselected[3]);
 
     let bits = vec![
         Style::new().paint(" Move tabs with: "),
diff --git a/default-plugins/status-bar/src/tip/data/quicknav.rs b/default-plugins/status-bar/src/tip/data/quicknav.rs
index 4e1c205391..9d66754e2b 100644
--- a/default-plugins/status-bar/src/tip/data/quicknav.rs
+++ b/default-plugins/status-bar/src/tip/data/quicknav.rs
@@ -66,7 +66,7 @@ fn add_keybinds(help: &ModeInfo) -> Keygroups {
     let new_pane = if new_pane_keys.is_empty() {
         vec![Style::new().bold().paint("UNBOUND")]
     } else {
-        style_key_with_modifier(&new_pane_keys, &help.style.styling, None)
+        style_key_with_modifier(&new_pane_keys, &help.style.colors, None)
     };
 
     let mut resize_keys = action_key_group(
@@ -84,7 +84,7 @@ fn add_keybinds(help: &ModeInfo) -> Keygroups {
     let resize = if resize_keys.is_empty() {
         vec![Style::new().bold().paint("UNBOUND")]
     } else {
-        style_key_with_modifier(&resize_keys, &help.style.styling, None)
+        style_key_with_modifier(&resize_keys, &help.style.colors, None)
     };
 
     let move_focus_keys = action_key_group(
@@ -113,8 +113,8 @@ fn add_keybinds(help: &ModeInfo) -> Keygroups {
             letters.push(key);
         }
     }
-    let arrows = style_key_with_modifier(&arrows, &help.style.styling, None);
-    let letters = style_key_with_modifier(&letters, &help.style.styling, None);
+    let arrows = style_key_with_modifier(&arrows, &help.style.colors, None);
+    let letters = style_key_with_modifier(&letters, &help.style.colors, None);
     let move_focus = if arrows.is_empty() && letters.is_empty() {
         vec![Style::new().bold().paint("UNBOUND")]
     } else if arrows.is_empty() || letters.is_empty() {
diff --git a/default-plugins/status-bar/src/tip/data/send_mouse_click_to_terminal.rs b/default-plugins/status-bar/src/tip/data/send_mouse_click_to_terminal.rs
index b948c2567b..bad0ef96b4 100644
--- a/default-plugins/status-bar/src/tip/data/send_mouse_click_to_terminal.rs
+++ b/default-plugins/status-bar/src/tip/data/send_mouse_click_to_terminal.rs
@@ -23,8 +23,8 @@ macro_rules! strings {
 
 pub fn mouse_click_to_terminal_full(help: &ModeInfo) -> LinePart {
     // Tip: SHIFT + <mouse-click> bypasses Zellij and sends the mouse click directly to the terminal
-    let green_color = palette_match!(help.style.styling.text_unselected[3]);
-    let orange_color = palette_match!(help.style.styling.text_unselected[1]);
+    let green_color = palette_match!(help.style.colors.text_unselected[3]);
+    let orange_color = palette_match!(help.style.colors.text_unselected[1]);
 
     strings!(&[
         Style::new().paint(" Tip: "),
@@ -37,8 +37,8 @@ pub fn mouse_click_to_terminal_full(help: &ModeInfo) -> LinePart {
 
 pub fn mouse_click_to_terminal_medium(help: &ModeInfo) -> LinePart {
     // Tip: SHIFT + <mouse-click> sends the click directly to the terminal
-    let green_color = palette_match!(help.style.styling.text_unselected[3]);
-    let orange_color = palette_match!(help.style.styling.text_unselected[1]);
+    let green_color = palette_match!(help.style.colors.text_unselected[3]);
+    let orange_color = palette_match!(help.style.colors.text_unselected[1]);
     strings!(&[
         Style::new().paint(" Tip: "),
         Style::new().fg(orange_color).bold().paint("Shift"),
@@ -50,8 +50,8 @@ pub fn mouse_click_to_terminal_medium(help: &ModeInfo) -> LinePart {
 
 pub fn mouse_click_to_terminal_short(help: &ModeInfo) -> LinePart {
     // Tip: SHIFT + <mouse-click>  => sends click to terminal.
-    let green_color = palette_match!(help.style.styling.text_unselected[3]);
-    let orange_color = palette_match!(help.style.styling.text_unselected[1]);
+    let green_color = palette_match!(help.style.colors.text_unselected[3]);
+    let orange_color = palette_match!(help.style.colors.text_unselected[1]);
 
     strings!(&[
         Style::new().paint(" Tip: "),
diff --git a/default-plugins/status-bar/src/tip/data/sync_tab.rs b/default-plugins/status-bar/src/tip/data/sync_tab.rs
index 7094c3c23d..486e2aa242 100644
--- a/default-plugins/status-bar/src/tip/data/sync_tab.rs
+++ b/default-plugins/status-bar/src/tip/data/sync_tab.rs
@@ -61,11 +61,11 @@ fn add_keybinds(help: &ModeInfo) -> Vec<ANSIString> {
     }
 
     let mut bits = vec![];
-    bits.extend(style_key_with_modifier(&to_tab, &help.style.styling, None));
+    bits.extend(style_key_with_modifier(&to_tab, &help.style.colors, None));
     bits.push(Style::new().paint(", "));
     bits.extend(style_key_with_modifier(
         &sync_tabs,
-        &help.style.styling,
+        &help.style.colors,
         None,
     ));
     bits
diff --git a/default-plugins/status-bar/src/tip/data/use_mouse.rs b/default-plugins/status-bar/src/tip/data/use_mouse.rs
index 240d0df74a..af7225e943 100644
--- a/default-plugins/status-bar/src/tip/data/use_mouse.rs
+++ b/default-plugins/status-bar/src/tip/data/use_mouse.rs
@@ -24,7 +24,7 @@ macro_rules! strings {
 pub fn use_mouse_full(help: &ModeInfo) -> LinePart {
     // Tip: Use the mouse to switch pane focus, scroll through the pane
     // scrollbuffer, switch or scroll through tabs
-    let green_color = palette_match!(help.style.styling.text_unselected[3]);
+    let green_color = palette_match!(help.style.colors.text_unselected[3]);
 
     strings!(&[
         Style::new().paint(" Tip: "),
@@ -36,7 +36,7 @@ pub fn use_mouse_full(help: &ModeInfo) -> LinePart {
 pub fn use_mouse_medium(help: &ModeInfo) -> LinePart {
     // Tip: Use the mouse to switch panes/tabs or scroll through the pane
     // scrollbuffer
-    let green_color = palette_match!(help.style.styling.text_unselected[3]);
+    let green_color = palette_match!(help.style.colors.text_unselected[3]);
 
     strings!(&[
         Style::new().paint(" Tip: "),
@@ -47,7 +47,7 @@ pub fn use_mouse_medium(help: &ModeInfo) -> LinePart {
 
 pub fn use_mouse_short(help: &ModeInfo) -> LinePart {
     // Tip: Use the mouse to switch panes/tabs or scroll
-    let green_color = palette_match!(help.style.styling.text_unselected[3]);
+    let green_color = palette_match!(help.style.colors.text_unselected[3]);
 
     strings!(&[
         Style::new().fg(green_color).bold().paint(" Use the mouse"),
diff --git a/default-plugins/status-bar/src/tip/data/zellij_setup_check.rs b/default-plugins/status-bar/src/tip/data/zellij_setup_check.rs
index bfa39544c1..d7e483cc78 100644
--- a/default-plugins/status-bar/src/tip/data/zellij_setup_check.rs
+++ b/default-plugins/status-bar/src/tip/data/zellij_setup_check.rs
@@ -23,7 +23,7 @@ macro_rules! strings {
 
 pub fn zellij_setup_check_full(help: &ModeInfo) -> LinePart {
     // Tip: Having issues with Zellij? Try running "zellij setup --check"
-    let orange_color = palette_match!(help.style.styling.text_unselected[1]);
+    let orange_color = palette_match!(help.style.colors.text_unselected[1]);
 
     strings!(&[
         Style::new().paint(" Tip: "),
@@ -37,7 +37,7 @@ pub fn zellij_setup_check_full(help: &ModeInfo) -> LinePart {
 
 pub fn zellij_setup_check_medium(help: &ModeInfo) -> LinePart {
     // Tip: Run "zellij setup --check" to find issues
-    let orange_color = palette_match!(help.style.styling.text_unselected[1]);
+    let orange_color = palette_match!(help.style.colors.text_unselected[1]);
 
     strings!(&[
         Style::new().paint(" Tip: "),
@@ -52,7 +52,7 @@ pub fn zellij_setup_check_medium(help: &ModeInfo) -> LinePart {
 
 pub fn zellij_setup_check_short(help: &ModeInfo) -> LinePart {
     // Run "zellij setup --check" to find issues
-    let orange_color = palette_match!(help.style.styling.text_unselected[1]);
+    let orange_color = palette_match!(help.style.colors.text_unselected[1]);
 
     strings!(&[
         Style::new().paint(" Run "),
diff --git a/default-plugins/tab-bar/src/main.rs b/default-plugins/tab-bar/src/main.rs
index e7d794a314..751900b9fb 100644
--- a/default-plugins/tab-bar/src/main.rs
+++ b/default-plugins/tab-bar/src/main.rs
@@ -118,7 +118,7 @@ impl ZellijPlugin for State {
                 tabname,
                 t,
                 is_alternate_tab,
-                self.mode_info.style.styling,
+                self.mode_info.style.colors,
                 self.mode_info.capabilities,
             );
             is_alternate_tab = !is_alternate_tab;
@@ -129,7 +129,7 @@ impl ZellijPlugin for State {
             all_tabs,
             active_tab_index,
             cols.saturating_sub(1),
-            self.mode_info.style.styling,
+            self.mode_info.style.colors,
             self.mode_info.capabilities,
             self.mode_info.style.hide_session_name,
             self.tabs.iter().find(|t| t.active),
@@ -142,7 +142,7 @@ impl ZellijPlugin for State {
             .iter()
             .fold(String::new(), |output, part| output + &part.part);
 
-        let background = self.mode_info.style.styling.text_unselected[5];
+        let background = self.mode_info.style.colors.text_unselected[5];
         match background {
             PaletteColor::Rgb((r, g, b)) => {
                 print!("{}\u{1b}[48;2;{};{};{}m\u{1b}[0K", output, r, g, b);
diff --git a/zellij-client/src/lib.rs b/zellij-client/src/lib.rs
index a6928aea0a..1f8fc611f2 100644
--- a/zellij-client/src/lib.rs
+++ b/zellij-client/src/lib.rs
@@ -206,16 +206,15 @@ pub fn start_client(
     envs::set_zellij("0".to_string());
     config.env.set_vars();
 
-    let (palette, styling) = config
+    let styling = config
         .theme_config(&config_options)
-        .unwrap_or_else(|| (os_input.load_palette(), os_input.load_palette().into()));
+        .unwrap_or_else(|| os_input.load_palette().into());
 
     let full_screen_ws = os_input.get_terminal_size_using_fd(0);
     let client_attributes = ClientAttributes {
         size: full_screen_ws,
         style: Style {
-            colors: palette,
-            styling: styling,
+            colors: styling,
             rounded_corners: config.ui.pane_frames.rounded_corners,
             hide_session_name: config.ui.pane_frames.hide_session_name,
         },
diff --git a/zellij-server/src/panes/grid.rs b/zellij-server/src/panes/grid.rs
index d1dd986f0f..b344254820 100644
--- a/zellij-server/src/panes/grid.rs
+++ b/zellij-server/src/panes/grid.rs
@@ -1085,7 +1085,7 @@ impl Grid {
                 .selection
                 .contains_row(character_chunk.y.saturating_sub(content_y))
             {
-                let background_color = match style.styling.text_unselected[5] {
+                let background_color = match style.colors.text_unselected[5] {
                     PaletteColor::Rgb(rgb) => AnsiCode::RgbCode(rgb),
                     PaletteColor::EightBit(col) => AnsiCode::ColorIndex(col),
                 };
@@ -1102,13 +1102,13 @@ impl Grid {
                         let (select_background_palette, select_foreground_palette) =
                             if Some(res) == self.search_results.active.as_ref() {
                                 (
-                                    style.styling.text_unselected[1],
-                                    style.styling.text_unselected[5],
+                                    style.colors.text_unselected[1],
+                                    style.colors.text_unselected[5],
                                 )
                             } else {
                                 (
-                                    style.styling.text_unselected[3],
-                                    style.styling.text_unselected[5],
+                                    style.colors.text_unselected[3],
+                                    style.colors.text_unselected[5],
                                 )
                             };
                         let background_color = match select_background_palette {
diff --git a/zellij-server/src/panes/plugin_pane.rs b/zellij-server/src/panes/plugin_pane.rs
index c431a818fa..e3af7b8a93 100644
--- a/zellij-server/src/panes/plugin_pane.rs
+++ b/zellij-server/src/panes/plugin_pane.rs
@@ -120,7 +120,7 @@ impl PluginPane {
         arrow_fonts: bool,
         styled_underlines: bool,
     ) -> Self {
-        let loading_indication = LoadingIndication::new(title.clone()).with_colors(style.styling);
+        let loading_indication = LoadingIndication::new(title.clone()).with_colors(style.colors);
         let initial_loading_message = loading_indication.to_string();
         let mut plugin = PluginPane {
             pid,
@@ -617,7 +617,7 @@ impl Pane for PluginPane {
             .unwrap();
     }
     fn add_red_pane_frame_color_override(&mut self, error_text: Option<String>) {
-        self.pane_frame_color_override = Some((self.style.styling.exit_code_error[0], error_text));
+        self.pane_frame_color_override = Some((self.style.colors.exit_code_error[0], error_text));
     }
     fn clear_pane_frame_color_override(&mut self) {
         self.pane_frame_color_override = None;
@@ -696,10 +696,10 @@ impl PluginPane {
         }
     }
     fn display_request_permission_message(&self, plugin_permission: &PluginPermission) -> String {
-        let bold_white = style!(self.style.styling.text_unselected[0]).bold();
-        let cyan = style!(self.style.styling.text_unselected[2]).bold();
-        let orange = style!(self.style.styling.text_unselected[1]).bold();
-        let green = style!(self.style.styling.text_unselected[3]).bold();
+        let bold_white = style!(self.style.colors.text_unselected[0]).bold();
+        let cyan = style!(self.style.colors.text_unselected[2]).bold();
+        let orange = style!(self.style.colors.text_unselected[1]).bold();
+        let green = style!(self.style.colors.text_unselected[3]).bold();
 
         let mut messages = String::new();
         let permissions: BTreeSet<PermissionType> =
diff --git a/zellij-server/src/panes/terminal_character.rs b/zellij-server/src/panes/terminal_character.rs
index 2098f56a51..8db9fb8da2 100644
--- a/zellij-server/src/panes/terminal_character.rs
+++ b/zellij-server/src/panes/terminal_character.rs
@@ -977,7 +977,7 @@ pub fn render_first_run_banner(
         Some(run_command) => {
             let bold_text = RESET_STYLES.bold(Some(AnsiCode::On));
             let command_color_text = RESET_STYLES
-                .foreground(Some(AnsiCode::from(style.styling.text_unselected[3])))
+                .foreground(Some(AnsiCode::from(style.colors.text_unselected[3])))
                 .bold(Some(AnsiCode::On));
             let waiting_to_run_text = "Waiting to run: ";
             let command_text = run_command.to_string();
@@ -1002,7 +1002,7 @@ pub fn render_first_run_banner(
             let ctrl_c_bare_text = "Ctrl-c";
             let controls_bare_text_fourth_part = "> exit";
             let controls_color = RESET_STYLES
-                .foreground(Some(AnsiCode::from(style.styling.text_unselected[1])))
+                .foreground(Some(AnsiCode::from(style.colors.text_unselected[1])))
                 .bold(Some(AnsiCode::On));
             let controls_line_length = controls_bare_text_first_part.len()
                 + enter_bare_text.len()
@@ -1054,7 +1054,7 @@ pub fn render_first_run_banner(
             let ctrl_c_bare_text = "Ctrl-c";
             let controls_bare_text_fourth_part = "> exit";
             let controls_color = RESET_STYLES
-                .foreground(Some(AnsiCode::from(style.styling.text_unselected[1])))
+                .foreground(Some(AnsiCode::from(style.colors.text_unselected[1])))
                 .bold(Some(AnsiCode::On));
             let controls_line_length = controls_bare_text_first_part.len()
                 + enter_bare_text.len()
diff --git a/zellij-server/src/panes/terminal_pane.rs b/zellij-server/src/panes/terminal_pane.rs
index 26d9dca908..a9ce83b6f4 100644
--- a/zellij-server/src/panes/terminal_pane.rs
+++ b/zellij-server/src/panes/terminal_pane.rs
@@ -714,7 +714,7 @@ impl Pane for TerminalPane {
         self.set_should_render(true);
     }
     fn add_red_pane_frame_color_override(&mut self, error_text: Option<String>) {
-        self.pane_frame_color_override = Some((self.style.styling.exit_code_error[0], error_text));
+        self.pane_frame_color_override = Some((self.style.colors.exit_code_error[0], error_text));
     }
     fn clear_pane_frame_color_override(&mut self) {
         self.pane_frame_color_override = None;
diff --git a/zellij-server/src/ui/components/mod.rs b/zellij-server/src/ui/components/mod.rs
index 02cbdc02cf..30b526940d 100644
--- a/zellij-server/src/ui/components/mod.rs
+++ b/zellij-server/src/ui/components/mod.rs
@@ -87,7 +87,7 @@ impl<'a> UiComponentParser<'a> {
                 columns,
                 rows,
                 stringified_params,
-                Some(self.style.styling.table_title[0]),
+                Some(self.style.colors.table_title[0]),
                 &self.style,
                 component_coordinates,
             );
diff --git a/zellij-server/src/ui/components/nested_list.rs b/zellij-server/src/ui/components/nested_list.rs
index ec6a6f99d4..2754ffb311 100644
--- a/zellij-server/src/ui/components/nested_list.rs
+++ b/zellij-server/src/ui/components/nested_list.rs
@@ -57,7 +57,7 @@ pub fn nested_list(
             });
         if line_item.text.selected {
             let selected_background =
-                RESET_STYLES.background(Some(style.styling.list_selected[5].into()));
+                RESET_STYLES.background(Some(style.colors.list_selected[5].into()));
             stringified.push_str(&format!(
                 "{}{}{}{:padding$}{bulletin}{}{text}{}",
                 go_to_row_instruction,
diff --git a/zellij-server/src/ui/components/ribbon.rs b/zellij-server/src/ui/components/ribbon.rs
index 78fcf79ca1..aa4d0f0968 100644
--- a/zellij-server/src/ui/components/ribbon.rs
+++ b/zellij-server/src/ui/components/ribbon.rs
@@ -11,7 +11,7 @@ pub fn ribbon(
     arrow_fonts: bool,
     component_coordinates: Option<Coordinates>,
 ) -> Vec<u8> {
-    let colors = style.styling;
+    let colors = style.colors;
     let background = colors.text_unselected[5];
     let (first_arrow_styles, text_style, last_arrow_styles) = if content.selected {
         (
@@ -48,19 +48,19 @@ pub fn ribbon(
 
 pub fn emphasis_variants_for_ribbon(style: &Style) -> [PaletteColor; 4] {
     [
-        style.styling.ribbon_unselected[1],
-        style.styling.ribbon_unselected[2],
-        style.styling.ribbon_unselected[3],
-        style.styling.ribbon_unselected[4],
+        style.colors.ribbon_unselected[1],
+        style.colors.ribbon_unselected[2],
+        style.colors.ribbon_unselected[3],
+        style.colors.ribbon_unselected[4],
     ]
 }
 
 pub fn emphasis_variants_for_selected_ribbon(style: &Style) -> [PaletteColor; 4] {
     [
-        style.styling.ribbon_selected[1],
-        style.styling.ribbon_selected[2],
-        style.styling.ribbon_selected[3],
-        style.styling.ribbon_selected[4],
+        style.colors.ribbon_selected[1],
+        style.colors.ribbon_selected[2],
+        style.colors.ribbon_selected[3],
+        style.colors.ribbon_selected[4],
     ]
 }
 
diff --git a/zellij-server/src/ui/components/table.rs b/zellij-server/src/ui/components/table.rs
index 15847c579d..2fc0ce8384 100644
--- a/zellij-server/src/ui/components/table.rs
+++ b/zellij-server/src/ui/components/table.rs
@@ -23,8 +23,8 @@ pub fn table(
         .bold(Some(AnsiCode::On));
     let cell_styles = RESET_STYLES
         .bold(Some(AnsiCode::On))
-        .background(Some(style.styling.table_cell_unselected[5].into()))
-        .foreground(Some(style.styling.table_cell_unselected[0].into()));
+        .background(Some(style.colors.table_cell_unselected[5].into()))
+        .foreground(Some(style.colors.table_cell_unselected[0].into()));
     for (row_index, (_, row)) in stringified_rows.into_iter().enumerate() {
         let is_title_row = row_index == 0;
         if is_too_high(row_index + 1, &coordinates) {
@@ -40,7 +40,7 @@ pub fn table(
             if cell.selected {
                 reset_styles_for_item.background = None;
                 text_style =
-                    text_style.background(Some(style.styling.table_cell_selected[5].into()));
+                    text_style.background(Some(style.colors.table_cell_selected[5].into()));
             }
             // here we intentionally don't pass our coordinates even if we have them, because
             // these cells have already been padded and truncated
diff --git a/zellij-server/src/ui/components/text.rs b/zellij-server/src/ui/components/text.rs
index 365eafb7b0..5d5fe06139 100644
--- a/zellij-server/src/ui/components/text.rs
+++ b/zellij-server/src/ui/components/text.rs
@@ -14,12 +14,12 @@ use zellij_utils::errors::prelude::*;
 pub fn text(content: Text, style: &Style, component_coordinates: Option<Coordinates>) -> Vec<u8> {
     let mut text_style = RESET_STYLES
         .bold(Some(AnsiCode::On))
-        .background(Some(style.styling.text_unselected[5].into()))
-        .foreground(Some(style.styling.text_unselected[0].into()));
+        .background(Some(style.colors.text_unselected[5].into()))
+        .foreground(Some(style.colors.text_unselected[0].into()));
     if content.selected {
         text_style = text_style
-            .background(Some(style.styling.text_selected[5].into()))
-            .foreground(Some(style.styling.text_selected[0].into()));
+            .background(Some(style.colors.text_selected[5].into()))
+            .foreground(Some(style.colors.text_selected[0].into()));
     }
     let (text, _text_width) =
         stringify_text(&content, None, &component_coordinates, style, text_style);
@@ -77,10 +77,10 @@ pub fn color_index_character(
 
 pub fn emphasis_variants(style: &Style) -> [PaletteColor; 4] {
     [
-        style.styling.text_unselected[1],
-        style.styling.text_unselected[2],
-        style.styling.text_unselected[3],
-        style.styling.text_unselected[4],
+        style.colors.text_unselected[1],
+        style.colors.text_unselected[2],
+        style.colors.text_unselected[3],
+        style.colors.text_unselected[4],
     ]
 }
 
diff --git a/zellij-server/src/ui/pane_boundaries_frame.rs b/zellij-server/src/ui/pane_boundaries_frame.rs
index 5730ee9a48..c0e4bc65db 100644
--- a/zellij-server/src/ui/pane_boundaries_frame.rs
+++ b/zellij-server/src/ui/pane_boundaries_frame.rs
@@ -773,9 +773,9 @@ impl PaneFrame {
                 let exited_text = "EXIT CODE: ";
                 let exit_code_text = format!("{}", exit_code);
                 let exit_code_color = if exit_code == 0 {
-                    self.style.styling.exit_code_success[0]
+                    self.style.colors.exit_code_success[0]
                 } else {
-                    self.style.styling.exit_code_error[0]
+                    self.style.colors.exit_code_error[0]
                 };
                 let right_bracket = " ] ";
                 first_part.append(&mut foreground_color(left_bracket, self.color));
@@ -801,7 +801,7 @@ impl PaneFrame {
                 first_part.append(&mut foreground_color(left_bracket, self.color));
                 first_part.append(&mut foreground_color(
                     exited_text,
-                    Some(self.style.styling.exit_code_error[0]),
+                    Some(self.style.colors.exit_code_error[0]),
                 ));
                 first_part.append(&mut foreground_color(right_bracket, self.color));
                 (
@@ -836,7 +836,7 @@ impl PaneFrame {
         second_part.append(&mut foreground_color(left_enter_bracket, self.color));
         second_part.append(&mut foreground_color(
             enter_text,
-            Some(self.style.styling.text_unselected[4]),
+            Some(self.style.colors.text_unselected[4]),
         ));
         second_part.append(&mut foreground_color(right_enter_bracket, self.color));
         second_part.append(&mut foreground_color(enter_tip, self.color));
@@ -844,7 +844,7 @@ impl PaneFrame {
         second_part.append(&mut foreground_color(left_esc_bracket, self.color));
         second_part.append(&mut foreground_color(
             esc_text,
-            Some(self.style.styling.text_unselected[4]),
+            Some(self.style.colors.text_unselected[4]),
         ));
         second_part.append(&mut foreground_color(right_esc_bracket, self.color));
         second_part.append(&mut foreground_color(esc_tip, self.color));
@@ -852,7 +852,7 @@ impl PaneFrame {
         second_part.append(&mut foreground_color(left_break_bracket, self.color));
         second_part.append(&mut foreground_color(
             break_text,
-            Some(self.style.styling.text_unselected[4]),
+            Some(self.style.colors.text_unselected[4]),
         ));
         second_part.append(&mut foreground_color(right_break_bracket, self.color));
         second_part.append(&mut foreground_color(break_tip, self.color));
diff --git a/zellij-server/src/ui/pane_contents_and_ui.rs b/zellij-server/src/ui/pane_contents_and_ui.rs
index ed6593d2ca..9e9da215f1 100644
--- a/zellij-server/src/ui/pane_contents_and_ui.rs
+++ b/zellij-server/src/ui/pane_contents_and_ui.rs
@@ -257,13 +257,13 @@ impl<'a> PaneContentsAndUi<'a> {
             match mode {
                 InputMode::Normal | InputMode::Locked => {
                     if session_is_mirrored || !self.multiple_users_exist_in_session {
-                        Some(self.style.styling.frame_selected[0])
+                        Some(self.style.colors.frame_selected[0])
                     } else {
                         let colors = client_id_to_colors(client_id);
                         colors.map(|colors| colors.0)
                     }
                 },
-                _ => Some(self.style.styling.frame_unselected[0]),
+                _ => Some(self.style.colors.frame_unselected[0]),
             }
         } else {
             None
diff --git a/zellij-utils/src/data.rs b/zellij-utils/src/data.rs
index 31637afb0c..3ecb9b631f 100644
--- a/zellij-utils/src/data.rs
+++ b/zellij-utils/src/data.rs
@@ -1129,8 +1129,7 @@ pub struct Palette {
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Default, Serialize, Deserialize)]
 pub struct Style {
-    pub colors: Palette,
-    pub styling: Styling,
+    pub colors: Styling,
     pub rounded_corners: bool,
     pub hide_session_name: bool,
 }
diff --git a/zellij-utils/src/input/config.rs b/zellij-utils/src/input/config.rs
index 0bb73e3e1e..63dcf60403 100644
--- a/zellij-utils/src/input/config.rs
+++ b/zellij-utils/src/input/config.rs
@@ -162,16 +162,10 @@ impl TryFrom<&CliArgs> for Config {
 }
 
 impl Config {
-    pub fn theme_config(&self, opts: &Options) -> Option<(Palette, Styling)> {
+    pub fn theme_config(&self, opts: &Options) -> Option<Styling> {
         match &opts.theme {
-            Some(theme_name) => self
-                .themes
-                .get_theme(theme_name)
-                .map(|theme| (theme.palette, theme.styling)),
-            None => self
-                .themes
-                .get_theme("default")
-                .map(|theme| (theme.palette, theme.styling)),
+            Some(theme_name) => self.themes.get_theme(theme_name).map(|theme| theme.palette),
+            None => self.themes.get_theme("default").map(|theme| theme.palette),
         }
     }
     /// Gets default configuration from assets
@@ -468,8 +462,8 @@ mod config_test {
                     black: PaletteColor::Rgb((0, 0, 0)),
                     white: PaletteColor::Rgb((255, 255, 255)),
                     ..Default::default()
-                },
-                styling: Default::default(),
+                }
+                .into(),
             },
         );
         let expected_themes = Themes::from_data(expected_themes);
@@ -526,8 +520,8 @@ mod config_test {
                     black: PaletteColor::Rgb((0, 0, 0)),
                     white: PaletteColor::Rgb((255, 255, 255)),
                     ..Default::default()
-                },
-                styling: Default::default(),
+                }
+                .into(),
             },
         );
         expected_themes.insert(
@@ -546,8 +540,8 @@ mod config_test {
                     white: PaletteColor::Rgb((229, 233, 240)),
                     orange: PaletteColor::Rgb((208, 135, 112)),
                     ..Default::default()
-                },
-                styling: Default::default(),
+                }
+                .into(),
             },
         );
         let expected_themes = Themes::from_data(expected_themes);
@@ -591,8 +585,8 @@ mod config_test {
                     black: PaletteColor::EightBit(1),
                     white: PaletteColor::EightBit(255),
                     ..Default::default()
-                },
-                styling: Default::default(),
+                }
+                .into(),
             },
         );
         let expected_themes = Themes::from_data(expected_themes);
@@ -715,7 +709,7 @@ mod config_test {
         expected_themes.insert(
             "named_theme".into(),
             Theme {
-                styling: Styling {
+                palette: Styling {
                     text_unselected: [
                         PaletteColor::Rgb((220, 215, 186)),
                         PaletteColor::Rgb((220, 215, 205)),
@@ -817,7 +811,6 @@ mod config_test {
                         PaletteColor::Rgb((195, 64, 67)),
                     ],
                 },
-                palette: Default::default(),
             },
         );
         let expected_themes = Themes::from_data(expected_themes);
diff --git a/zellij-utils/src/input/theme.rs b/zellij-utils/src/input/theme.rs
index eb4c2023dc..bd6a48b6cb 100644
--- a/zellij-utils/src/input/theme.rs
+++ b/zellij-utils/src/input/theme.rs
@@ -72,8 +72,7 @@ impl Themes {
 #[derive(Debug, Clone, PartialEq, Deserialize, Serialize)]
 pub struct Theme {
     #[serde(flatten)]
-    pub palette: Palette,
-    pub styling: Styling,
+    pub palette: Styling,
 }
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
diff --git a/zellij-utils/src/kdl/mod.rs b/zellij-utils/src/kdl/mod.rs
index d87cf246b2..1522e83785 100644
--- a/zellij-utils/src/kdl/mod.rs
+++ b/zellij-utils/src/kdl/mod.rs
@@ -2068,10 +2068,7 @@ impl Themes {
                         exit_code_error: Themes::colors_from_node(style, "exit_code_error")?,
                     };
 
-                    Theme {
-                        palette: s.into(),
-                        styling: s,
-                    }
+                    Theme { palette: s }
                 },
                 // Older palette based theme definition
                 None => {
@@ -2090,8 +2087,7 @@ impl Themes {
                         ..Default::default()
                     };
                     Theme {
-                        palette,
-                        styling: palette.into(),
+                        palette: palette.into(),
                     }
                 },
             };
diff --git a/zellij-utils/src/plugin_api/event.rs b/zellij-utils/src/plugin_api/event.rs
index 30814b842e..6ff6180f17 100644
--- a/zellij-utils/src/plugin_api/event.rs
+++ b/zellij-utils/src/plugin_api/event.rs
@@ -1114,9 +1114,9 @@ fn serialize_mode_update_event_with_non_default_values() {
                 silver: PaletteColor::EightBit(2),
                 pink: PaletteColor::EightBit(2),
                 brown: PaletteColor::Rgb((222, 221, 220)),
-            },
+            }
+            .into(),
             // TODO: replace default
-            styling: Default::default(),
             rounded_corners: true,
             hide_session_name: false,
         },
diff --git a/zellij-utils/src/plugin_api/style.rs b/zellij-utils/src/plugin_api/style.rs
index fb368e30a3..0659a410f2 100644
--- a/zellij-utils/src/plugin_api/style.rs
+++ b/zellij-utils/src/plugin_api/style.rs
@@ -11,13 +11,12 @@ use std::convert::TryFrom;
 impl TryFrom<ProtobufStyle> for Style {
     type Error = &'static str;
     fn try_from(protobuf_style: ProtobufStyle) -> Result<Self, &'static str> {
-        let s = protobuf_style.styling.ok_or("malformed")?.try_into()?;
+        let s = protobuf_style
+            .styling
+            .ok_or("malformed style payload")?
+            .try_into()?;
         Ok(Style {
-            colors: protobuf_style
-                .palette
-                .ok_or("malformed style payload")?
-                .try_into()?,
-            styling: s,
+            colors: s,
             rounded_corners: protobuf_style.rounded_corners,
             hide_session_name: protobuf_style.hide_session_name,
         })
@@ -27,9 +26,10 @@ impl TryFrom<ProtobufStyle> for Style {
 impl TryFrom<Style> for ProtobufStyle {
     type Error = &'static str;
     fn try_from(style: Style) -> Result<Self, &'static str> {
-        let s = ProtobufStyling::try_from(style.styling)?;
+        let s = ProtobufStyling::try_from(style.colors)?;
+        let palette = Palette::try_from(style.colors).map_err(|_| "malformed style payload")?;
         Ok(ProtobufStyle {
-            palette: Some(style.colors.try_into()?),
+            palette: Some(palette.try_into()?),
             rounded_corners: style.rounded_corners,
             hide_session_name: style.hide_session_name,
             styling: Some(s),

From 229248183637001788b738052baccd3dcb98ac7f Mon Sep 17 00:00:00 2001
From: Mark Grey <mgthesecond@spotify.com>
Date: Wed, 3 Apr 2024 14:55:40 -0400
Subject: [PATCH 24/40] temporarily ignore snapshot assertions for draft

---
 zellij-utils/src/input/unit/theme_test.rs | 1 +
 zellij-utils/src/setup.rs                 | 1 +
 2 files changed, 2 insertions(+)

diff --git a/zellij-utils/src/input/unit/theme_test.rs b/zellij-utils/src/input/unit/theme_test.rs
index 97d5adc925..22113d8f63 100644
--- a/zellij-utils/src/input/unit/theme_test.rs
+++ b/zellij-utils/src/input/unit/theme_test.rs
@@ -8,6 +8,7 @@ fn theme_test_dir(theme: String) -> PathBuf {
     theme_dir.join(theme)
 }
 
+#[ignore]
 #[test]
 fn dracula_theme_from_file() {
     let path = theme_test_dir("dracula.kdl".into());
diff --git a/zellij-utils/src/setup.rs b/zellij-utils/src/setup.rs
index 941c351b5f..949b126d1b 100644
--- a/zellij-utils/src/setup.rs
+++ b/zellij-utils/src/setup.rs
@@ -824,6 +824,7 @@ mod setup_test {
         let (config, _layout, _options, _, _) = Setup::from_cli_args(&cli_args).unwrap();
         assert_snapshot!(format!("{:#?}", config));
     }
+    #[ignore]
     #[test]
     fn layout_themes_override_config_themes() {
         let mut cli_args = CliArgs::default();

From def2f5bf33d0a304aa2f92c75deb610f92e5e84f Mon Sep 17 00:00:00 2001
From: Mark Grey <mgthesecond@spotify.com>
Date: Tue, 21 May 2024 10:58:08 -0400
Subject: [PATCH 25/40] convert to structs with named fields

---
 default-plugins/compact-bar/src/line.rs       |  26 +--
 default-plugins/compact-bar/src/main.rs       |   2 +-
 default-plugins/compact-bar/src/tab.rs        |  12 +-
 .../session-manager/src/ui/components.rs      |  26 +--
 default-plugins/status-bar/src/first_line.rs  |   2 +-
 default-plugins/status-bar/src/main.rs        |  58 ++---
 default-plugins/status-bar/src/second_line.rs |  30 +--
 .../status-bar/src/tip/data/compact_layout.rs |   6 +-
 .../src/tip/data/edit_scrollbuffer.rs         |   6 +-
 .../status-bar/src/tip/data/move_tabs.rs      |   6 +-
 .../tip/data/send_mouse_click_to_terminal.rs  |  12 +-
 .../status-bar/src/tip/data/use_mouse.rs      |   6 +-
 .../src/tip/data/zellij_setup_check.rs        |   6 +-
 default-plugins/tab-bar/src/line.rs           |  22 +-
 default-plugins/tab-bar/src/main.rs           |   2 +-
 default-plugins/tab-bar/src/tab.rs            |  12 +-
 zellij-client/src/lib.rs                      |   2 +-
 zellij-server/src/panes/grid.rs               |  10 +-
 zellij-server/src/panes/plugin_pane.rs        |  10 +-
 zellij-server/src/panes/terminal_character.rs |   6 +-
 zellij-server/src/panes/terminal_pane.rs      |   2 +-
 zellij-server/src/ui/components/mod.rs        |   2 +-
 .../src/ui/components/nested_list.rs          |   2 +-
 zellij-server/src/ui/components/ribbon.rs     |  30 +--
 zellij-server/src/ui/components/table.rs      |   6 +-
 zellij-server/src/ui/components/text.rs       |  16 +-
 zellij-server/src/ui/loading_indication.rs    |   8 +-
 zellij-server/src/ui/pane_boundaries_frame.rs |  12 +-
 zellij-server/src/ui/pane_contents_and_ui.rs  |   4 +-
 zellij-utils/assets/prost/api.style.rs        |   2 +
 zellij-utils/src/data.rs                      | 202 ++++++++++--------
 zellij-utils/src/input/config.rs              |   3 +-
 zellij-utils/src/input/theme.rs               |   2 +-
 zellij-utils/src/kdl/mod.rs                   |  92 ++++----
 zellij-utils/src/plugin_api/style.proto       |   1 +
 zellij-utils/src/plugin_api/style.rs          | 126 ++++++++---
 36 files changed, 442 insertions(+), 330 deletions(-)

diff --git a/default-plugins/compact-bar/src/line.rs b/default-plugins/compact-bar/src/line.rs
index 49f63f4c3c..043b714e90 100644
--- a/default-plugins/compact-bar/src/line.rs
+++ b/default-plugins/compact-bar/src/line.rs
@@ -122,8 +122,8 @@ fn left_more_message(
     // 238
     // chars length plus separator length on both sides
     let more_text_len = more_text.width() + 2 * separator.width();
-    let (text_color, sep_color) = (palette.ribbon_unselected[0], palette.text_unselected[5]);
-    let plus_ribbon_bg = palette.text_selected[1];
+    let (text_color, sep_color) = (palette.ribbon_unselected.base, palette.text_unselected.background);
+    let plus_ribbon_bg = palette.text_selected.emphasis_1;
     let left_separator = style!(sep_color, plus_ribbon_bg).paint(separator);
     let more_styled_text = style!(text_color, plus_ribbon_bg).bold().paint(more_text);
     let right_separator = style!(plus_ribbon_bg, sep_color).paint(separator);
@@ -153,8 +153,8 @@ fn right_more_message(
     // chars length plus separator length on both sides
     let more_text_len = more_text.width() + 2 * separator.width();
 
-    let (text_color, sep_color) = (palette.ribbon_unselected[0], palette.text_unselected[5]);
-    let plus_ribbon_bg = palette.text_selected[1];
+    let (text_color, sep_color) = (palette.ribbon_unselected.base, palette.text_unselected.background);
+    let plus_ribbon_bg = palette.text_selected.emphasis_1;
     let left_separator = style!(sep_color, plus_ribbon_bg).paint(separator);
     let more_styled_text = style!(text_color, plus_ribbon_bg).bold().paint(more_text);
     let right_separator = style!(plus_ribbon_bg, sep_color).paint(separator);
@@ -176,11 +176,11 @@ fn tab_line_prefix(
     let prefix_text = " Zellij ".to_string();
 
     let prefix_text_len = prefix_text.chars().count();
-    let text_color = palette.text_unselected[0];
-    let bg_color = palette.text_unselected[5];
-    let locked_mode_color = palette.text_unselected[4];
-    let normal_mode_color = palette.text_unselected[3];
-    let other_modes_color = palette.text_unselected[1];
+    let text_color = palette.text_unselected.base;
+    let bg_color = palette.text_unselected.background;
+    let locked_mode_color = palette.text_unselected.emphasis_4;
+    let normal_mode_color = palette.text_unselected.emphasis_3;
+    let other_modes_color = palette.text_unselected.emphasis_1;
 
     let prefix_styled_text = style!(text_color, bg_color).bold().paint(prefix_text);
     let mut parts = vec![LinePart {
@@ -279,7 +279,7 @@ pub fn tab_line(
     let current_title_len = get_current_title_len(&prefix);
     if current_title_len < cols {
         let mut remaining_space = cols - current_title_len;
-        let remaining_bg = palette.text_unselected[5];
+        let remaining_bg = palette.text_unselected.background;
         if let Some(swap_layout_status) = swap_layout_status(
             remaining_space,
             active_swap_layout_name,
@@ -318,9 +318,9 @@ fn swap_layout_status(
             let mut swap_layout_name = format!(" {} ", swap_layout_name);
             swap_layout_name.make_ascii_uppercase();
             let swap_layout_name_len = swap_layout_name.len() + 3;
-            let bg = palette.text_unselected[5];
-            let fg = palette.ribbon_unselected[5];
-            let green = palette.ribbon_selected[5];
+            let bg = palette.text_unselected.background;
+            let fg = palette.ribbon_unselected.background;
+            let green = palette.ribbon_selected.background;
 
             let (prefix_separator, swap_layout_name, suffix_separator) =
                 if input_mode == InputMode::Locked {
diff --git a/default-plugins/compact-bar/src/main.rs b/default-plugins/compact-bar/src/main.rs
index 270bfde759..567dc187ed 100644
--- a/default-plugins/compact-bar/src/main.rs
+++ b/default-plugins/compact-bar/src/main.rs
@@ -131,7 +131,7 @@ impl ZellijPlugin for State {
             .tab_line
             .iter()
             .fold(String::new(), |output, part| output + &part.part);
-        let background = self.mode_info.style.colors.text_unselected[5];
+        let background = self.mode_info.style.colors.text_unselected.background;
         match background {
             PaletteColor::Rgb((r, g, b)) => {
                 print!("{}\u{1b}[48;2;{};{};{}m\u{1b}[0K", output, r, g, b);
diff --git a/default-plugins/compact-bar/src/tab.rs b/default-plugins/compact-bar/src/tab.rs
index 51b6ebe3af..22cb4288c9 100644
--- a/default-plugins/compact-bar/src/tab.rs
+++ b/default-plugins/compact-bar/src/tab.rs
@@ -27,21 +27,21 @@ pub fn render_tab(
     let focused_clients = tab.other_focused_clients.as_slice();
     let separator_width = separator.width();
     let alternate_tab_color = if is_alternate_tab {
-        palette.ribbon_unselected[1]
+        palette.ribbon_unselected.emphasis_1
     } else {
-        palette.ribbon_unselected[5]
+        palette.ribbon_unselected.background
     };
     let background_color = if tab.active {
-        palette.ribbon_selected[5]
+        palette.ribbon_selected.background
     } else if is_alternate_tab {
         alternate_tab_color
     } else {
-        palette.ribbon_unselected[5]
+        palette.ribbon_unselected.background
     };
     let foreground_color = if tab.active {
-        palette.ribbon_selected[0]
+        palette.ribbon_selected.base
     } else {
-        palette.ribbon_unselected[0]
+        palette.ribbon_unselected.base
     };
     let left_separator = style!(foreground_color, background_color).paint(separator);
     let mut tab_text_len = text.width() + (separator_width * 2) + 2; // + 2 for padding
diff --git a/default-plugins/session-manager/src/ui/components.rs b/default-plugins/session-manager/src/ui/components.rs
index f295399ded..5685368e6e 100644
--- a/default-plugins/session-manager/src/ui/components.rs
+++ b/default-plugins/session-manager/src/ui/components.rs
@@ -85,7 +85,7 @@ impl ListItem {
                 span.render(
                     indices.clone().map(|i| {
                         (
-                            SpanStyle::ForegroundBold(self.colors.palette.text_unselected[4]),
+                            SpanStyle::ForegroundBold(self.colors.palette.text_unselected.emphasis_4),
                             i,
                         )
                     }),
@@ -107,7 +107,7 @@ impl ListItem {
                 span.render(
                     indices.clone().map(|i| {
                         (
-                            SpanStyle::ForegroundBold(self.colors.palette.text_unselected[4]),
+                            SpanStyle::ForegroundBold(self.colors.palette.text_unselected.emphasis_4),
                             i,
                         )
                     }),
@@ -124,7 +124,7 @@ impl ListItem {
                 span.render(
                     indices.clone().map(|i| {
                         (
-                            SpanStyle::ForegroundBold(self.colors.palette.text_unselected[4]),
+                            SpanStyle::ForegroundBold(self.colors.palette.text_unselected.emphasis_4),
                             i,
                         )
                     }),
@@ -310,7 +310,7 @@ impl LineToRender {
         } else {
             "      ".to_owned()
         };
-        match self.colors.palette.text_selected[5] {
+        match self.colors.palette.text_selected.background {
             PaletteColor::EightBit(byte) => {
                 self.line = format!(
                     "\u{1b}[48;5;{byte}m\u{1b}[K\u{1b}[48;5;{byte}m{arrows}{}",
@@ -332,7 +332,7 @@ impl LineToRender {
         } else {
             "      ".to_owned()
         };
-        match self.colors.palette.text_selected[5] {
+        match self.colors.palette.text_selected.background {
             PaletteColor::EightBit(byte) => {
                 self.line = format!(
                     "\u{1b}[48;5;{byte}m\u{1b}[K\u{1b}[48;5;{byte}m{arrows}{}",
@@ -390,7 +390,7 @@ pub fn build_session_ui_line(session_ui_info: &SessionUiInfo, colors: Colors) ->
         )]));
     let session_name_span = UiSpan::TruncatableUiSpan(TruncatableUiSpan::new(
         session_name.clone(),
-        SpanStyle::ForegroundBold(colors.palette.exit_code_success[0]),
+        SpanStyle::ForegroundBold(colors.palette.exit_code_success.base),
     ));
     let tab_and_pane_count = UiSpan::UiSpanTelescope(UiSpanTelescope::new(vec![
         StringAndLength::new(
@@ -440,7 +440,7 @@ pub fn build_tab_ui_line(tab_ui_info: &TabUiInfo, colors: Colors) -> Vec<UiSpan>
         )]));
     let tab_name_span = UiSpan::TruncatableUiSpan(TruncatableUiSpan::new(
         tab_name.clone(),
-        SpanStyle::ForegroundBold(colors.palette.text_unselected[2]),
+        SpanStyle::ForegroundBold(colors.palette.text_unselected.emphasis_2),
     ));
     let connected_users_count_span = UiSpan::UiSpanTelescope(UiSpanTelescope::new(vec![
         StringAndLength::new(
@@ -963,27 +963,27 @@ impl Colors {
     }
 
     pub fn session_name(&self, text: &str) -> String {
-        self.color(&self.palette.exit_code_success[1], text)
+        self.color(&self.palette.exit_code_success.emphasis_1, text)
     }
 
     pub fn connected_users(&self, text: &str) -> String {
-        self.color(&self.palette.text_unselected[3], text)
+        self.color(&self.palette.text_unselected.emphasis_3, text)
     }
 
     pub fn pane_count_search_prompt(&self, text: &str) -> String {
-        self.color(&self.palette.text_unselected[3], text)
+        self.color(&self.palette.text_unselected.emphasis_3, text)
     }
 
     pub fn exit_code_error(&self, text: &str) -> String {
-        self.color(&self.palette.exit_code_error[0], text)
+        self.color(&self.palette.exit_code_error.base, text)
     }
 
     pub fn tab_count(&self, text: &str) -> String {
-        self.color(&self.palette.text_unselected[2], text)
+        self.color(&self.palette.text_unselected.emphasis_2, text)
     }
 
     pub fn shortcuts(&self, text: &str) -> String {
-        self.color(&self.palette.text_unselected[4], text)
+        self.color(&self.palette.text_unselected.emphasis_4, text)
     }
 }
 
diff --git a/default-plugins/status-bar/src/first_line.rs b/default-plugins/status-bar/src/first_line.rs
index 469e157ac8..2a28a24b1e 100644
--- a/default-plugins/status-bar/src/first_line.rs
+++ b/default-plugins/status-bar/src/first_line.rs
@@ -354,7 +354,7 @@ fn swap_layout_keycode(mode_info: &ModeInfo) -> LinePart {
     let prev_next_keys_indicator = style_key_with_modifier(
         &prev_next_keys,
         &mode_info.style.colors,
-        Some(mode_info.style.colors.text_unselected[5]),
+        Some(mode_info.style.colors.text_unselected.background),
     );
     let keycode = ANSIStrings(&prev_next_keys_indicator);
     let len = unstyled_len(&keycode);
diff --git a/default-plugins/status-bar/src/main.rs b/default-plugins/status-bar/src/main.rs
index 6d028dff8f..d0fd8a7181 100644
--- a/default-plugins/status-bar/src/main.rs
+++ b/default-plugins/status-bar/src/main.rs
@@ -88,64 +88,64 @@ pub struct SegmentStyle {
 // plus here we can add new sources in the future, like Theme
 // that can be defined in the config perhaps
 fn color_elements(palette: Styling, different_color_alternates: bool) -> ColoredElements {
-    let background = palette.text_unselected[5];
-    let foreground = palette.text_unselected[0];
+    let background = palette.text_unselected.background;
+    let foreground = palette.text_unselected.base;
     let alternate_background_color = if different_color_alternates {
-        palette.ribbon_unselected[0]
+        palette.ribbon_unselected.base
     } else {
-        palette.ribbon_unselected[5]
+        palette.ribbon_unselected.background
     };
     ColoredElements {
         selected: SegmentStyle {
-            prefix_separator: style!(background, palette.ribbon_selected[5]),
-            char_left_separator: style!(palette.ribbon_selected[0], palette.ribbon_selected[5])
+            prefix_separator: style!(background, palette.ribbon_selected.background),
+            char_left_separator: style!(palette.ribbon_selected.base, palette.ribbon_selected.background)
                 .bold(),
-            char_shortcut: style!(palette.ribbon_selected[1], palette.ribbon_selected[5]).bold(),
-            char_right_separator: style!(palette.ribbon_selected[0], palette.ribbon_selected[5])
+            char_shortcut: style!(palette.ribbon_selected.emphasis_1, palette.ribbon_selected.background).bold(),
+            char_right_separator: style!(palette.ribbon_selected.base, palette.ribbon_selected.background)
                 .bold(),
-            styled_text: style!(palette.ribbon_selected[0], palette.ribbon_selected[5]).bold(),
-            suffix_separator: style!(palette.ribbon_selected[5], background).bold(),
+            styled_text: style!(palette.ribbon_selected.base, palette.ribbon_selected.background).bold(),
+            suffix_separator: style!(palette.ribbon_selected.background, background).bold(),
         },
         unselected: SegmentStyle {
-            prefix_separator: style!(background, palette.ribbon_unselected[5]),
-            char_left_separator: style!(palette.ribbon_unselected[0], palette.ribbon_unselected[5])
+            prefix_separator: style!(background, palette.ribbon_unselected.background),
+            char_left_separator: style!(palette.ribbon_unselected.base, palette.ribbon_unselected.background)
                 .bold(),
-            char_shortcut: style!(palette.ribbon_unselected[1], palette.ribbon_unselected[5])
+            char_shortcut: style!(palette.ribbon_unselected.emphasis_1, palette.ribbon_unselected.background)
                 .bold(),
             char_right_separator: style!(
-                palette.ribbon_unselected[0],
-                palette.ribbon_unselected[5]
+                palette.ribbon_unselected.base,
+                palette.ribbon_unselected.background
             )
             .bold(),
-            styled_text: style!(palette.ribbon_unselected[0], palette.ribbon_unselected[5]).bold(),
-            suffix_separator: style!(palette.ribbon_unselected[5], background).bold(),
+            styled_text: style!(palette.ribbon_unselected.base, palette.ribbon_unselected.background).bold(),
+            suffix_separator: style!(palette.ribbon_unselected.background, background).bold(),
         },
         unselected_alternate: SegmentStyle {
             prefix_separator: style!(background, alternate_background_color),
             char_left_separator: style!(background, alternate_background_color).bold(),
-            char_shortcut: style!(palette.ribbon_unselected[1], alternate_background_color).bold(),
+            char_shortcut: style!(palette.ribbon_unselected.emphasis_1, alternate_background_color).bold(),
             char_right_separator: style!(background, alternate_background_color).bold(),
             styled_text: style!(background, alternate_background_color).bold(),
             suffix_separator: style!(alternate_background_color, background).bold(),
         },
         disabled: SegmentStyle {
-            prefix_separator: style!(background, palette.ribbon_unselected[5]),
-            char_left_separator: style!(palette.ribbon_unselected[0], palette.ribbon_unselected[5])
+            prefix_separator: style!(background, palette.ribbon_unselected.background),
+            char_left_separator: style!(palette.ribbon_unselected.base, palette.ribbon_unselected.background)
                 .dimmed()
                 .italic(),
-            char_shortcut: style!(palette.ribbon_unselected[0], palette.ribbon_unselected[5])
+            char_shortcut: style!(palette.ribbon_unselected.base, palette.ribbon_unselected.background)
                 .dimmed()
                 .italic(),
             char_right_separator: style!(
-                palette.ribbon_unselected[0],
-                palette.ribbon_unselected[5]
+                palette.ribbon_unselected.base,
+                palette.ribbon_unselected.background
             )
             .dimmed()
             .italic(),
-            styled_text: style!(palette.ribbon_unselected[0], palette.ribbon_unselected[5])
+            styled_text: style!(palette.ribbon_unselected.base, palette.ribbon_unselected.background)
                 .dimmed()
                 .italic(),
-            suffix_separator: style!(palette.ribbon_unselected[5], background),
+            suffix_separator: style!(palette.ribbon_unselected.background, background),
         },
         superkey_prefix: style!(foreground, background).bold(),
         superkey_suffix_separator: style!(background, background),
@@ -245,7 +245,7 @@ impl ZellijPlugin for State {
         let first_line = first_line(&self.mode_info, active_tab, cols, separator);
         let second_line = self.second_line(cols);
 
-        let background = self.mode_info.style.colors.text_unselected[5];
+        let background = self.mode_info.style.colors.text_unselected.background;
         // [48;5;238m is white background, [0K is so that it fills the rest of the line
         // [m is background reset, [0K is so that it clears the rest of the line
         match background {
@@ -401,9 +401,9 @@ pub fn style_key_with_modifier(
         return vec![];
     }
 
-    let text_color = palette_match!(palette.text_unselected[0]);
-    let green_color = palette_match!(palette.text_unselected[3]);
-    let orange_color = palette_match!(palette.text_unselected[1]);
+    let text_color = palette_match!(palette.text_unselected.base);
+    let green_color = palette_match!(palette.text_unselected.emphasis_3);
+    let orange_color = palette_match!(palette.text_unselected.emphasis_1);
     let mut ret = vec![];
 
     let common_modifiers = get_common_modifiers(keyvec.iter().collect());
diff --git a/default-plugins/status-bar/src/second_line.rs b/default-plugins/status-bar/src/second_line.rs
index ebb09c3054..ae58657b4c 100644
--- a/default-plugins/status-bar/src/second_line.rs
+++ b/default-plugins/status-bar/src/second_line.rs
@@ -23,7 +23,7 @@ fn full_length_shortcut(
         return LinePart::default();
     }
 
-    let text_color = palette_match!(palette.text_unselected[0]);
+    let text_color = palette_match!(palette.text_unselected.base);
 
     let separator = if is_first_shortcut { " " } else { " / " };
     let mut bits: Vec<ANSIString> = vec![Style::new().fg(text_color).paint(separator)];
@@ -45,7 +45,7 @@ fn full_length_shortcut(
 fn locked_interface_indication(palette: Styling) -> LinePart {
     let locked_text = " -- INTERFACE LOCKED -- ";
     let locked_text_len = locked_text.chars().count();
-    let text_color = palette_match!(palette.text_unselected[0]);
+    let text_color = palette_match!(palette.text_unselected.base);
     let locked_styled_text = Style::new().fg(text_color).bold().paint(locked_text);
     LinePart {
         part: locked_styled_text.to_string(),
@@ -349,7 +349,7 @@ pub fn keybinds(help: &ModeInfo, tip_name: &str, max_width: usize) -> LinePart {
 }
 
 pub fn text_copied_hint(palette: &Styling, copy_destination: CopyDestination) -> LinePart {
-    let green_color = palette_match!(palette.text_unselected[3]);
+    let green_color = palette_match!(palette.text_unselected.emphasis_3);
     let hint = match copy_destination {
         CopyDestination::Command => "Text piped to external command",
         #[cfg(not(target_os = "macos"))]
@@ -366,7 +366,7 @@ pub fn text_copied_hint(palette: &Styling, copy_destination: CopyDestination) ->
 
 pub fn system_clipboard_error(palette: &Styling) -> LinePart {
     let hint = " Error using the system clipboard.";
-    let red_color = palette_match!(palette.text_unselected[4]);
+    let red_color = palette_match!(palette.text_unselected.emphasis_4);
     LinePart {
         part: Style::new().fg(red_color).bold().paint(hint).to_string(),
         len: hint.len(),
@@ -374,9 +374,9 @@ pub fn system_clipboard_error(palette: &Styling) -> LinePart {
 }
 
 pub fn fullscreen_panes_to_hide(palette: &Styling, panes_to_hide: usize) -> LinePart {
-    let text_color = palette_match!(palette.text_unselected[0]);
-    let green_color = palette_match!(palette.text_unselected[3]);
-    let orange_color = palette_match!(palette.text_unselected[1]);
+    let text_color = palette_match!(palette.text_unselected.base);
+    let green_color = palette_match!(palette.text_unselected.emphasis_3);
+    let orange_color = palette_match!(palette.text_unselected.emphasis_1);
     let shortcut_left_separator = Style::new().fg(text_color).bold().paint(" (");
     let shortcut_right_separator = Style::new().fg(text_color).bold().paint("): ");
     let fullscreen = "FULLSCREEN";
@@ -405,9 +405,9 @@ pub fn fullscreen_panes_to_hide(palette: &Styling, panes_to_hide: usize) -> Line
 pub fn floating_panes_are_visible(mode_info: &ModeInfo) -> LinePart {
     let palette = mode_info.style.colors;
     let km = &mode_info.get_mode_keybinds();
-    let white_color = palette_match!(palette.text_unselected[0]);
-    let green_color = palette_match!(palette.text_unselected[3]);
-    let orange_color = palette_match!(palette.text_unselected[1]);
+    let white_color = palette_match!(palette.text_unselected.base);
+    let green_color = palette_match!(palette.text_unselected.emphasis_3);
+    let orange_color = palette_match!(palette.text_unselected.emphasis_1);
     let shortcut_left_separator = Style::new().fg(white_color).bold().paint(" (");
     let shortcut_right_separator = Style::new().fg(white_color).bold().paint("): ");
     let floating_panes = "FLOATING PANES VISIBLE";
@@ -460,9 +460,9 @@ pub fn floating_panes_are_visible(mode_info: &ModeInfo) -> LinePart {
 }
 
 pub fn locked_fullscreen_panes_to_hide(palette: &Styling, panes_to_hide: usize) -> LinePart {
-    let text_color = palette_match!(palette.text_unselected[0]);
-    let green_color = palette_match!(palette.text_unselected[3]);
-    let orange_color = palette_match!(palette.text_unselected[1]);
+    let text_color = palette_match!(palette.text_unselected.base);
+    let green_color = palette_match!(palette.text_unselected.emphasis_3);
+    let orange_color = palette_match!(palette.text_unselected.emphasis_1);
     let locked_text = " -- INTERFACE LOCKED -- ";
     let shortcut_left_separator = Style::new().fg(text_color).bold().paint(" (");
     let shortcut_right_separator = Style::new().fg(text_color).bold().paint("): ");
@@ -492,8 +492,8 @@ pub fn locked_fullscreen_panes_to_hide(palette: &Styling, panes_to_hide: usize)
 }
 
 pub fn locked_floating_panes_are_visible(palette: &Styling) -> LinePart {
-    let white_color = palette_match!(palette.text_unselected[0]);
-    let orange_color = palette_match!(palette.text_unselected[1]);
+    let white_color = palette_match!(palette.text_unselected.base);
+    let orange_color = palette_match!(palette.text_unselected.emphasis_1);
     let shortcut_left_separator = Style::new().fg(white_color).bold().paint(" (");
     let shortcut_right_separator = Style::new().fg(white_color).bold().paint(")");
     let locked_text = " -- INTERFACE LOCKED -- ";
diff --git a/default-plugins/status-bar/src/tip/data/compact_layout.rs b/default-plugins/status-bar/src/tip/data/compact_layout.rs
index ab8e33cc38..f7ee7335a3 100644
--- a/default-plugins/status-bar/src/tip/data/compact_layout.rs
+++ b/default-plugins/status-bar/src/tip/data/compact_layout.rs
@@ -25,7 +25,7 @@ macro_rules! strings {
 pub fn compact_layout_full(help: &ModeInfo) -> LinePart {
     // Tip: UI taking up too much space? Start Zellij with
     // zellij -l compact or remove pane frames with Ctrl + <p> + <z>
-    let green_color = palette_match!(help.style.colors.text_unselected[1]);
+    let green_color = palette_match!(help.style.colors.text_unselected.emphasis_1);
 
     let mut bits = vec![
         Style::new().paint(" Tip: "),
@@ -43,7 +43,7 @@ pub fn compact_layout_full(help: &ModeInfo) -> LinePart {
 pub fn compact_layout_medium(help: &ModeInfo) -> LinePart {
     // Tip: To save screen space, start Zellij with
     // zellij -l compact or remove pane frames with Ctrl + <p> + <z>
-    let green_color = palette_match!(help.style.colors.text_unselected[1]);
+    let green_color = palette_match!(help.style.colors.text_unselected.emphasis_1);
 
     let mut bits = vec![
         Style::new().paint(" Tip: "),
@@ -61,7 +61,7 @@ pub fn compact_layout_medium(help: &ModeInfo) -> LinePart {
 pub fn compact_layout_short(help: &ModeInfo) -> LinePart {
     // Save screen space, start Zellij with
     // zellij -l compact or remove pane frames with Ctrl + <p> + <z>
-    let green_color = palette_match!(help.style.colors.text_unselected[1]);
+    let green_color = palette_match!(help.style.colors.text_unselected.emphasis_1);
 
     let mut bits = vec![
         Style::new().paint(" Save screen space, start with: "),
diff --git a/default-plugins/status-bar/src/tip/data/edit_scrollbuffer.rs b/default-plugins/status-bar/src/tip/data/edit_scrollbuffer.rs
index e3a0303bd0..a8c18ad65e 100644
--- a/default-plugins/status-bar/src/tip/data/edit_scrollbuffer.rs
+++ b/default-plugins/status-bar/src/tip/data/edit_scrollbuffer.rs
@@ -24,7 +24,7 @@ macro_rules! strings {
 pub fn edit_scrollbuffer_full(help: &ModeInfo) -> LinePart {
     // Tip: Search through the scrollbuffer using your default $EDITOR with
     // Ctrl + <s> + <e>
-    let green_color = palette_match!(help.style.colors.text_unselected[1]);
+    let green_color = palette_match!(help.style.colors.text_unselected.emphasis_1);
 
     let mut bits = vec![
         Style::new().paint(" Tip: "),
@@ -39,7 +39,7 @@ pub fn edit_scrollbuffer_full(help: &ModeInfo) -> LinePart {
 pub fn edit_scrollbuffer_medium(help: &ModeInfo) -> LinePart {
     // Tip: Search the scrollbuffer using your $EDITOR with
     // Ctrl + <s> + <e>
-    let green_color = palette_match!(help.style.colors.text_unselected[1]);
+    let green_color = palette_match!(help.style.colors.text_unselected.emphasis_1);
 
     let mut bits = vec![
         Style::new().paint(" Tip: "),
@@ -54,7 +54,7 @@ pub fn edit_scrollbuffer_medium(help: &ModeInfo) -> LinePart {
 pub fn edit_scrollbuffer_short(help: &ModeInfo) -> LinePart {
     // Search using $EDITOR with
     // Ctrl + <s> + <e>
-    let green_color = palette_match!(help.style.colors.text_unselected[1]);
+    let green_color = palette_match!(help.style.colors.text_unselected.emphasis_1);
 
     let mut bits = vec![
         Style::new().paint(" Search using "),
diff --git a/default-plugins/status-bar/src/tip/data/move_tabs.rs b/default-plugins/status-bar/src/tip/data/move_tabs.rs
index 3850c12fe1..690686a1e4 100644
--- a/default-plugins/status-bar/src/tip/data/move_tabs.rs
+++ b/default-plugins/status-bar/src/tip/data/move_tabs.rs
@@ -25,7 +25,7 @@ macro_rules! strings {
 pub fn move_tabs_full(help: &ModeInfo) -> LinePart {
     // Tip: Wrong order of tabs? You can move them to left and right with:
     // Alt + i (left) and Alt + o (right)
-    let green_color = palette_match!(help.style.colors.text_unselected[3]);
+    let green_color = palette_match!(help.style.colors.text_unselected.emphasis_3);
 
     let bits = vec![
         Style::new().paint(" Tip: "),
@@ -41,7 +41,7 @@ pub fn move_tabs_full(help: &ModeInfo) -> LinePart {
 pub fn move_tabs_medium(help: &ModeInfo) -> LinePart {
     // Tip: You can move tabs to left and right with:
     // Alt + i (left) and Alt + o (right)
-    let green_color = palette_match!(help.style.colors.text_unselected[3]);
+    let green_color = palette_match!(help.style.colors.text_unselected.emphasis_3);
 
     let bits = vec![
         Style::new().paint(" Tip: "),
@@ -56,7 +56,7 @@ pub fn move_tabs_medium(help: &ModeInfo) -> LinePart {
 
 pub fn move_tabs_short(help: &ModeInfo) -> LinePart {
     // Move tabs with: Alt + i (left) and Alt + o (right)
-    let green_color = palette_match!(help.style.colors.text_unselected[3]);
+    let green_color = palette_match!(help.style.colors.text_unselected.emphasis_3);
 
     let bits = vec![
         Style::new().paint(" Move tabs with: "),
diff --git a/default-plugins/status-bar/src/tip/data/send_mouse_click_to_terminal.rs b/default-plugins/status-bar/src/tip/data/send_mouse_click_to_terminal.rs
index bad0ef96b4..69c9057f7a 100644
--- a/default-plugins/status-bar/src/tip/data/send_mouse_click_to_terminal.rs
+++ b/default-plugins/status-bar/src/tip/data/send_mouse_click_to_terminal.rs
@@ -23,8 +23,8 @@ macro_rules! strings {
 
 pub fn mouse_click_to_terminal_full(help: &ModeInfo) -> LinePart {
     // Tip: SHIFT + <mouse-click> bypasses Zellij and sends the mouse click directly to the terminal
-    let green_color = palette_match!(help.style.colors.text_unselected[3]);
-    let orange_color = palette_match!(help.style.colors.text_unselected[1]);
+    let green_color = palette_match!(help.style.colors.text_unselected.emphasis_3);
+    let orange_color = palette_match!(help.style.colors.text_unselected.emphasis_1);
 
     strings!(&[
         Style::new().paint(" Tip: "),
@@ -37,8 +37,8 @@ pub fn mouse_click_to_terminal_full(help: &ModeInfo) -> LinePart {
 
 pub fn mouse_click_to_terminal_medium(help: &ModeInfo) -> LinePart {
     // Tip: SHIFT + <mouse-click> sends the click directly to the terminal
-    let green_color = palette_match!(help.style.colors.text_unselected[3]);
-    let orange_color = palette_match!(help.style.colors.text_unselected[1]);
+    let green_color = palette_match!(help.style.colors.text_unselected.emphasis_3);
+    let orange_color = palette_match!(help.style.colors.text_unselected.emphasis_1);
     strings!(&[
         Style::new().paint(" Tip: "),
         Style::new().fg(orange_color).bold().paint("Shift"),
@@ -50,8 +50,8 @@ pub fn mouse_click_to_terminal_medium(help: &ModeInfo) -> LinePart {
 
 pub fn mouse_click_to_terminal_short(help: &ModeInfo) -> LinePart {
     // Tip: SHIFT + <mouse-click>  => sends click to terminal.
-    let green_color = palette_match!(help.style.colors.text_unselected[3]);
-    let orange_color = palette_match!(help.style.colors.text_unselected[1]);
+    let green_color = palette_match!(help.style.colors.text_unselected.emphasis_3);
+    let orange_color = palette_match!(help.style.colors.text_unselected.emphasis_1);
 
     strings!(&[
         Style::new().paint(" Tip: "),
diff --git a/default-plugins/status-bar/src/tip/data/use_mouse.rs b/default-plugins/status-bar/src/tip/data/use_mouse.rs
index af7225e943..da4fa57bba 100644
--- a/default-plugins/status-bar/src/tip/data/use_mouse.rs
+++ b/default-plugins/status-bar/src/tip/data/use_mouse.rs
@@ -24,7 +24,7 @@ macro_rules! strings {
 pub fn use_mouse_full(help: &ModeInfo) -> LinePart {
     // Tip: Use the mouse to switch pane focus, scroll through the pane
     // scrollbuffer, switch or scroll through tabs
-    let green_color = palette_match!(help.style.colors.text_unselected[3]);
+    let green_color = palette_match!(help.style.colors.text_unselected.emphasis_3);
 
     strings!(&[
         Style::new().paint(" Tip: "),
@@ -36,7 +36,7 @@ pub fn use_mouse_full(help: &ModeInfo) -> LinePart {
 pub fn use_mouse_medium(help: &ModeInfo) -> LinePart {
     // Tip: Use the mouse to switch panes/tabs or scroll through the pane
     // scrollbuffer
-    let green_color = palette_match!(help.style.colors.text_unselected[3]);
+    let green_color = palette_match!(help.style.colors.text_unselected.emphasis_3);
 
     strings!(&[
         Style::new().paint(" Tip: "),
@@ -47,7 +47,7 @@ pub fn use_mouse_medium(help: &ModeInfo) -> LinePart {
 
 pub fn use_mouse_short(help: &ModeInfo) -> LinePart {
     // Tip: Use the mouse to switch panes/tabs or scroll
-    let green_color = palette_match!(help.style.colors.text_unselected[3]);
+    let green_color = palette_match!(help.style.colors.text_unselected.emphasis_3);
 
     strings!(&[
         Style::new().fg(green_color).bold().paint(" Use the mouse"),
diff --git a/default-plugins/status-bar/src/tip/data/zellij_setup_check.rs b/default-plugins/status-bar/src/tip/data/zellij_setup_check.rs
index d7e483cc78..62eb0ad205 100644
--- a/default-plugins/status-bar/src/tip/data/zellij_setup_check.rs
+++ b/default-plugins/status-bar/src/tip/data/zellij_setup_check.rs
@@ -23,7 +23,7 @@ macro_rules! strings {
 
 pub fn zellij_setup_check_full(help: &ModeInfo) -> LinePart {
     // Tip: Having issues with Zellij? Try running "zellij setup --check"
-    let orange_color = palette_match!(help.style.colors.text_unselected[1]);
+    let orange_color = palette_match!(help.style.colors.text_unselected.emphasis_1);
 
     strings!(&[
         Style::new().paint(" Tip: "),
@@ -37,7 +37,7 @@ pub fn zellij_setup_check_full(help: &ModeInfo) -> LinePart {
 
 pub fn zellij_setup_check_medium(help: &ModeInfo) -> LinePart {
     // Tip: Run "zellij setup --check" to find issues
-    let orange_color = palette_match!(help.style.colors.text_unselected[1]);
+    let orange_color = palette_match!(help.style.colors.text_unselected.emphasis_1);
 
     strings!(&[
         Style::new().paint(" Tip: "),
@@ -52,7 +52,7 @@ pub fn zellij_setup_check_medium(help: &ModeInfo) -> LinePart {
 
 pub fn zellij_setup_check_short(help: &ModeInfo) -> LinePart {
     // Run "zellij setup --check" to find issues
-    let orange_color = palette_match!(help.style.colors.text_unselected[1]);
+    let orange_color = palette_match!(help.style.colors.text_unselected.emphasis_1);
 
     strings!(&[
         Style::new().paint(" Run "),
diff --git a/default-plugins/tab-bar/src/line.rs b/default-plugins/tab-bar/src/line.rs
index c4ccbae1c5..ef0a6b8a1e 100644
--- a/default-plugins/tab-bar/src/line.rs
+++ b/default-plugins/tab-bar/src/line.rs
@@ -128,12 +128,12 @@ fn left_more_message(
     // 238
     // chars length plus separator length on both sides
     let more_text_len = more_text.width() + 2 * separator.width();
-    let (text_color, sep_color) = (palette.text_unselected[0], palette.text_unselected[5]);
-    let left_separator = style!(sep_color, palette.ribbon_unselected[5]).paint(separator);
-    let more_styled_text = style!(text_color, palette.ribbon_unselected[5])
+    let (text_color, sep_color) = (palette.text_unselected.base, palette.text_unselected.background);
+    let left_separator = style!(sep_color, palette.ribbon_unselected.background).paint(separator);
+    let more_styled_text = style!(text_color, palette.ribbon_unselected.background)
         .bold()
         .paint(more_text);
-    let right_separator = style!(palette.ribbon_unselected[5], sep_color).paint(separator);
+    let right_separator = style!(palette.ribbon_unselected.background, sep_color).paint(separator);
     let more_styled_text =
         ANSIStrings(&[left_separator, more_styled_text, right_separator]).to_string();
     LinePart {
@@ -159,12 +159,12 @@ fn right_more_message(
     };
     // chars length plus separator length on both sides
     let more_text_len = more_text.width() + 2 * separator.width();
-    let (text_color, sep_color) = (palette.text_unselected[0], palette.text_unselected[5]);
-    let left_separator = style!(sep_color, palette.ribbon_unselected[5]).paint(separator);
-    let more_styled_text = style!(text_color, palette.ribbon_unselected[5])
+    let (text_color, sep_color) = (palette.text_unselected.base, palette.text_unselected.background);
+    let left_separator = style!(sep_color, palette.ribbon_unselected.background).paint(separator);
+    let more_styled_text = style!(text_color, palette.ribbon_unselected.background)
         .bold()
         .paint(more_text);
-    let right_separator = style!(palette.ribbon_unselected[5], sep_color).paint(separator);
+    let right_separator = style!(palette.ribbon_unselected.background, sep_color).paint(separator);
     let more_styled_text =
         ANSIStrings(&[left_separator, more_styled_text, right_separator]).to_string();
     LinePart {
@@ -178,8 +178,8 @@ fn tab_line_prefix(session_name: Option<&str>, palette: Styling, cols: usize) ->
     let prefix_text = " Zellij ".to_string();
 
     let prefix_text_len = prefix_text.chars().count();
-    let text_color = palette.text_unselected[0];
-    let bg_color = palette.text_unselected[5];
+    let text_color = palette.text_unselected.base;
+    let bg_color = palette.text_unselected.background;
     let prefix_styled_text = style!(text_color, bg_color).bold().paint(prefix_text);
     let mut parts = vec![LinePart {
         part: prefix_styled_text.to_string(),
@@ -189,7 +189,7 @@ fn tab_line_prefix(session_name: Option<&str>, palette: Styling, cols: usize) ->
     if let Some(name) = session_name {
         let name_part = format!("({}) ", name);
         let name_part_len = name_part.width();
-        let text_color = palette.text_unselected[0];
+        let text_color = palette.text_unselected.base;
         let name_part_styled_text = style!(text_color, bg_color).bold().paint(name_part);
         if cols.saturating_sub(prefix_text_len) >= name_part_len {
             parts.push(LinePart {
diff --git a/default-plugins/tab-bar/src/main.rs b/default-plugins/tab-bar/src/main.rs
index 751900b9fb..dbd507a4dd 100644
--- a/default-plugins/tab-bar/src/main.rs
+++ b/default-plugins/tab-bar/src/main.rs
@@ -142,7 +142,7 @@ impl ZellijPlugin for State {
             .iter()
             .fold(String::new(), |output, part| output + &part.part);
 
-        let background = self.mode_info.style.colors.text_unselected[5];
+        let background = self.mode_info.style.colors.text_unselected.background;
         match background {
             PaletteColor::Rgb((r, g, b)) => {
                 print!("{}\u{1b}[48;2;{};{};{}m\u{1b}[0K", output, r, g, b);
diff --git a/default-plugins/tab-bar/src/tab.rs b/default-plugins/tab-bar/src/tab.rs
index 74b0bf74fb..9b0c624cfb 100644
--- a/default-plugins/tab-bar/src/tab.rs
+++ b/default-plugins/tab-bar/src/tab.rs
@@ -28,21 +28,21 @@ pub fn render_tab(
     let separator_width = separator.width();
 
     let alternate_tab_color = if is_alternate_tab {
-        palette.text_unselected[5]
+        palette.text_unselected.background
     } else {
-        palette.ribbon_unselected[5]
+        palette.ribbon_unselected.background
     };
     let background_color = if tab.active {
-        palette.ribbon_selected[5]
+        palette.ribbon_selected.background
     } else if is_alternate_tab {
         alternate_tab_color
     } else {
-        palette.ribbon_unselected[5]
+        palette.ribbon_unselected.background
     };
     let foreground_color = if tab.active {
-        palette.ribbon_selected[0]
+        palette.ribbon_selected.base
     } else {
-        palette.ribbon_unselected[0]
+        palette.ribbon_unselected.base
     };
     let left_separator = style!(foreground_color, background_color).paint(separator);
     let mut tab_text_len = text.width() + (separator_width * 2) + 2; // +2 for padding
diff --git a/zellij-client/src/lib.rs b/zellij-client/src/lib.rs
index 1f8fc611f2..ce85d3e400 100644
--- a/zellij-client/src/lib.rs
+++ b/zellij-client/src/lib.rs
@@ -574,7 +574,7 @@ pub fn start_server_detached(
 
     let palette = config
         .theme_config(&config_options)
-        .unwrap_or_else(|| os_input.load_palette());
+        .unwrap_or_else(|| os_input.load_palette().into());
 
     let client_attributes = ClientAttributes {
         size: Size { rows: 50, cols: 50 }, // just so size is not 0, it doesn't matter because we
diff --git a/zellij-server/src/panes/grid.rs b/zellij-server/src/panes/grid.rs
index b344254820..7b93b7f207 100644
--- a/zellij-server/src/panes/grid.rs
+++ b/zellij-server/src/panes/grid.rs
@@ -1085,7 +1085,7 @@ impl Grid {
                 .selection
                 .contains_row(character_chunk.y.saturating_sub(content_y))
             {
-                let background_color = match style.colors.text_unselected[5] {
+                let background_color = match style.colors.text_unselected.background {
                     PaletteColor::Rgb(rgb) => AnsiCode::RgbCode(rgb),
                     PaletteColor::EightBit(col) => AnsiCode::ColorIndex(col),
                 };
@@ -1102,13 +1102,13 @@ impl Grid {
                         let (select_background_palette, select_foreground_palette) =
                             if Some(res) == self.search_results.active.as_ref() {
                                 (
-                                    style.colors.text_unselected[1],
-                                    style.colors.text_unselected[5],
+                                    style.colors.text_unselected.emphasis_1,
+                                    style.colors.text_unselected.background,
                                 )
                             } else {
                                 (
-                                    style.colors.text_unselected[3],
-                                    style.colors.text_unselected[5],
+                                    style.colors.text_unselected.emphasis_3,
+                                    style.colors.text_unselected.background,
                                 )
                             };
                         let background_color = match select_background_palette {
diff --git a/zellij-server/src/panes/plugin_pane.rs b/zellij-server/src/panes/plugin_pane.rs
index e3af7b8a93..d60701d4cb 100644
--- a/zellij-server/src/panes/plugin_pane.rs
+++ b/zellij-server/src/panes/plugin_pane.rs
@@ -617,7 +617,7 @@ impl Pane for PluginPane {
             .unwrap();
     }
     fn add_red_pane_frame_color_override(&mut self, error_text: Option<String>) {
-        self.pane_frame_color_override = Some((self.style.colors.exit_code_error[0], error_text));
+        self.pane_frame_color_override = Some((self.style.colors.exit_code_error.base, error_text));
     }
     fn clear_pane_frame_color_override(&mut self) {
         self.pane_frame_color_override = None;
@@ -696,10 +696,10 @@ impl PluginPane {
         }
     }
     fn display_request_permission_message(&self, plugin_permission: &PluginPermission) -> String {
-        let bold_white = style!(self.style.colors.text_unselected[0]).bold();
-        let cyan = style!(self.style.colors.text_unselected[2]).bold();
-        let orange = style!(self.style.colors.text_unselected[1]).bold();
-        let green = style!(self.style.colors.text_unselected[3]).bold();
+        let bold_white = style!(self.style.colors.text_unselected.base).bold();
+        let cyan = style!(self.style.colors.text_unselected.emphasis_2).bold();
+        let orange = style!(self.style.colors.text_unselected.emphasis_1).bold();
+        let green = style!(self.style.colors.text_unselected.emphasis_3).bold();
 
         let mut messages = String::new();
         let permissions: BTreeSet<PermissionType> =
diff --git a/zellij-server/src/panes/terminal_character.rs b/zellij-server/src/panes/terminal_character.rs
index 8db9fb8da2..df9e5e521b 100644
--- a/zellij-server/src/panes/terminal_character.rs
+++ b/zellij-server/src/panes/terminal_character.rs
@@ -977,7 +977,7 @@ pub fn render_first_run_banner(
         Some(run_command) => {
             let bold_text = RESET_STYLES.bold(Some(AnsiCode::On));
             let command_color_text = RESET_STYLES
-                .foreground(Some(AnsiCode::from(style.colors.text_unselected[3])))
+                .foreground(Some(AnsiCode::from(style.colors.text_unselected.emphasis_3)))
                 .bold(Some(AnsiCode::On));
             let waiting_to_run_text = "Waiting to run: ";
             let command_text = run_command.to_string();
@@ -1002,7 +1002,7 @@ pub fn render_first_run_banner(
             let ctrl_c_bare_text = "Ctrl-c";
             let controls_bare_text_fourth_part = "> exit";
             let controls_color = RESET_STYLES
-                .foreground(Some(AnsiCode::from(style.colors.text_unselected[1])))
+                .foreground(Some(AnsiCode::from(style.colors.text_unselected.emphasis_1)))
                 .bold(Some(AnsiCode::On));
             let controls_line_length = controls_bare_text_first_part.len()
                 + enter_bare_text.len()
@@ -1054,7 +1054,7 @@ pub fn render_first_run_banner(
             let ctrl_c_bare_text = "Ctrl-c";
             let controls_bare_text_fourth_part = "> exit";
             let controls_color = RESET_STYLES
-                .foreground(Some(AnsiCode::from(style.colors.text_unselected[1])))
+                .foreground(Some(AnsiCode::from(style.colors.text_unselected.emphasis_1)))
                 .bold(Some(AnsiCode::On));
             let controls_line_length = controls_bare_text_first_part.len()
                 + enter_bare_text.len()
diff --git a/zellij-server/src/panes/terminal_pane.rs b/zellij-server/src/panes/terminal_pane.rs
index a9ce83b6f4..c162078ba8 100644
--- a/zellij-server/src/panes/terminal_pane.rs
+++ b/zellij-server/src/panes/terminal_pane.rs
@@ -714,7 +714,7 @@ impl Pane for TerminalPane {
         self.set_should_render(true);
     }
     fn add_red_pane_frame_color_override(&mut self, error_text: Option<String>) {
-        self.pane_frame_color_override = Some((self.style.colors.exit_code_error[0], error_text));
+        self.pane_frame_color_override = Some((self.style.colors.exit_code_error.base, error_text));
     }
     fn clear_pane_frame_color_override(&mut self) {
         self.pane_frame_color_override = None;
diff --git a/zellij-server/src/ui/components/mod.rs b/zellij-server/src/ui/components/mod.rs
index 30b526940d..1cb3585d28 100644
--- a/zellij-server/src/ui/components/mod.rs
+++ b/zellij-server/src/ui/components/mod.rs
@@ -87,7 +87,7 @@ impl<'a> UiComponentParser<'a> {
                 columns,
                 rows,
                 stringified_params,
-                Some(self.style.colors.table_title[0]),
+                Some(self.style.colors.table_title.base),
                 &self.style,
                 component_coordinates,
             );
diff --git a/zellij-server/src/ui/components/nested_list.rs b/zellij-server/src/ui/components/nested_list.rs
index 2754ffb311..081b2d73f1 100644
--- a/zellij-server/src/ui/components/nested_list.rs
+++ b/zellij-server/src/ui/components/nested_list.rs
@@ -57,7 +57,7 @@ pub fn nested_list(
             });
         if line_item.text.selected {
             let selected_background =
-                RESET_STYLES.background(Some(style.colors.list_selected[5].into()));
+                RESET_STYLES.background(Some(style.colors.list_selected.background.into()));
             stringified.push_str(&format!(
                 "{}{}{}{:padding$}{bulletin}{}{text}{}",
                 go_to_row_instruction,
diff --git a/zellij-server/src/ui/components/ribbon.rs b/zellij-server/src/ui/components/ribbon.rs
index aa4d0f0968..f9cc7e288a 100644
--- a/zellij-server/src/ui/components/ribbon.rs
+++ b/zellij-server/src/ui/components/ribbon.rs
@@ -12,18 +12,18 @@ pub fn ribbon(
     component_coordinates: Option<Coordinates>,
 ) -> Vec<u8> {
     let colors = style.colors;
-    let background = colors.text_unselected[5];
+    let background = colors.text_unselected.background;
     let (first_arrow_styles, text_style, last_arrow_styles) = if content.selected {
         (
-            character_style(background, colors.ribbon_selected[5]),
-            character_style(colors.ribbon_selected[0], colors.ribbon_selected[5]),
-            character_style(colors.ribbon_selected[5], background),
+            character_style(background, colors.ribbon_selected.background),
+            character_style(colors.ribbon_selected.base, colors.ribbon_selected.background),
+            character_style(colors.ribbon_selected.background, background),
         )
     } else {
         (
-            character_style(background, colors.ribbon_unselected[5]),
-            character_style(colors.ribbon_unselected[0], colors.ribbon_unselected[5]),
-            character_style(colors.ribbon_unselected[5], background),
+            character_style(background, colors.ribbon_unselected.background),
+            character_style(colors.ribbon_unselected.base, colors.ribbon_unselected.background),
+            character_style(colors.ribbon_unselected.background, background),
         )
     };
     let (text, _text_width) =
@@ -48,19 +48,19 @@ pub fn ribbon(
 
 pub fn emphasis_variants_for_ribbon(style: &Style) -> [PaletteColor; 4] {
     [
-        style.colors.ribbon_unselected[1],
-        style.colors.ribbon_unselected[2],
-        style.colors.ribbon_unselected[3],
-        style.colors.ribbon_unselected[4],
+        style.colors.ribbon_unselected.emphasis_1,
+        style.colors.ribbon_unselected.emphasis_2,
+        style.colors.ribbon_unselected.emphasis_3,
+        style.colors.ribbon_unselected.emphasis_4,
     ]
 }
 
 pub fn emphasis_variants_for_selected_ribbon(style: &Style) -> [PaletteColor; 4] {
     [
-        style.colors.ribbon_selected[1],
-        style.colors.ribbon_selected[2],
-        style.colors.ribbon_selected[3],
-        style.colors.ribbon_selected[4],
+        style.colors.ribbon_selected.emphasis_1,
+        style.colors.ribbon_selected.emphasis_2,
+        style.colors.ribbon_selected.emphasis_3,
+        style.colors.ribbon_selected.emphasis_4,
     ]
 }
 
diff --git a/zellij-server/src/ui/components/table.rs b/zellij-server/src/ui/components/table.rs
index 2fc0ce8384..cf501124e5 100644
--- a/zellij-server/src/ui/components/table.rs
+++ b/zellij-server/src/ui/components/table.rs
@@ -23,8 +23,8 @@ pub fn table(
         .bold(Some(AnsiCode::On));
     let cell_styles = RESET_STYLES
         .bold(Some(AnsiCode::On))
-        .background(Some(style.colors.table_cell_unselected[5].into()))
-        .foreground(Some(style.colors.table_cell_unselected[0].into()));
+        .background(Some(style.colors.table_cell_unselected.background.into()))
+        .foreground(Some(style.colors.table_cell_unselected.base.into()));
     for (row_index, (_, row)) in stringified_rows.into_iter().enumerate() {
         let is_title_row = row_index == 0;
         if is_too_high(row_index + 1, &coordinates) {
@@ -40,7 +40,7 @@ pub fn table(
             if cell.selected {
                 reset_styles_for_item.background = None;
                 text_style =
-                    text_style.background(Some(style.colors.table_cell_selected[5].into()));
+                    text_style.background(Some(style.colors.table_cell_selected.background.into()));
             }
             // here we intentionally don't pass our coordinates even if we have them, because
             // these cells have already been padded and truncated
diff --git a/zellij-server/src/ui/components/text.rs b/zellij-server/src/ui/components/text.rs
index 5d5fe06139..bf04fbc1db 100644
--- a/zellij-server/src/ui/components/text.rs
+++ b/zellij-server/src/ui/components/text.rs
@@ -14,12 +14,12 @@ use zellij_utils::errors::prelude::*;
 pub fn text(content: Text, style: &Style, component_coordinates: Option<Coordinates>) -> Vec<u8> {
     let mut text_style = RESET_STYLES
         .bold(Some(AnsiCode::On))
-        .background(Some(style.colors.text_unselected[5].into()))
-        .foreground(Some(style.colors.text_unselected[0].into()));
+        .background(Some(style.colors.text_unselected.background.into()))
+        .foreground(Some(style.colors.text_unselected.base.into()));
     if content.selected {
         text_style = text_style
-            .background(Some(style.colors.text_selected[5].into()))
-            .foreground(Some(style.colors.text_selected[0].into()));
+            .background(Some(style.colors.text_selected.background.into()))
+            .foreground(Some(style.colors.text_selected.base.into()));
     }
     let (text, _text_width) =
         stringify_text(&content, None, &component_coordinates, style, text_style);
@@ -77,10 +77,10 @@ pub fn color_index_character(
 
 pub fn emphasis_variants(style: &Style) -> [PaletteColor; 4] {
     [
-        style.colors.text_unselected[1],
-        style.colors.text_unselected[2],
-        style.colors.text_unselected[3],
-        style.colors.text_unselected[4],
+        style.colors.text_unselected.emphasis_1,
+        style.colors.text_unselected.emphasis_2,
+        style.colors.text_unselected.emphasis_3,
+        style.colors.text_unselected.emphasis_4,
     ]
 }
 
diff --git a/zellij-server/src/ui/loading_indication.rs b/zellij-server/src/ui/loading_indication.rs
index 0ba21ca87e..a9c55bf9ff 100644
--- a/zellij-server/src/ui/loading_indication.rs
+++ b/zellij-server/src/ui/loading_indication.rs
@@ -143,25 +143,25 @@ impl Display for LoadingIndication {
     fn fmt(&self, f: &mut Formatter) -> Result<(), Error> {
         let cyan = match self.terminal_emulator_colors {
             Some(terminal_emulator_colors) => {
-                style!(terminal_emulator_colors.exit_code_success[1]).bold()
+                style!(terminal_emulator_colors.exit_code_success.emphasis_1).bold()
             },
             None => ansi_term::Style::new(),
         };
         let green = match self.terminal_emulator_colors {
             Some(terminal_emulator_colors) => {
-                style!(terminal_emulator_colors.exit_code_success[0]).bold()
+                style!(terminal_emulator_colors.exit_code_success.base).bold()
             },
             None => ansi_term::Style::new(),
         };
         let yellow = match self.terminal_emulator_colors {
             Some(terminal_emulator_colors) => {
-                style!(terminal_emulator_colors.exit_code_error[1]).bold()
+                style!(terminal_emulator_colors.exit_code_error.emphasis_1).bold()
             },
             None => ansi_term::Style::new(),
         };
         let red = match self.terminal_emulator_colors {
             Some(terminal_emulator_colors) => {
-                style!(terminal_emulator_colors.exit_code_error[0]).bold()
+                style!(terminal_emulator_colors.exit_code_error.base).bold()
             },
             None => ansi_term::Style::new(),
         };
diff --git a/zellij-server/src/ui/pane_boundaries_frame.rs b/zellij-server/src/ui/pane_boundaries_frame.rs
index c0e4bc65db..7ba27ecf90 100644
--- a/zellij-server/src/ui/pane_boundaries_frame.rs
+++ b/zellij-server/src/ui/pane_boundaries_frame.rs
@@ -773,9 +773,9 @@ impl PaneFrame {
                 let exited_text = "EXIT CODE: ";
                 let exit_code_text = format!("{}", exit_code);
                 let exit_code_color = if exit_code == 0 {
-                    self.style.colors.exit_code_success[0]
+                    self.style.colors.exit_code_success.base
                 } else {
-                    self.style.colors.exit_code_error[0]
+                    self.style.colors.exit_code_error.base
                 };
                 let right_bracket = " ] ";
                 first_part.append(&mut foreground_color(left_bracket, self.color));
@@ -801,7 +801,7 @@ impl PaneFrame {
                 first_part.append(&mut foreground_color(left_bracket, self.color));
                 first_part.append(&mut foreground_color(
                     exited_text,
-                    Some(self.style.colors.exit_code_error[0]),
+                    Some(self.style.colors.exit_code_error.base),
                 ));
                 first_part.append(&mut foreground_color(right_bracket, self.color));
                 (
@@ -836,7 +836,7 @@ impl PaneFrame {
         second_part.append(&mut foreground_color(left_enter_bracket, self.color));
         second_part.append(&mut foreground_color(
             enter_text,
-            Some(self.style.colors.text_unselected[4]),
+            Some(self.style.colors.text_unselected.emphasis_4),
         ));
         second_part.append(&mut foreground_color(right_enter_bracket, self.color));
         second_part.append(&mut foreground_color(enter_tip, self.color));
@@ -844,7 +844,7 @@ impl PaneFrame {
         second_part.append(&mut foreground_color(left_esc_bracket, self.color));
         second_part.append(&mut foreground_color(
             esc_text,
-            Some(self.style.colors.text_unselected[4]),
+            Some(self.style.colors.text_unselected.emphasis_4),
         ));
         second_part.append(&mut foreground_color(right_esc_bracket, self.color));
         second_part.append(&mut foreground_color(esc_tip, self.color));
@@ -852,7 +852,7 @@ impl PaneFrame {
         second_part.append(&mut foreground_color(left_break_bracket, self.color));
         second_part.append(&mut foreground_color(
             break_text,
-            Some(self.style.colors.text_unselected[4]),
+            Some(self.style.colors.text_unselected.emphasis_4),
         ));
         second_part.append(&mut foreground_color(right_break_bracket, self.color));
         second_part.append(&mut foreground_color(break_tip, self.color));
diff --git a/zellij-server/src/ui/pane_contents_and_ui.rs b/zellij-server/src/ui/pane_contents_and_ui.rs
index 9e9da215f1..253807f0e9 100644
--- a/zellij-server/src/ui/pane_contents_and_ui.rs
+++ b/zellij-server/src/ui/pane_contents_and_ui.rs
@@ -257,13 +257,13 @@ impl<'a> PaneContentsAndUi<'a> {
             match mode {
                 InputMode::Normal | InputMode::Locked => {
                     if session_is_mirrored || !self.multiple_users_exist_in_session {
-                        Some(self.style.colors.frame_selected[0])
+                        Some(self.style.colors.frame_selected.base)
                     } else {
                         let colors = client_id_to_colors(client_id);
                         colors.map(|colors| colors.0)
                     }
                 },
-                _ => Some(self.style.colors.frame_unselected[0]),
+                _ => Some(self.style.colors.frame_unselected.base),
             }
         } else {
             None
diff --git a/zellij-utils/assets/prost/api.style.rs b/zellij-utils/assets/prost/api.style.rs
index 1f99b9709d..3025656a83 100644
--- a/zellij-utils/assets/prost/api.style.rs
+++ b/zellij-utils/assets/prost/api.style.rs
@@ -109,6 +109,8 @@ pub struct Styling {
     pub exit_code_success: ::prost::alloc::vec::Vec<Color>,
     #[prost(message, repeated, tag = "13")]
     pub exit_code_error: ::prost::alloc::vec::Vec<Color>,
+    #[prost(message, repeated, tag = "14")]
+    pub multiplayer_user_colors: ::prost::alloc::vec::Vec<Color>,
 }
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
 #[repr(i32)]
diff --git a/zellij-utils/src/data.rs b/zellij-utils/src/data.rs
index 3ecb9b631f..50781ea225 100644
--- a/zellij-utils/src/data.rs
+++ b/zellij-utils/src/data.rs
@@ -2,7 +2,7 @@ use crate::input::actions::Action;
 use crate::input::config::ConversionError;
 use crate::input::keybinds::Keybinds;
 use crate::input::layout::SplitSize;
-use crate::shared::{colors as default_colors, default_palette};
+use crate::shared::colors as default_colors;
 use clap::ArgEnum;
 use serde::{Deserialize, Serialize};
 use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};
@@ -23,7 +23,6 @@ pub type ClientId = u16; // TODO: merge with crate type?
 
 pub fn client_id_to_colors(client_id: ClientId) -> Option<(PaletteColor, PaletteColor)> {
     // (primary color, secondary color)
-    // TODO: revisit client_id coloration
     let black = PaletteColor::EightBit(default_colors::BLACK);
     match client_id {
         1 => Some((PaletteColor::EightBit(default_colors::MAGENTA), black)),
@@ -1136,43 +1135,60 @@ pub struct Style {
 
 #[derive(Debug, Copy, Default, Clone, PartialEq, Eq, Hash, Deserialize, Serialize)]
 pub struct Styling {
-    pub text_unselected: [PaletteColor; 6],
-    pub text_selected: [PaletteColor; 6],
-    pub ribbon_unselected: [PaletteColor; 6],
-    pub ribbon_selected: [PaletteColor; 6],
-    pub table_title: [PaletteColor; 6],
-    pub table_cell_unselected: [PaletteColor; 6],
-    pub table_cell_selected: [PaletteColor; 6],
-    pub list_unselected: [PaletteColor; 6],
-    pub list_selected: [PaletteColor; 6],
-    pub frame_unselected: [PaletteColor; 5],
-    pub frame_selected: [PaletteColor; 5],
-    pub exit_code_success: [PaletteColor; 5],
-    pub exit_code_error: [PaletteColor; 5],
-}
-
-// TODO: possibly better Struct type for caller rather than indexing?
+    pub text_unselected: StyleDeclaration,
+    pub text_selected: StyleDeclaration,
+    pub ribbon_unselected: StyleDeclaration,
+    pub ribbon_selected: StyleDeclaration,
+    pub table_title: StyleDeclaration,
+    pub table_cell_unselected: StyleDeclaration,
+    pub table_cell_selected: StyleDeclaration,
+    pub list_unselected: StyleDeclaration,
+    pub list_selected: StyleDeclaration,
+    pub frame_unselected: StyleDeclaration,
+    pub frame_selected: StyleDeclaration,
+    pub exit_code_success: StyleDeclaration,
+    pub exit_code_error: StyleDeclaration,
+    pub multiplayer_user_colors: MultiplayerColors,
+}
+
 #[derive(Debug, Copy, Default, Clone, PartialEq, Eq, Hash, Deserialize, Serialize)]
 pub struct StyleDeclaration {
     pub base: PaletteColor,
-    pub emphasis: [PaletteColor; 4],
-    pub background: Option<PaletteColor>,
+    pub background: PaletteColor,
+    pub emphasis_1: PaletteColor,
+    pub emphasis_2: PaletteColor,
+    pub emphasis_3: PaletteColor,
+    pub emphasis_4: PaletteColor,
+}
+
+#[derive(Debug, Copy, Default, Clone, PartialEq, Eq, Hash, Deserialize, Serialize)]
+pub struct MultiplayerColors {
+    pub player_1: PaletteColor,
+    pub player_2: PaletteColor,
+    pub player_3: PaletteColor,
+    pub player_4: PaletteColor,
+    pub player_5: PaletteColor,
+    pub player_6: PaletteColor,
+    pub player_7: PaletteColor,
+    pub player_8: PaletteColor,
+    pub player_9: PaletteColor,
+    pub player_10: PaletteColor,
 }
 
 impl From<Styling> for Palette {
     fn from(styling: Styling) -> Self {
         Palette {
-            fg: styling.ribbon_unselected[5],
-            bg: styling.text_unselected[5],
-            red: styling.exit_code_error[0],
-            green: styling.text_unselected[3],
-            yellow: styling.exit_code_error[1],
-            blue: styling.ribbon_unselected[3],
-            magenta: styling.text_unselected[4],
-            orange: styling.text_unselected[1],
-            cyan: styling.text_unselected[2],
-            black: styling.ribbon_unselected[0],
-            white: styling.ribbon_selected[2],
+            fg: styling.ribbon_unselected.background,
+            bg: styling.text_unselected.background,
+            red: styling.exit_code_error.base,
+            green: styling.text_unselected.emphasis_3,
+            yellow: styling.exit_code_error.emphasis_1,
+            blue: styling.ribbon_unselected.emphasis_3,
+            magenta: styling.text_unselected.emphasis_4,
+            orange: styling.text_unselected.emphasis_1,
+            cyan: styling.text_unselected.emphasis_2,
+            black: styling.ribbon_unselected.base,
+            white: styling.ribbon_selected.emphasis_2,
             ..Default::default()
         }
     }
@@ -1185,66 +1201,70 @@ impl From<Palette> for Styling {
             ThemeHue::Dark => (palette.white, palette.black),
         };
         Styling {
-            text_unselected: [
-                fg,
-                palette.orange,
-                palette.cyan,
-                palette.green,
-                palette.magenta,
-                bg,
-            ],
-            text_selected: [
-                fg,
-                palette.orange,
-                palette.cyan,
-                palette.green,
-                palette.magenta,
-                palette.bg,
-            ],
-            ribbon_unselected: [
-                palette.black,
-                palette.red,
-                palette.white,
-                palette.blue,
-                palette.magenta,
-                palette.fg,
-            ],
-            ribbon_selected: [
-                palette.black,
-                palette.red,
-                palette.white,
-                palette.blue,
-                palette.magenta,
-                palette.green,
-            ],
-            exit_code_success: [
-                palette.green,
-                palette.cyan,
-                palette.black,
-                palette.magenta,
-                palette.blue,
-            ],
-            exit_code_error: [
-                palette.red,
-                palette.yellow,
-                palette.gold,
-                palette.silver,
-                palette.purple,
-            ],
-            frame_unselected: [
-                palette.orange,
-                palette.pink,
-                palette.gray,
-                palette.brown,
-                palette.black,
-            ],
-            frame_selected: [
-                palette.green,
-                palette.orange,
-                palette.cyan,
-                palette.magenta,
-                palette.brown,
-            ],
+            text_unselected: StyleDeclaration {
+                base: fg,
+                emphasis_1: palette.orange,
+                emphasis_2: palette.cyan,
+                emphasis_3: palette.green,
+                emphasis_4: palette.magenta,
+                background: bg,
+            },
+            text_selected: StyleDeclaration {
+                base: fg,
+                emphasis_1: palette.orange,
+                emphasis_2: palette.cyan,
+                emphasis_3: palette.green,
+                emphasis_4: palette.magenta,
+                background: palette.bg,
+            },
+            ribbon_unselected: StyleDeclaration {
+                base: palette.black,
+                emphasis_1: palette.red,
+                emphasis_2: palette.white,
+                emphasis_3: palette.blue,
+                emphasis_4: palette.magenta,
+                background: palette.fg,
+            },
+            ribbon_selected: StyleDeclaration {
+                base: palette.black,
+                emphasis_1: palette.red,
+                emphasis_2: palette.white,
+                emphasis_3: palette.blue,
+                emphasis_4: palette.magenta,
+                background: palette.green,
+            },
+            exit_code_success: StyleDeclaration {
+                base: palette.green,
+                emphasis_1: palette.cyan,
+                emphasis_2: palette.black,
+                emphasis_3: palette.magenta,
+                emphasis_4: palette.blue,
+                background: Default::default(),
+            },
+            exit_code_error: StyleDeclaration {
+                base: palette.red,
+                emphasis_1: palette.yellow,
+                emphasis_2: palette.gold,
+                emphasis_3: palette.silver,
+                emphasis_4: palette.purple,
+                background: Default::default(),
+            },
+            frame_unselected: StyleDeclaration {
+                base: palette.orange,
+                emphasis_1: palette.pink,
+                emphasis_2: palette.gray,
+                emphasis_3: palette.brown,
+                emphasis_4: palette.black,
+                background: Default::default(),
+            },
+            frame_selected: StyleDeclaration {
+                base: palette.green,
+                emphasis_1: palette.orange,
+                emphasis_2: palette.cyan,
+                emphasis_3: palette.magenta,
+                emphasis_4: palette.brown,
+                background: Default::default(),
+            },
             ..Default::default() /*
                                  table_title: (),
                                  table_cell_unselected: (),
diff --git a/zellij-utils/src/input/config.rs b/zellij-utils/src/input/config.rs
index 63dcf60403..83cc967e69 100644
--- a/zellij-utils/src/input/config.rs
+++ b/zellij-utils/src/input/config.rs
@@ -1,4 +1,4 @@
-use crate::data::{Palette, Styling};
+use crate::data::Styling;
 use miette::{Diagnostic, LabeledSpan, NamedSource, SourceCode};
 use std::fs::File;
 use std::io::{self, Read};
@@ -810,6 +810,7 @@ mod config_test {
                         PaletteColor::Rgb((195, 64, 67)),
                         PaletteColor::Rgb((195, 64, 67)),
                     ],
+                    ..Default::default()
                 },
             },
         );
diff --git a/zellij-utils/src/input/theme.rs b/zellij-utils/src/input/theme.rs
index bd6a48b6cb..6e65628664 100644
--- a/zellij-utils/src/input/theme.rs
+++ b/zellij-utils/src/input/theme.rs
@@ -7,7 +7,7 @@ use std::{
     fmt,
 };
 
-use crate::data::{Palette, Styling};
+use crate::data::Styling;
 
 #[derive(Debug, Default, Clone, Copy, PartialEq, Deserialize, Serialize)]
 pub struct UiConfig {
diff --git a/zellij-utils/src/kdl/mod.rs b/zellij-utils/src/kdl/mod.rs
index 1522e83785..5b36cdcf5d 100644
--- a/zellij-utils/src/kdl/mod.rs
+++ b/zellij-utils/src/kdl/mod.rs
@@ -1,7 +1,8 @@
 mod kdl_layout_parser;
 use crate::data::{
-    Direction, FloatingPaneCoordinates, InputMode, KeyWithModifier, LayoutInfo, Palette,
-    PaletteColor, PaneInfo, PaneManifest, PermissionType, Resize, SessionInfo, Styling, TabInfo,
+    Direction, FloatingPaneCoordinates, InputMode, KeyWithModifier, LayoutInfo, MultiplayerColors,
+    Palette, PaletteColor, PaneInfo, PaneManifest, PermissionType, Resize, SessionInfo,
+    StyleDeclaration, Styling, TabInfo,
 };
 use crate::envs::EnvironmentVariables;
 use crate::home::{find_default_config_dir, get_layout_dir};
@@ -1990,39 +1991,41 @@ impl UiConfig {
 }
 
 impl Themes {
-    fn colors_with_bg_from_node(
+    fn style_declaration_from_node(
         style_node: &KdlNode,
         style_descriptor: &str,
-    ) -> Result<[PaletteColor; 6], ConfigError> {
+    ) -> Result<StyleDeclaration, ConfigError> {
         let colors = kdl_children_or_error!(
             kdl_child_with_name_or_error!(style_node, style_descriptor)?,
             format!("Missing colors for {}", style_descriptor)
         );
-        Ok([
-            PaletteColor::try_from(("base", colors))?,
-            PaletteColor::try_from(("emphasis_1", colors))?,
-            PaletteColor::try_from(("emphasis_2", colors))?,
-            PaletteColor::try_from(("emphasis_3", colors))?,
-            PaletteColor::try_from(("emphasis_4", colors))?,
-            PaletteColor::try_from(("background", colors))?,
-        ])
+        Ok(StyleDeclaration {
+            base: PaletteColor::try_from(("base", colors))?,
+            background: PaletteColor::try_from(("background", colors))?,
+            emphasis_1: PaletteColor::try_from(("emphasis_1", colors))?,
+            emphasis_2: PaletteColor::try_from(("emphasis_2", colors))?,
+            emphasis_3: PaletteColor::try_from(("emphasis_3", colors))?,
+            emphasis_4: PaletteColor::try_from(("emphasis_4", colors))?,
+        })
     }
 
-    fn colors_from_node(
-        style_node: &KdlNode,
-        style_descriptor: &str,
-    ) -> Result<[PaletteColor; 5], ConfigError> {
+    fn multiplayer_colors(style_node: &KdlNode) -> Result<MultiplayerColors, ConfigError> {
         let colors = kdl_children_or_error!(
-            kdl_child_with_name_or_error!(style_node, style_descriptor)?,
-            format!("Missing colors for {}", style_descriptor)
+            kdl_child_with_name_or_error!(style_node, "mutliplayer_user_colors")?,
+            format!("Missing colors for {}", "mutliplayer_user_colors")
         );
-        Ok([
-            PaletteColor::try_from(("base", colors))?,
-            PaletteColor::try_from(("emphasis_1", colors))?,
-            PaletteColor::try_from(("emphasis_2", colors))?,
-            PaletteColor::try_from(("emphasis_3", colors))?,
-            PaletteColor::try_from(("emphasis_4", colors))?,
-        ])
+        Ok(MultiplayerColors {
+            player_1: PaletteColor::try_from(("player_1", colors))?,
+            player_2: PaletteColor::try_from(("player_2", colors))?,
+            player_3: PaletteColor::try_from(("player_3", colors))?,
+            player_4: PaletteColor::try_from(("player_4", colors))?,
+            player_5: PaletteColor::try_from(("player_5", colors))?,
+            player_6: PaletteColor::try_from(("player_6", colors))?,
+            player_7: PaletteColor::try_from(("player_7", colors))?,
+            player_8: PaletteColor::try_from(("player_8", colors))?,
+            player_9: PaletteColor::try_from(("player_9", colors))?,
+            player_10: PaletteColor::try_from(("player_10", colors))?,
+        })
     }
 
     pub fn from_kdl(themes_from_kdl: &KdlNode) -> Result<Self, ConfigError> {
@@ -2035,37 +2038,50 @@ impl Themes {
                 // Newer theme definition with named styles
                 Some(style) => {
                     let s = Styling {
-                        text_unselected: Themes::colors_with_bg_from_node(
+                        text_unselected: Themes::style_declaration_from_node(
                             style,
                             "text_unselected",
                         )?,
-                        text_selected: Themes::colors_with_bg_from_node(style, "text_selected")?,
-                        ribbon_unselected: Themes::colors_with_bg_from_node(
+                        text_selected: Themes::style_declaration_from_node(style, "text_selected")?,
+                        ribbon_unselected: Themes::style_declaration_from_node(
                             style,
                             "ribbon_unselected",
                         )?,
-                        ribbon_selected: Themes::colors_with_bg_from_node(
+                        ribbon_selected: Themes::style_declaration_from_node(
                             style,
                             "ribbon_selected",
                         )?,
-                        table_title: Themes::colors_with_bg_from_node(style, "table_title")?,
-                        table_cell_unselected: Themes::colors_with_bg_from_node(
+                        table_title: Themes::style_declaration_from_node(style, "table_title")?,
+                        table_cell_unselected: Themes::style_declaration_from_node(
                             style,
                             "table_cell_unselected",
                         )?,
-                        table_cell_selected: Themes::colors_with_bg_from_node(
+                        table_cell_selected: Themes::style_declaration_from_node(
                             style,
                             "table_cell_selected",
                         )?,
-                        list_unselected: Themes::colors_with_bg_from_node(
+                        list_unselected: Themes::style_declaration_from_node(
                             style,
                             "list_unselected",
                         )?,
-                        list_selected: Themes::colors_with_bg_from_node(style, "list_selected")?,
-                        frame_unselected: Themes::colors_from_node(style, "frame_unselected")?,
-                        frame_selected: Themes::colors_from_node(style, "frame_selected")?,
-                        exit_code_success: Themes::colors_from_node(style, "exit_code_success")?,
-                        exit_code_error: Themes::colors_from_node(style, "exit_code_error")?,
+                        list_selected: Themes::style_declaration_from_node(style, "list_selected")?,
+                        frame_unselected: Themes::style_declaration_from_node(
+                            style,
+                            "frame_unselected",
+                        )?,
+                        frame_selected: Themes::style_declaration_from_node(
+                            style,
+                            "frame_selected",
+                        )?,
+                        exit_code_success: Themes::style_declaration_from_node(
+                            style,
+                            "exit_code_success",
+                        )?,
+                        exit_code_error: Themes::style_declaration_from_node(
+                            style,
+                            "exit_code_error",
+                        )?,
+                        multiplayer_user_colors: Themes::multiplayer_colors(style)?,
                     };
 
                     Theme { palette: s }
diff --git a/zellij-utils/src/plugin_api/style.proto b/zellij-utils/src/plugin_api/style.proto
index 8cc50b192e..1d221af102 100644
--- a/zellij-utils/src/plugin_api/style.proto
+++ b/zellij-utils/src/plugin_api/style.proto
@@ -68,4 +68,5 @@ message Styling {
     repeated Color frame_selected = 11;
     repeated Color exit_code_success = 12;
     repeated Color exit_code_error = 13;
+    repeated Color multiplayer_user_colors = 14;
 }
diff --git a/zellij-utils/src/plugin_api/style.rs b/zellij-utils/src/plugin_api/style.rs
index 0659a410f2..c39b3a2eb2 100644
--- a/zellij-utils/src/plugin_api/style.rs
+++ b/zellij-utils/src/plugin_api/style.rs
@@ -3,7 +3,9 @@ use super::generated_api::api::style::{
     Palette as ProtobufPalette, RgbColorPayload as ProtobufRgbColorPayload, Style as ProtobufStyle,
     Styling as ProtobufStyling, ThemeHue as ProtobufThemeHue,
 };
-use crate::data::{Palette, PaletteColor, Style, Styling, ThemeHue};
+use crate::data::{
+    MultiplayerColors, Palette, PaletteColor, Style, StyleDeclaration, Styling, ThemeHue,
+};
 use crate::errors::prelude::*;
 
 use std::convert::TryFrom;
@@ -42,16 +44,59 @@ fn to_array<T, const N: usize>(v: Vec<T>) -> std::result::Result<[T; N], &'stati
         .map_err(|_| "Could not obtain array from protobuf field")
 }
 
+fn to_style_declaration(
+    parsed_array: Result<[PaletteColor; 6], &'static str>,
+) -> Result<StyleDeclaration, &'static str> {
+    parsed_array.map(|arr| StyleDeclaration {
+        base: arr[0],
+        background: arr[1],
+        emphasis_1: arr[2],
+        emphasis_2: arr[3],
+        emphasis_3: arr[4],
+        emphasis_4: arr[5],
+    })
+}
+
+fn to_multiplayer_colors(
+    parsed_array: Result<[PaletteColor; 10], &'static str>,
+) -> Result<MultiplayerColors, &'static str> {
+    parsed_array.map(|arr| MultiplayerColors {
+        player_1: arr[0],
+        player_2: arr[1],
+        player_3: arr[2],
+        player_4: arr[3],
+        player_5: arr[4],
+        player_6: arr[5],
+        player_7: arr[6],
+        player_8: arr[7],
+        player_9: arr[8],
+        player_10: arr[9],
+    })
+}
+
 #[macro_export]
 macro_rules! color_definitions {
     ($proto:expr, $declaration:ident, $size:expr) => {
-        to_array::<PaletteColor, $size>(
+        to_style_declaration(to_array::<PaletteColor, $size>(
             $proto
                 .$declaration
                 .into_iter()
                 .map(PaletteColor::try_from)
                 .collect::<Result<Vec<PaletteColor>, _>>()?,
-        )?
+        ))?
+    };
+}
+
+#[macro_export]
+macro_rules! multiplayer_colors {
+    ($proto:expr, $size: expr) => {
+        to_multiplayer_colors(to_array::<PaletteColor, $size>(
+            $proto
+                .multiplayer_user_colors
+                .into_iter()
+                .map(PaletteColor::try_from)
+                .collect::<Result<Vec<PaletteColor>, _>>()?,
+        ))?
     };
 }
 
@@ -69,21 +114,47 @@ impl TryFrom<ProtobufStyling> for Styling {
             table_cell_selected: color_definitions!(proto, table_cell_selected, 6),
             list_unselected: color_definitions!(proto, list_unselected, 6),
             list_selected: color_definitions!(proto, list_selected, 6),
-            frame_unselected: color_definitions!(proto, frame_unselected, 5),
-            frame_selected: color_definitions!(proto, frame_selected, 5),
-            exit_code_success: color_definitions!(proto, exit_code_success, 5),
-            exit_code_error: color_definitions!(proto, exit_code_error, 5),
+            frame_unselected: color_definitions!(proto, frame_unselected, 6),
+            frame_selected: color_definitions!(proto, frame_selected, 6),
+            exit_code_success: color_definitions!(proto, exit_code_success, 6),
+            exit_code_error: color_definitions!(proto, exit_code_error, 6),
+            multiplayer_user_colors: multiplayer_colors!(proto, 10),
         })
     }
 }
 
-fn color_protos<const N: usize>(
-    colors: [PaletteColor; N],
-) -> Result<Vec<ProtobufColor>, &'static str> {
-    colors
-        .into_iter()
-        .map(ProtobufColor::try_from)
-        .collect::<Result<Vec<ProtobufColor>, _>>()
+impl TryFrom<StyleDeclaration> for Vec<ProtobufColor> {
+    type Error = &'static str;
+
+    fn try_from(colors: StyleDeclaration) -> std::result::Result<Self, Self::Error> {
+        Ok(vec![
+            colors.base.try_into()?,
+            colors.background.try_into()?,
+            colors.emphasis_1.try_into()?,
+            colors.emphasis_2.try_into()?,
+            colors.emphasis_3.try_into()?,
+            colors.emphasis_4.try_into()?,
+        ])
+    }
+}
+
+impl TryFrom<MultiplayerColors> for Vec<ProtobufColor> {
+    type Error = &'static str;
+
+    fn try_from(value: MultiplayerColors) -> std::result::Result<Self, Self::Error> {
+        Ok(vec![
+            value.player_1.try_into()?,
+            value.player_2.try_into()?,
+            value.player_3.try_into()?,
+            value.player_4.try_into()?,
+            value.player_5.try_into()?,
+            value.player_6.try_into()?,
+            value.player_7.try_into()?,
+            value.player_8.try_into()?,
+            value.player_9.try_into()?,
+            value.player_10.try_into()?,
+        ])
+    }
 }
 
 impl TryFrom<Styling> for ProtobufStyling {
@@ -91,19 +162,20 @@ impl TryFrom<Styling> for ProtobufStyling {
 
     fn try_from(style: Styling) -> std::result::Result<Self, Self::Error> {
         Ok(ProtobufStyling {
-            text_unselected: color_protos(style.text_unselected)?,
-            text_selected: color_protos(style.text_selected)?,
-            ribbon_unselected: color_protos(style.ribbon_unselected)?,
-            ribbon_selected: color_protos(style.ribbon_selected)?,
-            table_title: color_protos(style.table_title)?,
-            table_cell_unselected: color_protos(style.table_cell_unselected)?,
-            table_cell_selected: color_protos(style.table_cell_selected)?,
-            list_unselected: color_protos(style.list_unselected)?,
-            list_selected: color_protos(style.list_selected)?,
-            frame_unselected: color_protos(style.frame_unselected)?,
-            frame_selected: color_protos(style.frame_selected)?,
-            exit_code_success: color_protos(style.exit_code_success)?,
-            exit_code_error: color_protos(style.exit_code_error)?,
+            text_unselected: style.text_unselected.try_into()?,
+            text_selected: style.text_selected.try_into()?,
+            ribbon_unselected: style.ribbon_unselected.try_into()?,
+            ribbon_selected: style.ribbon_selected.try_into()?,
+            table_title: style.table_title.try_into()?,
+            table_cell_unselected: style.table_cell_unselected.try_into()?,
+            table_cell_selected: style.table_cell_selected.try_into()?,
+            list_unselected: style.list_unselected.try_into()?,
+            list_selected: style.list_selected.try_into()?,
+            frame_unselected: style.frame_unselected.try_into()?,
+            frame_selected: style.frame_selected.try_into()?,
+            exit_code_success: style.exit_code_success.try_into()?,
+            exit_code_error: style.exit_code_error.try_into()?,
+            multiplayer_user_colors: style.multiplayer_user_colors.try_into()?,
         })
     }
 }

From 0ffbb8bd42ee3cdbc2e3b2725446a3419c40b1c2 Mon Sep 17 00:00:00 2001
From: Mark Grey <mgthesecond@spotify.com>
Date: Tue, 21 May 2024 11:16:26 -0400
Subject: [PATCH 26/40] implement multiplayer colors

---
 default-plugins/compact-bar/src/tab.rs        |  7 ++--
 default-plugins/tab-bar/src/tab.rs            |  2 +-
 zellij-server/src/ui/pane_boundaries_frame.rs |  2 +-
 zellij-server/src/ui/pane_contents_and_ui.rs  | 10 ++++-
 zellij-utils/src/data.rs                      | 37 +++++++++++++------
 zellij-utils/src/kdl/mod.rs                   |  9 +++--
 6 files changed, 45 insertions(+), 22 deletions(-)

diff --git a/default-plugins/compact-bar/src/tab.rs b/default-plugins/compact-bar/src/tab.rs
index 22cb4288c9..e586bd676f 100644
--- a/default-plugins/compact-bar/src/tab.rs
+++ b/default-plugins/compact-bar/src/tab.rs
@@ -4,12 +4,12 @@ use unicode_width::UnicodeWidthStr;
 use zellij_tile::prelude::*;
 use zellij_tile_utils::style;
 
-fn cursors(focused_clients: &[ClientId]) -> (Vec<ANSIString>, usize) {
+fn cursors(focused_clients: &[ClientId], colors: MultiplayerColors) -> (Vec<ANSIString>, usize) {
     // cursor section, text length
     let mut len = 0;
     let mut cursors = vec![];
     for client_id in focused_clients.iter() {
-        if let Some(color) = client_id_to_colors(*client_id) {
+        if let Some(color) = client_id_to_colors(*client_id, colors) {
             cursors.push(style!(color.1, color.0).paint(" "));
             len += 1;
         }
@@ -52,7 +52,8 @@ pub fn render_tab(
 
     let right_separator = style!(background_color, foreground_color).paint(separator);
     let tab_styled_text = if !focused_clients.is_empty() {
-        let (cursor_section, extra_length) = cursors(focused_clients);
+        let (cursor_section, extra_length) =
+            cursors(focused_clients, palette.multiplayer_user_colors);
         tab_text_len += extra_length;
         let mut s = String::new();
         let cursor_beginning = style!(foreground_color, background_color)
diff --git a/default-plugins/tab-bar/src/tab.rs b/default-plugins/tab-bar/src/tab.rs
index 9b0c624cfb..6395460067 100644
--- a/default-plugins/tab-bar/src/tab.rs
+++ b/default-plugins/tab-bar/src/tab.rs
@@ -9,7 +9,7 @@ fn cursors(focused_clients: &[ClientId], palette: Styling) -> (Vec<ANSIString>,
     let mut len = 0;
     let mut cursors = vec![];
     for client_id in focused_clients.iter() {
-        if let Some(color) = client_id_to_colors(*client_id) {
+        if let Some(color) = client_id_to_colors(*client_id, palette.multiplayer_user_colors) {
             cursors.push(style!(color.1, color.0).paint(" "));
             len += 1;
         }
diff --git a/zellij-server/src/ui/pane_boundaries_frame.rs b/zellij-server/src/ui/pane_boundaries_frame.rs
index 7ba27ecf90..3e9509e2db 100644
--- a/zellij-server/src/ui/pane_boundaries_frame.rs
+++ b/zellij-server/src/ui/pane_boundaries_frame.rs
@@ -117,7 +117,7 @@ impl PaneFrame {
         self.color = Some(color);
     }
     fn client_cursor(&self, client_id: ClientId) -> Vec<TerminalCharacter> {
-        let color = client_id_to_colors(client_id);
+        let color = client_id_to_colors(client_id, self.style.colors.multiplayer_user_colors);
         background_color(" ", color.map(|c| c.0))
     }
     fn get_corner(&self, corner: &'static str) -> &'static str {
diff --git a/zellij-server/src/ui/pane_contents_and_ui.rs b/zellij-server/src/ui/pane_contents_and_ui.rs
index 253807f0e9..e3292d9605 100644
--- a/zellij-server/src/ui/pane_contents_and_ui.rs
+++ b/zellij-server/src/ui/pane_contents_and_ui.rs
@@ -133,7 +133,10 @@ impl<'a> PaneContentsAndUi<'a> {
                 .with_context(|| {
                     format!("failed to render fake cursor if needed for client {client_id}")
                 })?;
-            if let Some(colors) = client_id_to_colors(*fake_cursor_client_id) {
+            if let Some(colors) = client_id_to_colors(
+                *fake_cursor_client_id,
+                self.style.colors.multiplayer_user_colors,
+            ) {
                 if let Some(vte_output) = self.pane.render_fake_cursor(colors.0, colors.1) {
                     self.output.add_post_vte_instruction_to_client(
                         client_id,
@@ -259,7 +262,10 @@ impl<'a> PaneContentsAndUi<'a> {
                     if session_is_mirrored || !self.multiple_users_exist_in_session {
                         Some(self.style.colors.frame_selected.base)
                     } else {
-                        let colors = client_id_to_colors(client_id);
+                        let colors = client_id_to_colors(
+                            client_id,
+                            self.style.colors.multiplayer_user_colors,
+                        );
                         colors.map(|colors| colors.0)
                     }
                 },
diff --git a/zellij-utils/src/data.rs b/zellij-utils/src/data.rs
index 50781ea225..6e4d9332f0 100644
--- a/zellij-utils/src/data.rs
+++ b/zellij-utils/src/data.rs
@@ -21,20 +21,23 @@ use termwiz::{
 
 pub type ClientId = u16; // TODO: merge with crate type?
 
-pub fn client_id_to_colors(client_id: ClientId) -> Option<(PaletteColor, PaletteColor)> {
+pub fn client_id_to_colors(
+    client_id: ClientId,
+    colors: MultiplayerColors,
+) -> Option<(PaletteColor, PaletteColor)> {
     // (primary color, secondary color)
     let black = PaletteColor::EightBit(default_colors::BLACK);
     match client_id {
-        1 => Some((PaletteColor::EightBit(default_colors::MAGENTA), black)),
-        2 => Some((PaletteColor::EightBit(default_colors::BLUE), black)),
-        3 => Some((PaletteColor::EightBit(default_colors::PURPLE), black)),
-        4 => Some((PaletteColor::EightBit(default_colors::YELLOW), black)),
-        5 => Some((PaletteColor::EightBit(default_colors::CYAN), black)),
-        6 => Some((PaletteColor::EightBit(default_colors::GOLD), black)),
-        7 => Some((PaletteColor::EightBit(default_colors::RED), black)),
-        8 => Some((PaletteColor::EightBit(default_colors::SILVER), black)),
-        9 => Some((PaletteColor::EightBit(default_colors::PINK), black)),
-        10 => Some((PaletteColor::EightBit(default_colors::BROWN), black)),
+        1 => Some((colors.player_1, black)),
+        2 => Some((colors.player_2, black)),
+        3 => Some((colors.player_3, black)),
+        4 => Some((colors.player_4, black)),
+        5 => Some((colors.player_5, black)),
+        6 => Some((colors.player_6, black)),
+        7 => Some((colors.player_7, black)),
+        8 => Some((colors.player_8, black)),
+        9 => Some((colors.player_9, black)),
+        10 => Some((colors.player_10, black)),
         _ => None,
     }
 }
@@ -1265,6 +1268,18 @@ impl From<Palette> for Styling {
                 emphasis_4: palette.brown,
                 background: Default::default(),
             },
+            multiplayer_user_colors: MultiplayerColors {
+                player_1: palette.magenta,
+                player_2: palette.blue,
+                player_3: palette.purple,
+                player_4: palette.yellow,
+                player_5: palette.cyan,
+                player_6: palette.gold,
+                player_7: palette.red,
+                player_8: palette.silver,
+                player_9: palette.pink,
+                player_10: palette.brown,
+            },
             ..Default::default() /*
                                  table_title: (),
                                  table_cell_unselected: (),
diff --git a/zellij-utils/src/kdl/mod.rs b/zellij-utils/src/kdl/mod.rs
index 5b36cdcf5d..d6561c7b9d 100644
--- a/zellij-utils/src/kdl/mod.rs
+++ b/zellij-utils/src/kdl/mod.rs
@@ -2001,7 +2001,7 @@ impl Themes {
         );
         Ok(StyleDeclaration {
             base: PaletteColor::try_from(("base", colors))?,
-            background: PaletteColor::try_from(("background", colors))?,
+            background: PaletteColor::try_from(("background", colors)).unwrap_or_default(),
             emphasis_1: PaletteColor::try_from(("emphasis_1", colors))?,
             emphasis_2: PaletteColor::try_from(("emphasis_2", colors))?,
             emphasis_3: PaletteColor::try_from(("emphasis_3", colors))?,
@@ -2011,8 +2011,8 @@ impl Themes {
 
     fn multiplayer_colors(style_node: &KdlNode) -> Result<MultiplayerColors, ConfigError> {
         let colors = kdl_children_or_error!(
-            kdl_child_with_name_or_error!(style_node, "mutliplayer_user_colors")?,
-            format!("Missing colors for {}", "mutliplayer_user_colors")
+            kdl_child_with_name_or_error!(style_node, "multiplayer_user_colors")?,
+            format!("Missing colors for {}", "multiplayer_user_colors")
         );
         Ok(MultiplayerColors {
             player_1: PaletteColor::try_from(("player_1", colors))?,
@@ -2081,7 +2081,8 @@ impl Themes {
                             style,
                             "exit_code_error",
                         )?,
-                        multiplayer_user_colors: Themes::multiplayer_colors(style)?,
+                        multiplayer_user_colors: Themes::multiplayer_colors(style)
+                            .unwrap_or_default(),
                     };
 
                     Theme { palette: s }

From d4ba7d3472bf740df5d682752ba17846566681a5 Mon Sep 17 00:00:00 2001
From: Mark Grey <mgthesecond@spotify.com>
Date: Tue, 21 May 2024 12:23:55 -0400
Subject: [PATCH 27/40] corrections

---
 default-plugins/status-bar/src/main.rs | 81 +++++++++++++++++++-------
 1 file changed, 59 insertions(+), 22 deletions(-)

diff --git a/default-plugins/status-bar/src/main.rs b/default-plugins/status-bar/src/main.rs
index d0fd8a7181..a885b1126b 100644
--- a/default-plugins/status-bar/src/main.rs
+++ b/default-plugins/status-bar/src/main.rs
@@ -98,53 +98,90 @@ fn color_elements(palette: Styling, different_color_alternates: bool) -> Colored
     ColoredElements {
         selected: SegmentStyle {
             prefix_separator: style!(background, palette.ribbon_selected.background),
-            char_left_separator: style!(palette.ribbon_selected.base, palette.ribbon_selected.background)
-                .bold(),
-            char_shortcut: style!(palette.ribbon_selected.emphasis_1, palette.ribbon_selected.background).bold(),
-            char_right_separator: style!(palette.ribbon_selected.base, palette.ribbon_selected.background)
-                .bold(),
-            styled_text: style!(palette.ribbon_selected.base, palette.ribbon_selected.background).bold(),
+            char_left_separator: style!(
+                palette.ribbon_selected.base,
+                palette.ribbon_selected.background
+            )
+            .bold(),
+            char_shortcut: style!(
+                palette.ribbon_selected.emphasis_1,
+                palette.ribbon_selected.background
+            )
+            .bold(),
+            char_right_separator: style!(
+                palette.ribbon_selected.base,
+                palette.ribbon_selected.background
+            )
+            .bold(),
+            styled_text: style!(
+                palette.ribbon_selected.base,
+                palette.ribbon_selected.background
+            )
+            .bold(),
             suffix_separator: style!(palette.ribbon_selected.background, background).bold(),
         },
         unselected: SegmentStyle {
             prefix_separator: style!(background, palette.ribbon_unselected.background),
-            char_left_separator: style!(palette.ribbon_unselected.base, palette.ribbon_unselected.background)
-                .bold(),
-            char_shortcut: style!(palette.ribbon_unselected.emphasis_1, palette.ribbon_unselected.background)
-                .bold(),
+            char_left_separator: style!(
+                palette.ribbon_unselected.base,
+                palette.ribbon_unselected.background
+            )
+            .bold(),
+            char_shortcut: style!(
+                palette.ribbon_unselected.emphasis_1,
+                palette.ribbon_unselected.background
+            )
+            .bold(),
             char_right_separator: style!(
                 palette.ribbon_unselected.base,
                 palette.ribbon_unselected.background
             )
             .bold(),
-            styled_text: style!(palette.ribbon_unselected.base, palette.ribbon_unselected.background).bold(),
+            styled_text: style!(
+                palette.ribbon_unselected.base,
+                palette.ribbon_unselected.background
+            )
+            .bold(),
             suffix_separator: style!(palette.ribbon_unselected.background, background).bold(),
         },
         unselected_alternate: SegmentStyle {
             prefix_separator: style!(background, alternate_background_color),
             char_left_separator: style!(background, alternate_background_color).bold(),
-            char_shortcut: style!(palette.ribbon_unselected.emphasis_1, alternate_background_color).bold(),
+            char_shortcut: style!(
+                palette.ribbon_unselected.emphasis_1,
+                alternate_background_color
+            )
+            .bold(),
             char_right_separator: style!(background, alternate_background_color).bold(),
-            styled_text: style!(background, alternate_background_color).bold(),
+            styled_text: style!(palette.ribbon_unselected.base, alternate_background_color).bold(),
             suffix_separator: style!(alternate_background_color, background).bold(),
         },
         disabled: SegmentStyle {
             prefix_separator: style!(background, palette.ribbon_unselected.background),
-            char_left_separator: style!(palette.ribbon_unselected.base, palette.ribbon_unselected.background)
-                .dimmed()
-                .italic(),
-            char_shortcut: style!(palette.ribbon_unselected.base, palette.ribbon_unselected.background)
-                .dimmed()
-                .italic(),
+            char_left_separator: style!(
+                palette.ribbon_unselected.base,
+                palette.ribbon_unselected.background
+            )
+            .dimmed()
+            .italic(),
+            char_shortcut: style!(
+                palette.ribbon_unselected.base,
+                palette.ribbon_unselected.background
+            )
+            .dimmed()
+            .italic(),
             char_right_separator: style!(
                 palette.ribbon_unselected.base,
                 palette.ribbon_unselected.background
             )
             .dimmed()
             .italic(),
-            styled_text: style!(palette.ribbon_unselected.base, palette.ribbon_unselected.background)
-                .dimmed()
-                .italic(),
+            styled_text: style!(
+                palette.ribbon_unselected.base,
+                palette.ribbon_unselected.background
+            )
+            .dimmed()
+            .italic(),
             suffix_separator: style!(palette.ribbon_unselected.background, background),
         },
         superkey_prefix: style!(foreground, background).bold(),

From 60f3580aafdc6c49f56833782d28b3f697945e63 Mon Sep 17 00:00:00 2001
From: Mark Grey <mgthesecond@spotify.com>
Date: Tue, 21 May 2024 17:18:35 -0400
Subject: [PATCH 28/40] WIP session manager

---
 .../session-manager/src/ui/components.rs      |  16 +-
 zellij-utils/src/data.rs                      | 187 ++++++++++++++++--
 zellij-utils/src/kdl/mod.rs                   |   3 +
 3 files changed, 188 insertions(+), 18 deletions(-)

diff --git a/default-plugins/session-manager/src/ui/components.rs b/default-plugins/session-manager/src/ui/components.rs
index 5685368e6e..075d326300 100644
--- a/default-plugins/session-manager/src/ui/components.rs
+++ b/default-plugins/session-manager/src/ui/components.rs
@@ -85,7 +85,9 @@ impl ListItem {
                 span.render(
                     indices.clone().map(|i| {
                         (
-                            SpanStyle::ForegroundBold(self.colors.palette.text_unselected.emphasis_4),
+                            SpanStyle::ForegroundBold(
+                                self.colors.palette.text_unselected.emphasis_4,
+                            ),
                             i,
                         )
                     }),
@@ -107,7 +109,9 @@ impl ListItem {
                 span.render(
                     indices.clone().map(|i| {
                         (
-                            SpanStyle::ForegroundBold(self.colors.palette.text_unselected.emphasis_4),
+                            SpanStyle::ForegroundBold(
+                                self.colors.palette.text_unselected.emphasis_4,
+                            ),
                             i,
                         )
                     }),
@@ -124,7 +128,9 @@ impl ListItem {
                 span.render(
                     indices.clone().map(|i| {
                         (
-                            SpanStyle::ForegroundBold(self.colors.palette.text_unselected.emphasis_4),
+                            SpanStyle::ForegroundBold(
+                                self.colors.palette.text_unselected.emphasis_4,
+                            ),
                             i,
                         )
                     }),
@@ -310,7 +316,7 @@ impl LineToRender {
         } else {
             "      ".to_owned()
         };
-        match self.colors.palette.text_selected.background {
+        match self.colors.palette.list_selected.background {
             PaletteColor::EightBit(byte) => {
                 self.line = format!(
                     "\u{1b}[48;5;{byte}m\u{1b}[K\u{1b}[48;5;{byte}m{arrows}{}",
@@ -332,7 +338,7 @@ impl LineToRender {
         } else {
             "      ".to_owned()
         };
-        match self.colors.palette.text_selected.background {
+        match self.colors.palette.list_selected.background {
             PaletteColor::EightBit(byte) => {
                 self.line = format!(
                     "\u{1b}[48;5;{byte}m\u{1b}[K\u{1b}[48;5;{byte}m{arrows}{}",
diff --git a/zellij-utils/src/data.rs b/zellij-utils/src/data.rs
index 6e4d9332f0..eddd6fba61 100644
--- a/zellij-utils/src/data.rs
+++ b/zellij-utils/src/data.rs
@@ -1136,7 +1136,7 @@ pub struct Style {
     pub hide_session_name: bool,
 }
 
-#[derive(Debug, Copy, Default, Clone, PartialEq, Eq, Hash, Deserialize, Serialize)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, Deserialize, Serialize)]
 pub struct Styling {
     pub text_unselected: StyleDeclaration,
     pub text_selected: StyleDeclaration,
@@ -1178,9 +1178,136 @@ pub struct MultiplayerColors {
     pub player_10: PaletteColor,
 }
 
+const DEFAULT_STYLES: Styling = Styling {
+    text_unselected: StyleDeclaration {
+        base: PaletteColor::EightBit(default_colors::BRIGHT_GRAY),
+        emphasis_1: PaletteColor::EightBit(default_colors::ORANGE),
+        emphasis_2: PaletteColor::EightBit(default_colors::CYAN),
+        emphasis_3: PaletteColor::EightBit(default_colors::GREEN),
+        emphasis_4: PaletteColor::EightBit(default_colors::MAGENTA),
+        background: PaletteColor::EightBit(default_colors::GRAY),
+    },
+    text_selected: StyleDeclaration {
+        base: PaletteColor::EightBit(default_colors::BRIGHT_GRAY),
+        emphasis_1: PaletteColor::EightBit(default_colors::ORANGE),
+        emphasis_2: PaletteColor::EightBit(default_colors::CYAN),
+        emphasis_3: PaletteColor::EightBit(default_colors::GREEN),
+        emphasis_4: PaletteColor::EightBit(default_colors::MAGENTA),
+        background: PaletteColor::EightBit(default_colors::GRAY),
+    },
+    ribbon_unselected: StyleDeclaration {
+        base: PaletteColor::EightBit(default_colors::BLACK),
+        emphasis_1: PaletteColor::EightBit(default_colors::RED),
+        emphasis_2: PaletteColor::EightBit(default_colors::WHITE),
+        emphasis_3: PaletteColor::EightBit(default_colors::BLUE),
+        emphasis_4: PaletteColor::EightBit(default_colors::MAGENTA),
+        background: PaletteColor::EightBit(default_colors::GRAY),
+    },
+    ribbon_selected: StyleDeclaration {
+        base: PaletteColor::EightBit(default_colors::BLACK),
+        emphasis_1: PaletteColor::EightBit(default_colors::RED),
+        emphasis_2: PaletteColor::EightBit(default_colors::WHITE),
+        emphasis_3: PaletteColor::EightBit(default_colors::BLUE),
+        emphasis_4: PaletteColor::EightBit(default_colors::MAGENTA),
+        background: PaletteColor::EightBit(default_colors::GREEN),
+    },
+    exit_code_success: StyleDeclaration {
+        base: PaletteColor::EightBit(default_colors::GREEN),
+        emphasis_1: PaletteColor::EightBit(default_colors::CYAN),
+        emphasis_2: PaletteColor::EightBit(default_colors::BLACK),
+        emphasis_3: PaletteColor::EightBit(default_colors::MAGENTA),
+        emphasis_4: PaletteColor::EightBit(default_colors::BLUE),
+        background: PaletteColor::EightBit(default_colors::GRAY),
+    },
+    exit_code_error: StyleDeclaration {
+        base: PaletteColor::EightBit(default_colors::RED),
+        emphasis_1: PaletteColor::EightBit(default_colors::YELLOW),
+        emphasis_2: PaletteColor::EightBit(default_colors::GOLD),
+        emphasis_3: PaletteColor::EightBit(default_colors::SILVER),
+        emphasis_4: PaletteColor::EightBit(default_colors::PURPLE),
+        background: PaletteColor::EightBit(default_colors::GRAY),
+    },
+    frame_unselected: StyleDeclaration {
+        base: PaletteColor::EightBit(default_colors::ORANGE),
+        emphasis_1: PaletteColor::EightBit(default_colors::PINK),
+        emphasis_2: PaletteColor::EightBit(default_colors::GRAY),
+        emphasis_3: PaletteColor::EightBit(default_colors::BROWN),
+        emphasis_4: PaletteColor::EightBit(default_colors::BLACK),
+        background: PaletteColor::EightBit(default_colors::GRAY),
+    },
+    frame_selected: StyleDeclaration {
+        base: PaletteColor::EightBit(default_colors::GREEN),
+        emphasis_1: PaletteColor::EightBit(default_colors::ORANGE),
+        emphasis_2: PaletteColor::EightBit(default_colors::CYAN),
+        emphasis_3: PaletteColor::EightBit(default_colors::MAGENTA),
+        emphasis_4: PaletteColor::EightBit(default_colors::BROWN),
+        background: PaletteColor::EightBit(default_colors::GRAY),
+    },
+    table_title: StyleDeclaration {
+        base: PaletteColor::EightBit(default_colors::GREEN),
+        emphasis_1: PaletteColor::EightBit(default_colors::ORANGE),
+        emphasis_2: PaletteColor::EightBit(default_colors::CYAN),
+        emphasis_3: PaletteColor::EightBit(default_colors::GREEN),
+        emphasis_4: PaletteColor::EightBit(default_colors::MAGENTA),
+        background: PaletteColor::EightBit(default_colors::GRAY),
+    },
+    table_cell_unselected: StyleDeclaration {
+        base: PaletteColor::EightBit(default_colors::BRIGHT_GRAY),
+        emphasis_1: PaletteColor::EightBit(default_colors::ORANGE),
+        emphasis_2: PaletteColor::EightBit(default_colors::CYAN),
+        emphasis_3: PaletteColor::EightBit(default_colors::GREEN),
+        emphasis_4: PaletteColor::EightBit(default_colors::MAGENTA),
+        background: PaletteColor::EightBit(default_colors::GRAY),
+    },
+    table_cell_selected: StyleDeclaration {
+        base: PaletteColor::EightBit(default_colors::GREEN),
+        emphasis_1: PaletteColor::EightBit(default_colors::ORANGE),
+        emphasis_2: PaletteColor::EightBit(default_colors::CYAN),
+        emphasis_3: PaletteColor::EightBit(default_colors::RED),
+        emphasis_4: PaletteColor::EightBit(default_colors::MAGENTA),
+        background: PaletteColor::EightBit(default_colors::GRAY),
+    },
+    list_unselected: StyleDeclaration {
+        base: PaletteColor::EightBit(default_colors::BRIGHT_GRAY),
+        emphasis_1: PaletteColor::EightBit(default_colors::ORANGE),
+        emphasis_2: PaletteColor::EightBit(default_colors::CYAN),
+        emphasis_3: PaletteColor::EightBit(default_colors::GREEN),
+        emphasis_4: PaletteColor::EightBit(default_colors::MAGENTA),
+        background: PaletteColor::EightBit(default_colors::GRAY),
+    },
+    list_selected: StyleDeclaration {
+        base: PaletteColor::EightBit(default_colors::GREEN),
+        emphasis_1: PaletteColor::EightBit(default_colors::ORANGE),
+        emphasis_2: PaletteColor::EightBit(default_colors::CYAN),
+        emphasis_3: PaletteColor::EightBit(default_colors::RED),
+        emphasis_4: PaletteColor::EightBit(default_colors::MAGENTA),
+        background: PaletteColor::EightBit(default_colors::GRAY),
+    },
+    multiplayer_user_colors: MultiplayerColors {
+        player_1: PaletteColor::EightBit(default_colors::MAGENTA),
+        player_2: PaletteColor::EightBit(default_colors::BLUE),
+        player_3: PaletteColor::EightBit(default_colors::PURPLE),
+        player_4: PaletteColor::EightBit(default_colors::YELLOW),
+        player_5: PaletteColor::EightBit(default_colors::CYAN),
+        player_6: PaletteColor::EightBit(default_colors::GOLD),
+        player_7: PaletteColor::EightBit(default_colors::RED),
+        player_8: PaletteColor::EightBit(default_colors::SILVER),
+        player_9: PaletteColor::EightBit(default_colors::PINK),
+        player_10: PaletteColor::EightBit(default_colors::BROWN),
+    },
+};
+
+impl Default for Styling {
+    fn default() -> Self {
+        DEFAULT_STYLES
+    }
+}
+
 impl From<Styling> for Palette {
     fn from(styling: Styling) -> Self {
         Palette {
+            theme_hue: ThemeHue::Dark,
+            source: PaletteSource::Default,
             fg: styling.ribbon_unselected.background,
             bg: styling.text_unselected.background,
             red: styling.exit_code_error.base,
@@ -1192,7 +1319,12 @@ impl From<Styling> for Palette {
             cyan: styling.text_unselected.emphasis_2,
             black: styling.ribbon_unselected.base,
             white: styling.ribbon_selected.emphasis_2,
-            ..Default::default()
+            gray: styling.list_unselected.background,
+            purple: styling.multiplayer_user_colors.player_3,
+            gold: styling.multiplayer_user_colors.player_6,
+            silver: styling.multiplayer_user_colors.player_8,
+            pink: styling.multiplayer_user_colors.player_9,
+            brown: styling.multiplayer_user_colors.player_10,
         }
     }
 }
@@ -1268,6 +1400,46 @@ impl From<Palette> for Styling {
                 emphasis_4: palette.brown,
                 background: Default::default(),
             },
+            table_title: StyleDeclaration {
+                base: palette.green,
+                emphasis_1: palette.orange,
+                emphasis_2: palette.cyan,
+                emphasis_3: palette.red,
+                emphasis_4: palette.magenta,
+                background: palette.gray,
+            },
+            table_cell_unselected: StyleDeclaration {
+                base: palette.fg,
+                emphasis_1: palette.orange,
+                emphasis_2: palette.cyan,
+                emphasis_3: palette.green,
+                emphasis_4: palette.magenta,
+                background: palette.bg,
+            },
+            table_cell_selected: StyleDeclaration {
+                base: palette.green,
+                emphasis_1: palette.orange,
+                emphasis_2: palette.cyan,
+                emphasis_3: palette.red,
+                emphasis_4: palette.magenta,
+                background: palette.bg,
+            },
+            list_unselected: StyleDeclaration {
+                base: palette.fg,
+                emphasis_1: palette.orange,
+                emphasis_2: palette.cyan,
+                emphasis_3: palette.green,
+                emphasis_4: palette.magenta,
+                background: palette.bg,
+            },
+            list_selected: StyleDeclaration {
+                base: palette.green,
+                emphasis_1: palette.orange,
+                emphasis_2: palette.cyan,
+                emphasis_3: palette.red,
+                emphasis_4: palette.magenta,
+                background: palette.bg,
+            },
             multiplayer_user_colors: MultiplayerColors {
                 player_1: palette.magenta,
                 player_2: palette.blue,
@@ -1280,17 +1452,6 @@ impl From<Palette> for Styling {
                 player_9: palette.pink,
                 player_10: palette.brown,
             },
-            ..Default::default() /*
-                                 table_title: (),
-                                 table_cell_unselected: (),
-                                 table_cell_selected: (),
-                                 list_unselected: (),
-                                 list_selected: (),
-                                 frame_unselected: (),
-                                 frame_selected: (),
-                                 exit_code_success: (),
-                                 exit_code_error: (),
-                                 */
         }
     }
 }
diff --git a/zellij-utils/src/kdl/mod.rs b/zellij-utils/src/kdl/mod.rs
index d6561c7b9d..bec51f2426 100644
--- a/zellij-utils/src/kdl/mod.rs
+++ b/zellij-utils/src/kdl/mod.rs
@@ -1995,6 +1995,8 @@ impl Themes {
         style_node: &KdlNode,
         style_descriptor: &str,
     ) -> Result<StyleDeclaration, ConfigError> {
+        let descriptor_node = kdl_child_with_name!(style_node, style_descriptor);
+
         let colors = kdl_children_or_error!(
             kdl_child_with_name_or_error!(style_node, style_descriptor)?,
             format!("Missing colors for {}", style_descriptor)
@@ -2010,6 +2012,7 @@ impl Themes {
     }
 
     fn multiplayer_colors(style_node: &KdlNode) -> Result<MultiplayerColors, ConfigError> {
+        // TODO: make optional
         let colors = kdl_children_or_error!(
             kdl_child_with_name_or_error!(style_node, "multiplayer_user_colors")?,
             format!("Missing colors for {}", "multiplayer_user_colors")

From b8986680ea919cfedd9175c0d0799944ce762145 Mon Sep 17 00:00:00 2001
From: Mark Grey <mgthesecond@spotify.com>
Date: Mon, 3 Jun 2024 08:38:20 -0400
Subject: [PATCH 29/40] text styling for nested list

---
 .../src/ui/components/nested_list.rs          | 32 ++++++++-
 zellij-server/src/ui/components/text.rs       | 71 ++++++++++++++-----
 2 files changed, 83 insertions(+), 20 deletions(-)

diff --git a/zellij-server/src/ui/components/nested_list.rs b/zellij-server/src/ui/components/nested_list.rs
index 081b2d73f1..b735902ad5 100644
--- a/zellij-server/src/ui/components/nested_list.rs
+++ b/zellij-server/src/ui/components/nested_list.rs
@@ -1,8 +1,15 @@
 use super::{
-    is_too_high, parse_indices, parse_selected, parse_text, stringify_text, Coordinates, Text,
+    is_too_high, is_too_wide, parse_indices, parse_selected, parse_text, stringify_text,
+    Coordinates, Text,
 };
-use crate::panes::terminal_character::{AnsiCode, RESET_STYLES};
-use zellij_utils::data::Style;
+use crate::{
+    panes::{
+        terminal_character::{AnsiCode, RESET_STYLES},
+        CharacterStyles,
+    },
+    ui::components::text::TextComponentSite,
+};
+use zellij_utils::data::{PaletteColor, Style};
 
 use unicode_width::UnicodeWidthChar;
 
@@ -43,6 +50,7 @@ pub fn nested_list(
             &coordinates,
             style,
             text_style,
+            TextComponentSite::NestedList,
         );
         text = pad_line(text, max_width, padding, text_width);
         let go_to_row_instruction = coordinates
@@ -77,6 +85,24 @@ pub fn nested_list(
     stringified.as_bytes().to_vec()
 }
 
+pub fn emphasis_variants_for_nested_list(style: &Style) -> [PaletteColor; 4] {
+    [
+        style.colors.list_unselected.emphasis_1,
+        style.colors.list_unselected.emphasis_2,
+        style.colors.list_unselected.emphasis_3,
+        style.colors.list_unselected.emphasis_4,
+    ]
+}
+
+pub fn emphasis_variants_for_selected_nested_list(style: &Style) -> [PaletteColor; 4] {
+    [
+        style.colors.list_selected.emphasis_1,
+        style.colors.list_selected.emphasis_2,
+        style.colors.list_selected.emphasis_3,
+        style.colors.list_selected.emphasis_4,
+    ]
+}
+
 pub fn parse_nested_list_items<'a>(
     params_iter: impl Iterator<Item = &'a mut String>,
 ) -> Vec<NestedListItem> {
diff --git a/zellij-server/src/ui/components/text.rs b/zellij-server/src/ui/components/text.rs
index bf04fbc1db..7a1730baeb 100644
--- a/zellij-server/src/ui/components/text.rs
+++ b/zellij-server/src/ui/components/text.rs
@@ -1,5 +1,6 @@
 use super::{
     emphasis_variants_for_ribbon, emphasis_variants_for_selected_ribbon, is_too_wide,
+    nested_list::{emphasis_variants_for_nested_list, emphasis_variants_for_selected_nested_list},
     parse_indices, parse_selected, Coordinates,
 };
 use crate::panes::terminal_character::{AnsiCode, CharacterStyles, RESET_STYLES};
@@ -21,8 +22,14 @@ pub fn text(content: Text, style: &Style, component_coordinates: Option<Coordina
             .background(Some(style.colors.text_selected.background.into()))
             .foreground(Some(style.colors.text_selected.base.into()));
     }
-    let (text, _text_width) =
-        stringify_text(&content, None, &component_coordinates, style, text_style);
+    let (text, _text_width) = stringify_text(
+        &content,
+        None,
+        &component_coordinates,
+        style,
+        text_style,
+        TextComponentSite::Text,
+    );
     match component_coordinates {
         Some(component_coordinates) => format!("{}{}{}", component_coordinates, text_style, text)
             .as_bytes()
@@ -37,6 +44,7 @@ pub fn stringify_text(
     coordinates: &Option<Coordinates>,
     style: &Style,
     text_style: CharacterStyles,
+    site: TextComponentSite,
 ) -> (String, usize) {
     let mut text_width = 0;
     let mut stringified = String::new();
@@ -52,7 +60,7 @@ pub fn stringify_text(
         text_width += character_width;
         if !text.indices.is_empty() {
             let character_with_styling =
-                color_index_character(character, i, &text, style, text_style);
+                color_index_character(character, i, &text, style, text_style, site);
             stringified.push_str(&character_with_styling);
         } else {
             stringified.push(character);
@@ -67,9 +75,10 @@ pub fn color_index_character(
     text: &Text,
     style: &Style,
     base_text_style: CharacterStyles,
+    site: TextComponentSite,
 ) -> String {
     let character_style = text
-        .style_of_index(index, style)
+        .style_of_index_for_component_site(index, style, site)
         .map(|foreground_style| base_text_style.foreground(Some(foreground_style.into())))
         .unwrap_or(base_text_style);
     format!("{}{}{}", character_style, character, base_text_style)
@@ -84,6 +93,15 @@ pub fn emphasis_variants(style: &Style) -> [PaletteColor; 4] {
     ]
 }
 
+pub fn emphasis_variants_selected(style: &Style) -> [PaletteColor; 4] {
+    [
+        style.colors.text_selected.emphasis_1,
+        style.colors.text_selected.emphasis_2,
+        style.colors.text_selected.emphasis_3,
+        style.colors.text_selected.emphasis_4,
+    ]
+}
+
 pub fn parse_text_params<'a>(params_iter: impl Iterator<Item = &'a mut String>) -> Vec<Text> {
     params_iter
         .flat_map(|mut stringified| {
@@ -106,6 +124,14 @@ pub struct Text {
     pub indices: Vec<Vec<usize>>,
 }
 
+#[derive(Debug, Clone)]
+pub enum TextComponentSite {
+    Text,
+    Ribbon,
+    NestedList,
+    Table,
+}
+
 impl Text {
     pub fn pad_text(&mut self, max_column_width: usize) {
         for _ in ansi_len(&self.text)..max_column_width {
@@ -125,8 +151,25 @@ impl Text {
         }
         None
     }
-    pub fn style_of_index_for_ribbon(&self, index: usize, style: &Style) -> Option<PaletteColor> {
-        let index_variant_styles = emphasis_variants_for_ribbon(style);
+
+    pub fn style_of_index_for_component_site(
+        &self,
+        index: usize,
+        style: &Style,
+        site: TextComponentSite,
+    ) -> Option<PaletteColor> {
+        let index_variant_styles = match (site, self.selected) {
+            (TextComponentSite::Text, true) => emphasis_variants(style),
+            (TextComponentSite::Text, false) => emphasis_variants_selected(style),
+            (TextComponentSite::Ribbon, true) => emphasis_variants_for_selected_ribbon(style),
+            (TextComponentSite::Ribbon, false) => emphasis_variants_for_ribbon(style),
+            (TextComponentSite::NestedList, true) => {
+                emphasis_variants_for_selected_nested_list(style)
+            },
+            (TextComponentSite::NestedList, false) => emphasis_variants_for_nested_list(style),
+            (TextComponentSite::Table, true) => emphasis_variants_for_selected_ribbon(style),
+            (TextComponentSite::Table, false) => emphasis_variants_for_ribbon(style),
+        };
         for i in (0..=3).rev() {
             // we do this in reverse to give precedence to the last applied
             // style
@@ -138,22 +181,16 @@ impl Text {
         }
         None
     }
+
+    pub fn style_of_index_for_ribbon(&self, index: usize, style: &Style) -> Option<PaletteColor> {
+        self.style_of_index_for_component_site(index, style, TextComponentSite::Ribbon)
+    }
     pub fn style_of_index_for_selected_ribbon(
         &self,
         index: usize,
         style: &Style,
     ) -> Option<PaletteColor> {
-        let index_variant_styles = emphasis_variants_for_selected_ribbon(style);
-        for i in (0..=3).rev() {
-            // we do this in reverse to give precedence to the last applied
-            // style
-            if let Some(indices) = self.indices.get(i) {
-                if indices.contains(&index) {
-                    return Some(index_variant_styles[i]);
-                }
-            }
-        }
-        None
+        self.style_of_index_for_component_site(index, style, TextComponentSite::Ribbon)
     }
 }
 

From 1990c91d68714d6f2b61e802b6ff1f9fd329ac3e Mon Sep 17 00:00:00 2001
From: Mark Grey <mgthesecond@spotify.com>
Date: Tue, 4 Jun 2024 14:11:09 -0400
Subject: [PATCH 30/40] emphasis styling for all components

---
 zellij-server/src/ui/components/mod.rs   |  1 -
 zellij-server/src/ui/components/table.rs | 44 ++++++++++++++++++++----
 zellij-server/src/ui/components/text.rs  | 35 ++++++++++++-------
 3 files changed, 60 insertions(+), 20 deletions(-)

diff --git a/zellij-server/src/ui/components/mod.rs b/zellij-server/src/ui/components/mod.rs
index 1cb3585d28..8d4c47f338 100644
--- a/zellij-server/src/ui/components/mod.rs
+++ b/zellij-server/src/ui/components/mod.rs
@@ -87,7 +87,6 @@ impl<'a> UiComponentParser<'a> {
                 columns,
                 rows,
                 stringified_params,
-                Some(self.style.colors.table_title.base),
                 &self.style,
                 component_coordinates,
             );
diff --git a/zellij-server/src/ui/components/table.rs b/zellij-server/src/ui/components/table.rs
index cf501124e5..9f0886e6cc 100644
--- a/zellij-server/src/ui/components/table.rs
+++ b/zellij-server/src/ui/components/table.rs
@@ -1,4 +1,4 @@
-use super::{is_too_high, is_too_wide, stringify_text, Coordinates, Text};
+use super::{is_too_high, is_too_wide, stringify_text, text::TextComponentSite, Coordinates, Text};
 use crate::panes::terminal_character::{AnsiCode, RESET_STYLES};
 use std::collections::BTreeMap;
 use zellij_utils::{
@@ -10,7 +10,6 @@ pub fn table(
     columns: usize,
     _rows: usize,
     contents: Vec<Text>,
-    title_color: Option<PaletteColor>,
     style: &Style,
     coordinates: Option<Coordinates>,
 ) -> Vec<u8> {
@@ -19,7 +18,8 @@ pub fn table(
     let stringified_columns = stringify_table_columns(contents, columns);
     let stringified_rows = stringify_table_rows(stringified_columns, &coordinates);
     let title_styles = RESET_STYLES
-        .foreground(title_color.map(|t| t.into()))
+        .background(Some(style.colors.table_title.background.into()))
+        .foreground(Some(style.colors.table_title.base.into()))
         .bold(Some(AnsiCode::On));
     let cell_styles = RESET_STYLES
         .bold(Some(AnsiCode::On))
@@ -39,12 +39,17 @@ pub fn table(
             };
             if cell.selected {
                 reset_styles_for_item.background = None;
-                text_style =
-                    text_style.background(Some(style.colors.table_cell_selected.background.into()));
+                text_style = text_style
+                    .background(Some(style.colors.table_cell_selected.background.into()))
+                    .foreground(Some(style.colors.table_cell_selected.base.into()));
             }
+            let site = match is_title_row {
+                True => TextComponentSite::TableTitle,
+                False => TextComponentSite::TableCell,
+            };
             // here we intentionally don't pass our coordinates even if we have them, because
             // these cells have already been padded and truncated
-            let (text, _text_width) = stringify_text(&cell, None, &None, style, text_style);
+            let (text, _text_width) = stringify_text(&cell, None, &None, style, text_style, site);
             stringified.push_str(&format!("{}{}{} ", text_style, text, reset_styles_for_item));
         }
         let next_row_instruction = coordinates
@@ -74,6 +79,33 @@ fn stringify_table_columns(contents: Vec<Text>, columns: usize) -> BTreeMap<usiz
     stringified_columns
 }
 
+pub fn emphasis_variants_for_table_cell(style: &Style) -> [PaletteColor; 4] {
+    [
+        style.colors.table_cell_unselected.emphasis_1,
+        style.colors.table_cell_unselected.emphasis_2,
+        style.colors.table_cell_unselected.emphasis_3,
+        style.colors.table_cell_unselected.emphasis_4,
+    ]
+}
+
+pub fn emphasis_variants_for_selected_table_cell(style: &Style) -> [PaletteColor; 4] {
+    [
+        style.colors.table_cell_selected.emphasis_1,
+        style.colors.table_cell_selected.emphasis_2,
+        style.colors.table_cell_selected.emphasis_3,
+        style.colors.table_cell_selected.emphasis_4,
+    ]
+}
+
+pub fn emphasis_variants_for_table_title(style: &Style) -> [PaletteColor; 4] {
+    [
+        style.colors.table_title.emphasis_1,
+        style.colors.table_title.emphasis_2,
+        style.colors.table_title.emphasis_3,
+        style.colors.table_title.emphasis_4,
+    ]
+}
+
 fn max_table_column_width(column: &Vec<Text>) -> usize {
     let mut max_column_width = 0;
     for cell in column {
diff --git a/zellij-server/src/ui/components/text.rs b/zellij-server/src/ui/components/text.rs
index 7a1730baeb..80aab01610 100644
--- a/zellij-server/src/ui/components/text.rs
+++ b/zellij-server/src/ui/components/text.rs
@@ -1,7 +1,12 @@
 use super::{
     emphasis_variants_for_ribbon, emphasis_variants_for_selected_ribbon, is_too_wide,
     nested_list::{emphasis_variants_for_nested_list, emphasis_variants_for_selected_nested_list},
-    parse_indices, parse_selected, Coordinates,
+    parse_indices, parse_selected,
+    table::{
+        emphasis_variants_for_selected_table_cell, emphasis_variants_for_table_cell,
+        emphasis_variants_for_table_title,
+    },
+    Coordinates,
 };
 use crate::panes::terminal_character::{AnsiCode, CharacterStyles, RESET_STYLES};
 use zellij_utils::{
@@ -84,7 +89,7 @@ pub fn color_index_character(
     format!("{}{}{}", character_style, character, base_text_style)
 }
 
-pub fn emphasis_variants(style: &Style) -> [PaletteColor; 4] {
+fn emphasis_variants(style: &Style) -> [PaletteColor; 4] {
     [
         style.colors.text_unselected.emphasis_1,
         style.colors.text_unselected.emphasis_2,
@@ -93,7 +98,7 @@ pub fn emphasis_variants(style: &Style) -> [PaletteColor; 4] {
     ]
 }
 
-pub fn emphasis_variants_selected(style: &Style) -> [PaletteColor; 4] {
+fn emphasis_variants_selected(style: &Style) -> [PaletteColor; 4] {
     [
         style.colors.text_selected.emphasis_1,
         style.colors.text_selected.emphasis_2,
@@ -124,12 +129,13 @@ pub struct Text {
     pub indices: Vec<Vec<usize>>,
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Copy)]
 pub enum TextComponentSite {
     Text,
     Ribbon,
     NestedList,
-    Table,
+    TableCell,
+    TableTitle,
 }
 
 impl Text {
@@ -159,16 +165,19 @@ impl Text {
         site: TextComponentSite,
     ) -> Option<PaletteColor> {
         let index_variant_styles = match (site, self.selected) {
-            (TextComponentSite::Text, true) => emphasis_variants(style),
-            (TextComponentSite::Text, false) => emphasis_variants_selected(style),
-            (TextComponentSite::Ribbon, true) => emphasis_variants_for_selected_ribbon(style),
-            (TextComponentSite::Ribbon, false) => emphasis_variants_for_ribbon(style),
-            (TextComponentSite::NestedList, true) => {
+            (TextComponentSite::Text, True) => emphasis_variants(style),
+            (TextComponentSite::Text, False) => emphasis_variants_selected(style),
+            (TextComponentSite::Ribbon, True) => emphasis_variants_for_selected_ribbon(style),
+            (TextComponentSite::Ribbon, False) => emphasis_variants_for_ribbon(style),
+            (TextComponentSite::NestedList, True) => {
                 emphasis_variants_for_selected_nested_list(style)
             },
-            (TextComponentSite::NestedList, false) => emphasis_variants_for_nested_list(style),
-            (TextComponentSite::Table, true) => emphasis_variants_for_selected_ribbon(style),
-            (TextComponentSite::Table, false) => emphasis_variants_for_ribbon(style),
+            (TextComponentSite::NestedList, False) => emphasis_variants_for_nested_list(style),
+            (TextComponentSite::TableCell, True) => {
+                emphasis_variants_for_selected_table_cell(style)
+            },
+            (TextComponentSite::TableCell, False) => emphasis_variants_for_table_cell(style),
+            (TextComponentSite::TableTitle, _) => emphasis_variants_for_table_title(style),
         };
         for i in (0..=3).rev() {
             // we do this in reverse to give precedence to the last applied

From db28a8e83d6ae3ef4fb96e07a84bbeec602b7f49 Mon Sep 17 00:00:00 2001
From: Mark Grey <mgthesecond@spotify.com>
Date: Tue, 4 Jun 2024 16:42:27 -0400
Subject: [PATCH 31/40] default logic for new kdl styles

---
 .../src/ui/components/nested_list.rs          |   8 +-
 zellij-utils/src/data.rs                      |   2 +-
 zellij-utils/src/input/config.rs              | 206 +++++++++---------
 zellij-utils/src/kdl/mod.rs                   | 109 ++++++---
 4 files changed, 184 insertions(+), 141 deletions(-)

diff --git a/zellij-server/src/ui/components/nested_list.rs b/zellij-server/src/ui/components/nested_list.rs
index b735902ad5..75dc3014e9 100644
--- a/zellij-server/src/ui/components/nested_list.rs
+++ b/zellij-server/src/ui/components/nested_list.rs
@@ -1,12 +1,8 @@
 use super::{
-    is_too_high, is_too_wide, parse_indices, parse_selected, parse_text, stringify_text,
-    Coordinates, Text,
+    is_too_high, parse_indices, parse_selected, parse_text, stringify_text, Coordinates, Text,
 };
 use crate::{
-    panes::{
-        terminal_character::{AnsiCode, RESET_STYLES},
-        CharacterStyles,
-    },
+    panes::terminal_character::{AnsiCode, RESET_STYLES},
     ui::components::text::TextComponentSite,
 };
 use zellij_utils::data::{PaletteColor, Style};
diff --git a/zellij-utils/src/data.rs b/zellij-utils/src/data.rs
index eddd6fba61..c626fd40c5 100644
--- a/zellij-utils/src/data.rs
+++ b/zellij-utils/src/data.rs
@@ -1178,7 +1178,7 @@ pub struct MultiplayerColors {
     pub player_10: PaletteColor,
 }
 
-const DEFAULT_STYLES: Styling = Styling {
+pub const DEFAULT_STYLES: Styling = Styling {
     text_unselected: StyleDeclaration {
         base: PaletteColor::EightBit(default_colors::BRIGHT_GRAY),
         emphasis_1: PaletteColor::EightBit(default_colors::ORANGE),
diff --git a/zellij-utils/src/input/config.rs b/zellij-utils/src/input/config.rs
index 83cc967e69..611f118a10 100644
--- a/zellij-utils/src/input/config.rs
+++ b/zellij-utils/src/input/config.rs
@@ -238,7 +238,7 @@ impl Config {
 #[cfg(test)]
 mod config_test {
     use super::*;
-    use crate::data::{InputMode, Palette, PaletteColor, PluginTag, Styling};
+    use crate::data::{InputMode, Palette, PaletteColor, PluginTag, StyleDeclaration, Styling};
     use crate::input::layout::{RunPlugin, RunPluginLocation};
     use crate::input::options::{Clipboard, OnForceClose};
     use crate::input::plugins::{PluginConfig, PluginType};
@@ -710,106 +710,110 @@ mod config_test {
             "named_theme".into(),
             Theme {
                 palette: Styling {
-                    text_unselected: [
-                        PaletteColor::Rgb((220, 215, 186)),
-                        PaletteColor::Rgb((220, 215, 205)),
-                        PaletteColor::Rgb((220, 216, 221)),
-                        PaletteColor::Rgb((220, 216, 153)),
-                        PaletteColor::Rgb((172, 215, 205)),
-                        PaletteColor::Rgb((31, 31, 40)),
-                    ],
-                    text_selected: [
-                        PaletteColor::Rgb((22, 22, 29)),
-                        PaletteColor::Rgb((22, 22, 29)),
-                        PaletteColor::Rgb((22, 22, 29)),
-                        PaletteColor::Rgb((22, 22, 29)),
-                        PaletteColor::Rgb((22, 22, 29)),
-                        PaletteColor::Rgb((156, 171, 202)),
-                    ],
-                    ribbon_unselected: [
-                        PaletteColor::Rgb((220, 215, 186)),
-                        PaletteColor::Rgb((127, 180, 202)),
-                        PaletteColor::Rgb((163, 212, 213)),
-                        PaletteColor::Rgb((122, 168, 159)),
-                        PaletteColor::Rgb((220, 216, 25)),
-                        PaletteColor::Rgb((37, 37, 53)),
-                    ],
-                    ribbon_selected: [
-                        PaletteColor::Rgb((22, 22, 29)),
-                        PaletteColor::Rgb((24, 24, 32)),
-                        PaletteColor::Rgb((26, 26, 34)),
-                        PaletteColor::Rgb((42, 42, 55)),
-                        PaletteColor::Rgb((54, 54, 70)),
-                        PaletteColor::Rgb((118, 148, 106)),
-                    ],
-                    table_title: [
-                        PaletteColor::Rgb((220, 215, 186)),
-                        PaletteColor::Rgb((127, 180, 202)),
-                        PaletteColor::Rgb((163, 212, 213)),
-                        PaletteColor::Rgb((122, 168, 159)),
-                        PaletteColor::Rgb((220, 216, 25)),
-                        PaletteColor::Rgb((37, 37, 53)),
-                    ],
-                    table_cell_unselected: [
-                        PaletteColor::Rgb((220, 215, 186)),
-                        PaletteColor::Rgb((220, 215, 205)),
-                        PaletteColor::Rgb((220, 216, 221)),
-                        PaletteColor::Rgb((220, 216, 153)),
-                        PaletteColor::Rgb((172, 215, 205)),
-                        PaletteColor::Rgb((31, 31, 40)),
-                    ],
-                    table_cell_selected: [
-                        PaletteColor::Rgb((22, 22, 29)),
-                        PaletteColor::Rgb((24, 24, 32)),
-                        PaletteColor::Rgb((26, 26, 34)),
-                        PaletteColor::Rgb((42, 42, 55)),
-                        PaletteColor::Rgb((54, 54, 70)),
-                        PaletteColor::Rgb((118, 148, 106)),
-                    ],
-                    list_unselected: [
-                        PaletteColor::Rgb((220, 215, 186)),
-                        PaletteColor::Rgb((220, 215, 205)),
-                        PaletteColor::Rgb((220, 216, 221)),
-                        PaletteColor::Rgb((220, 216, 153)),
-                        PaletteColor::Rgb((172, 215, 205)),
-                        PaletteColor::Rgb((31, 31, 40)),
-                    ],
-                    list_selected: [
-                        PaletteColor::Rgb((22, 22, 29)),
-                        PaletteColor::Rgb((24, 24, 32)),
-                        PaletteColor::Rgb((26, 26, 34)),
-                        PaletteColor::Rgb((42, 42, 55)),
-                        PaletteColor::Rgb((54, 54, 70)),
-                        PaletteColor::Rgb((118, 148, 106)),
-                    ],
-                    frame_unselected: [
-                        PaletteColor::Rgb((220, 216, 221)),
-                        PaletteColor::Rgb((127, 180, 202)),
-                        PaletteColor::Rgb((163, 212, 213)),
-                        PaletteColor::Rgb((122, 168, 159)),
-                        PaletteColor::Rgb((220, 216, 25)),
-                    ],
-                    frame_selected: [
-                        PaletteColor::Rgb((118, 148, 106)),
-                        PaletteColor::Rgb((195, 64, 67)),
-                        PaletteColor::Rgb((200, 192, 147)),
-                        PaletteColor::Rgb((172, 215, 205)),
-                        PaletteColor::Rgb((220, 216, 25)),
-                    ],
-                    exit_code_success: [
-                        PaletteColor::Rgb((118, 148, 106)),
-                        PaletteColor::Rgb((118, 148, 106)),
-                        PaletteColor::Rgb((118, 148, 106)),
-                        PaletteColor::Rgb((118, 148, 106)),
-                        PaletteColor::Rgb((118, 148, 106)),
-                    ],
-                    exit_code_error: [
-                        PaletteColor::Rgb((195, 64, 67)),
-                        PaletteColor::Rgb((195, 64, 67)),
-                        PaletteColor::Rgb((195, 64, 67)),
-                        PaletteColor::Rgb((195, 64, 67)),
-                        PaletteColor::Rgb((195, 64, 67)),
-                    ],
+                    text_unselected: StyleDeclaration {
+                        base: PaletteColor::Rgb((220, 215, 186)),
+                        emphasis_1: PaletteColor::Rgb((220, 215, 205)),
+                        emphasis_2: PaletteColor::Rgb((220, 216, 221)),
+                        emphasis_3: PaletteColor::Rgb((220, 216, 153)),
+                        emphasis_4: PaletteColor::Rgb((172, 215, 205)),
+                        background: PaletteColor::Rgb((31, 31, 40)),
+                    },
+                    text_selected: StyleDeclaration {
+                        base: PaletteColor::Rgb((22, 22, 29)),
+                        emphasis_1: PaletteColor::Rgb((22, 22, 29)),
+                        emphasis_2: PaletteColor::Rgb((22, 22, 29)),
+                        emphasis_3: PaletteColor::Rgb((22, 22, 29)),
+                        emphasis_4: PaletteColor::Rgb((22, 22, 29)),
+                        background: PaletteColor::Rgb((156, 171, 202)),
+                    },
+                    ribbon_unselected: StyleDeclaration {
+                        base: PaletteColor::Rgb((220, 215, 186)),
+                        emphasis_1: PaletteColor::Rgb((127, 180, 202)),
+                        emphasis_2: PaletteColor::Rgb((163, 212, 213)),
+                        emphasis_3: PaletteColor::Rgb((122, 168, 159)),
+                        emphasis_4: PaletteColor::Rgb((220, 216, 25)),
+                        background: PaletteColor::Rgb((37, 37, 53)),
+                    },
+                    ribbon_selected: StyleDeclaration {
+                        base: PaletteColor::Rgb((22, 22, 29)),
+                        emphasis_1: PaletteColor::Rgb((24, 24, 32)),
+                        emphasis_2: PaletteColor::Rgb((26, 26, 34)),
+                        emphasis_3: PaletteColor::Rgb((42, 42, 55)),
+                        emphasis_4: PaletteColor::Rgb((54, 54, 70)),
+                        background: PaletteColor::Rgb((118, 148, 106)),
+                    },
+                    table_title: StyleDeclaration {
+                        base: PaletteColor::Rgb((220, 215, 186)),
+                        emphasis_1: PaletteColor::Rgb((127, 180, 202)),
+                        emphasis_2: PaletteColor::Rgb((163, 212, 213)),
+                        emphasis_3: PaletteColor::Rgb((122, 168, 159)),
+                        emphasis_4: PaletteColor::Rgb((220, 216, 25)),
+                        background: PaletteColor::Rgb((37, 37, 53)),
+                    },
+                    table_cell_unselected: StyleDeclaration {
+                        base: PaletteColor::Rgb((220, 215, 186)),
+                        emphasis_1: PaletteColor::Rgb((220, 215, 205)),
+                        emphasis_2: PaletteColor::Rgb((220, 216, 221)),
+                        emphasis_3: PaletteColor::Rgb((220, 216, 153)),
+                        emphasis_4: PaletteColor::Rgb((172, 215, 205)),
+                        background: PaletteColor::Rgb((31, 31, 40)),
+                    },
+                    table_cell_selected: StyleDeclaration {
+                        base: PaletteColor::Rgb((22, 22, 29)),
+                        emphasis_1: PaletteColor::Rgb((24, 24, 32)),
+                        emphasis_2: PaletteColor::Rgb((26, 26, 34)),
+                        emphasis_3: PaletteColor::Rgb((42, 42, 55)),
+                        emphasis_4: PaletteColor::Rgb((54, 54, 70)),
+                        background: PaletteColor::Rgb((118, 148, 106)),
+                    },
+                    list_unselected: StyleDeclaration {
+                        base: PaletteColor::Rgb((220, 215, 186)),
+                        emphasis_1: PaletteColor::Rgb((220, 215, 205)),
+                        emphasis_2: PaletteColor::Rgb((220, 216, 221)),
+                        emphasis_3: PaletteColor::Rgb((220, 216, 153)),
+                        emphasis_4: PaletteColor::Rgb((172, 215, 205)),
+                        background: PaletteColor::Rgb((31, 31, 40)),
+                    },
+                    list_selected: StyleDeclaration {
+                        base: PaletteColor::Rgb((22, 22, 29)),
+                        emphasis_1: PaletteColor::Rgb((24, 24, 32)),
+                        emphasis_2: PaletteColor::Rgb((26, 26, 34)),
+                        emphasis_3: PaletteColor::Rgb((42, 42, 55)),
+                        emphasis_4: PaletteColor::Rgb((54, 54, 70)),
+                        background: PaletteColor::Rgb((118, 148, 106)),
+                    },
+                    frame_unselected: StyleDeclaration {
+                        base: PaletteColor::Rgb((220, 216, 221)),
+                        emphasis_1: PaletteColor::Rgb((127, 180, 202)),
+                        emphasis_2: PaletteColor::Rgb((163, 212, 213)),
+                        emphasis_3: PaletteColor::Rgb((122, 168, 159)),
+                        emphasis_4: PaletteColor::Rgb((220, 216, 25)),
+                        ..Default::default()
+                    },
+                    frame_selected: StyleDeclaration {
+                        base: PaletteColor::Rgb((118, 148, 106)),
+                        emphasis_1: PaletteColor::Rgb((195, 64, 67)),
+                        emphasis_2: PaletteColor::Rgb((200, 192, 147)),
+                        emphasis_3: PaletteColor::Rgb((172, 215, 205)),
+                        emphasis_4: PaletteColor::Rgb((220, 216, 25)),
+                        ..Default::default()
+                    },
+                    exit_code_success: StyleDeclaration {
+                        base: PaletteColor::Rgb((118, 148, 106)),
+                        emphasis_1: PaletteColor::Rgb((118, 148, 106)),
+                        emphasis_2: PaletteColor::Rgb((118, 148, 106)),
+                        emphasis_3: PaletteColor::Rgb((118, 148, 106)),
+                        emphasis_4: PaletteColor::Rgb((118, 148, 106)),
+                        ..Default::default()
+                    },
+                    exit_code_error: StyleDeclaration {
+                        base: PaletteColor::Rgb((195, 64, 67)),
+                        emphasis_1: PaletteColor::Rgb((195, 64, 67)),
+                        emphasis_2: PaletteColor::Rgb((195, 64, 67)),
+                        emphasis_3: PaletteColor::Rgb((195, 64, 67)),
+                        emphasis_4: PaletteColor::Rgb((195, 64, 67)),
+                        ..Default::default()
+                    },
                     ..Default::default()
                 },
             },
diff --git a/zellij-utils/src/kdl/mod.rs b/zellij-utils/src/kdl/mod.rs
index bec51f2426..e8fd9cb82b 100644
--- a/zellij-utils/src/kdl/mod.rs
+++ b/zellij-utils/src/kdl/mod.rs
@@ -2,7 +2,7 @@ mod kdl_layout_parser;
 use crate::data::{
     Direction, FloatingPaneCoordinates, InputMode, KeyWithModifier, LayoutInfo, MultiplayerColors,
     Palette, PaletteColor, PaneInfo, PaneManifest, PermissionType, Resize, SessionInfo,
-    StyleDeclaration, Styling, TabInfo,
+    StyleDeclaration, Styling, TabInfo, DEFAULT_STYLES,
 };
 use crate::envs::EnvironmentVariables;
 use crate::home::{find_default_config_dir, get_layout_dir};
@@ -1994,41 +1994,62 @@ impl Themes {
     fn style_declaration_from_node(
         style_node: &KdlNode,
         style_descriptor: &str,
+        default: StyleDeclaration,
     ) -> Result<StyleDeclaration, ConfigError> {
         let descriptor_node = kdl_child_with_name!(style_node, style_descriptor);
 
-        let colors = kdl_children_or_error!(
-            kdl_child_with_name_or_error!(style_node, style_descriptor)?,
-            format!("Missing colors for {}", style_descriptor)
-        );
-        Ok(StyleDeclaration {
-            base: PaletteColor::try_from(("base", colors))?,
-            background: PaletteColor::try_from(("background", colors)).unwrap_or_default(),
-            emphasis_1: PaletteColor::try_from(("emphasis_1", colors))?,
-            emphasis_2: PaletteColor::try_from(("emphasis_2", colors))?,
-            emphasis_3: PaletteColor::try_from(("emphasis_3", colors))?,
-            emphasis_4: PaletteColor::try_from(("emphasis_4", colors))?,
-        })
+        match descriptor_node {
+            Some(descriptor) => {
+                let colors = kdl_children_or_error!(
+                    descriptor,
+                    format!("Missing colors for {}", style_descriptor)
+                );
+                Ok(StyleDeclaration {
+                    base: PaletteColor::try_from(("base", colors))?,
+                    background: PaletteColor::try_from(("background", colors)).unwrap_or_default(),
+                    emphasis_1: PaletteColor::try_from(("emphasis_1", colors))?,
+                    emphasis_2: PaletteColor::try_from(("emphasis_2", colors))?,
+                    emphasis_3: PaletteColor::try_from(("emphasis_3", colors))?,
+                    emphasis_4: PaletteColor::try_from(("emphasis_4", colors))?,
+                })
+            },
+            None => Ok(default),
+        }
     }
 
     fn multiplayer_colors(style_node: &KdlNode) -> Result<MultiplayerColors, ConfigError> {
-        // TODO: make optional
-        let colors = kdl_children_or_error!(
-            kdl_child_with_name_or_error!(style_node, "multiplayer_user_colors")?,
-            format!("Missing colors for {}", "multiplayer_user_colors")
-        );
-        Ok(MultiplayerColors {
-            player_1: PaletteColor::try_from(("player_1", colors))?,
-            player_2: PaletteColor::try_from(("player_2", colors))?,
-            player_3: PaletteColor::try_from(("player_3", colors))?,
-            player_4: PaletteColor::try_from(("player_4", colors))?,
-            player_5: PaletteColor::try_from(("player_5", colors))?,
-            player_6: PaletteColor::try_from(("player_6", colors))?,
-            player_7: PaletteColor::try_from(("player_7", colors))?,
-            player_8: PaletteColor::try_from(("player_8", colors))?,
-            player_9: PaletteColor::try_from(("player_9", colors))?,
-            player_10: PaletteColor::try_from(("player_10", colors))?,
-        })
+        let descriptor_node = kdl_child_with_name!(style_node, "multiplayer_user_colors");
+        match descriptor_node {
+            Some(descriptor) => {
+                let colors = kdl_children_or_error!(
+                    descriptor,
+                    format!("Missing colors for {}", "multiplayer_user_colors")
+                );
+                Ok(MultiplayerColors {
+                    player_1: PaletteColor::try_from(("player_1", colors))
+                        .unwrap_or(DEFAULT_STYLES.multiplayer_user_colors.player_1),
+                    player_2: PaletteColor::try_from(("player_2", colors))
+                        .unwrap_or(DEFAULT_STYLES.multiplayer_user_colors.player_2),
+                    player_3: PaletteColor::try_from(("player_3", colors))
+                        .unwrap_or(DEFAULT_STYLES.multiplayer_user_colors.player_3),
+                    player_4: PaletteColor::try_from(("player_4", colors))
+                        .unwrap_or(DEFAULT_STYLES.multiplayer_user_colors.player_4),
+                    player_5: PaletteColor::try_from(("player_5", colors))
+                        .unwrap_or(DEFAULT_STYLES.multiplayer_user_colors.player_5),
+                    player_6: PaletteColor::try_from(("player_6", colors))
+                        .unwrap_or(DEFAULT_STYLES.multiplayer_user_colors.player_6),
+                    player_7: PaletteColor::try_from(("player_7", colors))
+                        .unwrap_or(DEFAULT_STYLES.multiplayer_user_colors.player_7),
+                    player_8: PaletteColor::try_from(("player_8", colors))
+                        .unwrap_or(DEFAULT_STYLES.multiplayer_user_colors.player_8),
+                    player_9: PaletteColor::try_from(("player_9", colors))
+                        .unwrap_or(DEFAULT_STYLES.multiplayer_user_colors.player_9),
+                    player_10: PaletteColor::try_from(("player_10", colors))
+                        .unwrap_or(DEFAULT_STYLES.multiplayer_user_colors.player_10),
+                })
+            },
+            None => Ok(DEFAULT_STYLES.multiplayer_user_colors),
+        }
     }
 
     pub fn from_kdl(themes_from_kdl: &KdlNode) -> Result<Self, ConfigError> {
@@ -2044,45 +2065,67 @@ impl Themes {
                         text_unselected: Themes::style_declaration_from_node(
                             style,
                             "text_unselected",
+                            DEFAULT_STYLES.text_unselected,
+                        )?,
+                        text_selected: Themes::style_declaration_from_node(
+                            style,
+                            "text_selected",
+                            DEFAULT_STYLES.text_selected,
                         )?,
-                        text_selected: Themes::style_declaration_from_node(style, "text_selected")?,
                         ribbon_unselected: Themes::style_declaration_from_node(
                             style,
                             "ribbon_unselected",
+                            DEFAULT_STYLES.ribbon_unselected,
                         )?,
                         ribbon_selected: Themes::style_declaration_from_node(
                             style,
                             "ribbon_selected",
+                            DEFAULT_STYLES.ribbon_selected,
+                        )?,
+                        table_title: Themes::style_declaration_from_node(
+                            style,
+                            "table_title",
+                            DEFAULT_STYLES.table_title,
                         )?,
-                        table_title: Themes::style_declaration_from_node(style, "table_title")?,
                         table_cell_unselected: Themes::style_declaration_from_node(
                             style,
                             "table_cell_unselected",
+                            DEFAULT_STYLES.table_cell_unselected,
                         )?,
                         table_cell_selected: Themes::style_declaration_from_node(
                             style,
                             "table_cell_selected",
+                            DEFAULT_STYLES.table_cell_selected,
                         )?,
                         list_unselected: Themes::style_declaration_from_node(
                             style,
                             "list_unselected",
+                            DEFAULT_STYLES.list_unselected,
+                        )?,
+                        list_selected: Themes::style_declaration_from_node(
+                            style,
+                            "list_selected",
+                            DEFAULT_STYLES.list_selected,
                         )?,
-                        list_selected: Themes::style_declaration_from_node(style, "list_selected")?,
                         frame_unselected: Themes::style_declaration_from_node(
                             style,
                             "frame_unselected",
+                            DEFAULT_STYLES.frame_unselected,
                         )?,
                         frame_selected: Themes::style_declaration_from_node(
                             style,
                             "frame_selected",
+                            DEFAULT_STYLES.frame_selected,
                         )?,
                         exit_code_success: Themes::style_declaration_from_node(
                             style,
                             "exit_code_success",
+                            DEFAULT_STYLES.exit_code_success,
                         )?,
                         exit_code_error: Themes::style_declaration_from_node(
                             style,
                             "exit_code_error",
+                            DEFAULT_STYLES.exit_code_error,
                         )?,
                         multiplayer_user_colors: Themes::multiplayer_colors(style)
                             .unwrap_or_default(),

From 5ab6f833b94f26ec88920fb036b6372f9efb1661 Mon Sep 17 00:00:00 2001
From: Mark Grey <mgthesecond@spotify.com>
Date: Wed, 5 Jun 2024 16:40:52 -0400
Subject: [PATCH 32/40] pass style declaration explicity in UI components

---
 zellij-server/src/panes/terminal_character.rs |  21 ++-
 zellij-server/src/ui/components/mod.rs        |   2 +-
 .../src/ui/components/nested_list.rs          |  63 +++-----
 zellij-server/src/ui/components/ribbon.rs     |  93 +++---------
 zellij-server/src/ui/components/table.rs      |  77 +++-------
 zellij-server/src/ui/components/text.rs       | 136 ++++--------------
 6 files changed, 100 insertions(+), 292 deletions(-)

diff --git a/zellij-server/src/panes/terminal_character.rs b/zellij-server/src/panes/terminal_character.rs
index df9e5e521b..444ab550c1 100644
--- a/zellij-server/src/panes/terminal_character.rs
+++ b/zellij-server/src/panes/terminal_character.rs
@@ -5,6 +5,7 @@ use std::rc::Rc;
 use unicode_width::UnicodeWidthChar;
 
 use unicode_width::UnicodeWidthStr;
+use zellij_utils::data::StyleDeclaration;
 use zellij_utils::input::command::RunCommand;
 use zellij_utils::{
     data::{PaletteColor, Style},
@@ -762,6 +763,14 @@ impl Display for CharacterStyles {
     }
 }
 
+impl From<StyleDeclaration> for CharacterStyles {
+    fn from(declaration: StyleDeclaration) -> Self {
+        RESET_STYLES
+            .foreground(Some(declaration.base.into()))
+            .background(Some(declaration.background.into()))
+    }
+}
+
 #[derive(Clone, Copy, Debug, PartialEq)]
 pub enum LinkAnchor {
     Start(u16),
@@ -977,7 +986,9 @@ pub fn render_first_run_banner(
         Some(run_command) => {
             let bold_text = RESET_STYLES.bold(Some(AnsiCode::On));
             let command_color_text = RESET_STYLES
-                .foreground(Some(AnsiCode::from(style.colors.text_unselected.emphasis_3)))
+                .foreground(Some(AnsiCode::from(
+                    style.colors.text_unselected.emphasis_3,
+                )))
                 .bold(Some(AnsiCode::On));
             let waiting_to_run_text = "Waiting to run: ";
             let command_text = run_command.to_string();
@@ -1002,7 +1013,9 @@ pub fn render_first_run_banner(
             let ctrl_c_bare_text = "Ctrl-c";
             let controls_bare_text_fourth_part = "> exit";
             let controls_color = RESET_STYLES
-                .foreground(Some(AnsiCode::from(style.colors.text_unselected.emphasis_1)))
+                .foreground(Some(AnsiCode::from(
+                    style.colors.text_unselected.emphasis_1,
+                )))
                 .bold(Some(AnsiCode::On));
             let controls_line_length = controls_bare_text_first_part.len()
                 + enter_bare_text.len()
@@ -1054,7 +1067,9 @@ pub fn render_first_run_banner(
             let ctrl_c_bare_text = "Ctrl-c";
             let controls_bare_text_fourth_part = "> exit";
             let controls_color = RESET_STYLES
-                .foreground(Some(AnsiCode::from(style.colors.text_unselected.emphasis_1)))
+                .foreground(Some(AnsiCode::from(
+                    style.colors.text_unselected.emphasis_1,
+                )))
                 .bold(Some(AnsiCode::On));
             let controls_line_length = controls_bare_text_first_part.len()
                 + enter_bare_text.len()
diff --git a/zellij-server/src/ui/components/mod.rs b/zellij-server/src/ui/components/mod.rs
index 8d4c47f338..43d628e3fd 100644
--- a/zellij-server/src/ui/components/mod.rs
+++ b/zellij-server/src/ui/components/mod.rs
@@ -10,7 +10,7 @@ use zellij_utils::{data::Style, lazy_static::lazy_static, regex::Regex, vte};
 
 use component_coordinates::{is_too_high, is_too_wide, Coordinates};
 use nested_list::{nested_list, parse_nested_list_items};
-use ribbon::{emphasis_variants_for_ribbon, emphasis_variants_for_selected_ribbon, ribbon};
+use ribbon::ribbon;
 use table::table;
 use text::{parse_text, parse_text_params, stringify_text, text, Text};
 
diff --git a/zellij-server/src/ui/components/nested_list.rs b/zellij-server/src/ui/components/nested_list.rs
index 75dc3014e9..d8b69f9510 100644
--- a/zellij-server/src/ui/components/nested_list.rs
+++ b/zellij-server/src/ui/components/nested_list.rs
@@ -1,10 +1,7 @@
 use super::{
     is_too_high, parse_indices, parse_selected, parse_text, stringify_text, Coordinates, Text,
 };
-use crate::{
-    panes::terminal_character::{AnsiCode, RESET_STYLES},
-    ui::components::text::TextComponentSite,
-};
+use crate::panes::terminal_character::{AnsiCode, CharacterStyles, RESET_STYLES};
 use zellij_utils::data::{PaletteColor, Style};
 
 use unicode_width::UnicodeWidthChar;
@@ -29,9 +26,10 @@ pub fn nested_list(
         if is_too_high(line_index + 1, &coordinates) {
             break;
         }
-        let mut reset_styles_for_item = RESET_STYLES;
-        if line_item.text.selected {
-            reset_styles_for_item.background = None;
+        let style_declaration = if line_item.text.selected {
+            style.colors.list_selected
+        } else {
+            style.colors.list_unselected
         };
         let padding = line_item.indentation_level * 2 + 1;
         let bulletin = if line_item.indentation_level % 2 == 0 {
@@ -39,14 +37,13 @@ pub fn nested_list(
         } else {
             "- "
         };
-        let text_style = reset_styles_for_item.bold(Some(AnsiCode::On));
+        let text_style = CharacterStyles::from(style_declaration);
         let (mut text, text_width) = stringify_text(
             &line_item.text,
             Some(padding + bulletin.len()),
             &coordinates,
-            style,
-            text_style,
-            TextComponentSite::NestedList,
+            &style_declaration,
+            text_style.bold(Some(AnsiCode::On)),
         );
         text = pad_line(text, max_width, padding, text_width);
         let go_to_row_instruction = coordinates
@@ -59,46 +56,18 @@ pub fn nested_list(
                     "".to_owned()
                 }
             });
-        if line_item.text.selected {
-            let selected_background =
-                RESET_STYLES.background(Some(style.colors.list_selected.background.into()));
-            stringified.push_str(&format!(
-                "{}{}{}{:padding$}{bulletin}{}{text}{}",
-                go_to_row_instruction,
-                selected_background,
-                reset_styles_for_item,
-                " ",
-                text_style,
-                RESET_STYLES
-            ));
-        } else {
-            stringified.push_str(&format!(
-                "{}{}{:padding$}{bulletin}{}{text}{}",
-                go_to_row_instruction, reset_styles_for_item, " ", text_style, RESET_STYLES
-            ));
-        }
+        stringified.push_str(&format!(
+            "{}{}{:padding$}{bulletin}{}{text}{}",
+            go_to_row_instruction,
+            text_style,
+            " ",
+            text_style.bold(Some(AnsiCode::On)),
+            RESET_STYLES
+        ));
     }
     stringified.as_bytes().to_vec()
 }
 
-pub fn emphasis_variants_for_nested_list(style: &Style) -> [PaletteColor; 4] {
-    [
-        style.colors.list_unselected.emphasis_1,
-        style.colors.list_unselected.emphasis_2,
-        style.colors.list_unselected.emphasis_3,
-        style.colors.list_unselected.emphasis_4,
-    ]
-}
-
-pub fn emphasis_variants_for_selected_nested_list(style: &Style) -> [PaletteColor; 4] {
-    [
-        style.colors.list_selected.emphasis_1,
-        style.colors.list_selected.emphasis_2,
-        style.colors.list_selected.emphasis_3,
-        style.colors.list_selected.emphasis_4,
-    ]
-}
-
 pub fn parse_nested_list_items<'a>(
     params_iter: impl Iterator<Item = &'a mut String>,
 ) -> Vec<NestedListItem> {
diff --git a/zellij-server/src/ui/components/ribbon.rs b/zellij-server/src/ui/components/ribbon.rs
index f9cc7e288a..b1b9901ce8 100644
--- a/zellij-server/src/ui/components/ribbon.rs
+++ b/zellij-server/src/ui/components/ribbon.rs
@@ -1,6 +1,5 @@
-use super::{is_too_wide, Coordinates, Text};
+use super::{text::stringify_text, Coordinates, Text};
 use crate::panes::terminal_character::{AnsiCode, CharacterStyles, RESET_STYLES};
-use unicode_width::UnicodeWidthChar;
 use zellij_utils::data::{PaletteColor, Style};
 
 static ARROW_SEPARATOR: &str = "";
@@ -13,21 +12,23 @@ pub fn ribbon(
 ) -> Vec<u8> {
     let colors = style.colors;
     let background = colors.text_unselected.background;
-    let (first_arrow_styles, text_style, last_arrow_styles) = if content.selected {
-        (
-            character_style(background, colors.ribbon_selected.background),
-            character_style(colors.ribbon_selected.base, colors.ribbon_selected.background),
-            character_style(colors.ribbon_selected.background, background),
-        )
+    let declaration = if content.selected {
+        colors.ribbon_selected
     } else {
-        (
-            character_style(background, colors.ribbon_unselected.background),
-            character_style(colors.ribbon_unselected.base, colors.ribbon_unselected.background),
-            character_style(colors.ribbon_unselected.background, background),
-        )
+        colors.ribbon_unselected
     };
-    let (text, _text_width) =
-        stringify_ribbon_text(&content, &component_coordinates, style, text_style);
+    let (first_arrow_styles, text_style, last_arrow_styles) = (
+        character_style(background, declaration.background),
+        character_style(declaration.base, declaration.background),
+        character_style(declaration.background, background),
+    );
+    let (text, _text_width) = stringify_text(
+        &content,
+        None,
+        &component_coordinates,
+        &declaration,
+        text_style,
+    );
     let mut stringified = component_coordinates
         .map(|c| c.to_string())
         .unwrap_or_else(|| String::new());
@@ -46,68 +47,6 @@ pub fn ribbon(
     stringified.as_bytes().to_vec()
 }
 
-pub fn emphasis_variants_for_ribbon(style: &Style) -> [PaletteColor; 4] {
-    [
-        style.colors.ribbon_unselected.emphasis_1,
-        style.colors.ribbon_unselected.emphasis_2,
-        style.colors.ribbon_unselected.emphasis_3,
-        style.colors.ribbon_unselected.emphasis_4,
-    ]
-}
-
-pub fn emphasis_variants_for_selected_ribbon(style: &Style) -> [PaletteColor; 4] {
-    [
-        style.colors.ribbon_selected.emphasis_1,
-        style.colors.ribbon_selected.emphasis_2,
-        style.colors.ribbon_selected.emphasis_3,
-        style.colors.ribbon_selected.emphasis_4,
-    ]
-}
-
-fn stringify_ribbon_text(
-    text: &Text,
-    coordinates: &Option<Coordinates>,
-    style: &Style,
-    text_style: CharacterStyles,
-) -> (String, usize) {
-    let mut stringified = String::new();
-    let mut text_width = 0;
-    for (i, character) in text.text.chars().enumerate() {
-        let character_width = character.width().unwrap_or(0);
-        if is_too_wide(character_width, text_width, &coordinates) {
-            break;
-        }
-        if !text.indices.is_empty() {
-            let character_with_styling =
-                color_ribbon_index_character(character, i, &text, style, text_style);
-            stringified.push_str(&character_with_styling);
-        } else {
-            stringified.push(character);
-        }
-        text_width += character_width;
-    }
-    (stringified, text_width)
-}
-
-fn color_ribbon_index_character(
-    character: char,
-    index: usize,
-    text: &Text,
-    style: &Style,
-    base_style: CharacterStyles,
-) -> String {
-    let character_style = if text.selected {
-        text.style_of_index_for_selected_ribbon(index, style)
-            .map(|foreground_style| base_style.foreground(Some(foreground_style.into())))
-            .unwrap_or(base_style)
-    } else {
-        text.style_of_index_for_ribbon(index, style)
-            .map(|foreground_style| base_style.foreground(Some(foreground_style.into())))
-            .unwrap_or(base_style)
-    };
-    format!("{}{}{}", character_style, character, base_style)
-}
-
 fn character_style(foreground: PaletteColor, background: PaletteColor) -> CharacterStyles {
     RESET_STYLES
         .foreground(Some(foreground.into()))
diff --git a/zellij-server/src/ui/components/table.rs b/zellij-server/src/ui/components/table.rs
index 9f0886e6cc..c8a3c1a4e1 100644
--- a/zellij-server/src/ui/components/table.rs
+++ b/zellij-server/src/ui/components/table.rs
@@ -1,10 +1,10 @@
-use super::{is_too_high, is_too_wide, stringify_text, text::TextComponentSite, Coordinates, Text};
-use crate::panes::terminal_character::{AnsiCode, RESET_STYLES};
-use std::collections::BTreeMap;
-use zellij_utils::{
-    data::{PaletteColor, Style},
-    shared::ansi_len,
+use super::{is_too_high, is_too_wide, stringify_text, Coordinates, Text};
+use crate::panes::{
+    terminal_character::{AnsiCode, RESET_STYLES},
+    CharacterStyles,
 };
+use std::collections::BTreeMap;
+use zellij_utils::{data::Style, shared::ansi_len};
 
 pub fn table(
     columns: usize,
@@ -17,40 +17,30 @@ pub fn table(
     // we first arrange the data by columns so that we can pad them by the widest one
     let stringified_columns = stringify_table_columns(contents, columns);
     let stringified_rows = stringify_table_rows(stringified_columns, &coordinates);
-    let title_styles = RESET_STYLES
-        .background(Some(style.colors.table_title.background.into()))
-        .foreground(Some(style.colors.table_title.base.into()))
-        .bold(Some(AnsiCode::On));
-    let cell_styles = RESET_STYLES
-        .bold(Some(AnsiCode::On))
-        .background(Some(style.colors.table_cell_unselected.background.into()))
-        .foreground(Some(style.colors.table_cell_unselected.base.into()));
     for (row_index, (_, row)) in stringified_rows.into_iter().enumerate() {
         let is_title_row = row_index == 0;
         if is_too_high(row_index + 1, &coordinates) {
             break;
         }
         for cell in row {
-            let mut reset_styles_for_item = RESET_STYLES;
-            let mut text_style = if is_title_row {
-                title_styles
+            let reset_styles_for_item = RESET_STYLES;
+            let declaration = if is_title_row {
+                style.colors.table_title
             } else {
-                cell_styles
-            };
-            if cell.selected {
-                reset_styles_for_item.background = None;
-                text_style = text_style
-                    .background(Some(style.colors.table_cell_selected.background.into()))
-                    .foreground(Some(style.colors.table_cell_selected.base.into()));
-            }
-            let site = match is_title_row {
-                True => TextComponentSite::TableTitle,
-                False => TextComponentSite::TableCell,
+                if cell.selected {
+                    style.colors.table_cell_selected
+                } else {
+                    style.colors.table_cell_unselected
+                }
             };
             // here we intentionally don't pass our coordinates even if we have them, because
             // these cells have already been padded and truncated
-            let (text, _text_width) = stringify_text(&cell, None, &None, style, text_style, site);
-            stringified.push_str(&format!("{}{}{} ", text_style, text, reset_styles_for_item));
+            let text_styles = CharacterStyles::from(declaration).bold(Some(AnsiCode::On));
+            let (text, _text_width) = stringify_text(&cell, None, &None, &declaration, text_styles);
+            stringified.push_str(&format!(
+                "{}{}{} ",
+                text_styles, text, reset_styles_for_item
+            ));
         }
         let next_row_instruction = coordinates
             .as_ref()
@@ -79,33 +69,6 @@ fn stringify_table_columns(contents: Vec<Text>, columns: usize) -> BTreeMap<usiz
     stringified_columns
 }
 
-pub fn emphasis_variants_for_table_cell(style: &Style) -> [PaletteColor; 4] {
-    [
-        style.colors.table_cell_unselected.emphasis_1,
-        style.colors.table_cell_unselected.emphasis_2,
-        style.colors.table_cell_unselected.emphasis_3,
-        style.colors.table_cell_unselected.emphasis_4,
-    ]
-}
-
-pub fn emphasis_variants_for_selected_table_cell(style: &Style) -> [PaletteColor; 4] {
-    [
-        style.colors.table_cell_selected.emphasis_1,
-        style.colors.table_cell_selected.emphasis_2,
-        style.colors.table_cell_selected.emphasis_3,
-        style.colors.table_cell_selected.emphasis_4,
-    ]
-}
-
-pub fn emphasis_variants_for_table_title(style: &Style) -> [PaletteColor; 4] {
-    [
-        style.colors.table_title.emphasis_1,
-        style.colors.table_title.emphasis_2,
-        style.colors.table_title.emphasis_3,
-        style.colors.table_title.emphasis_4,
-    ]
-}
-
 fn max_table_column_width(column: &Vec<Text>) -> usize {
     let mut max_column_width = 0;
     for cell in column {
diff --git a/zellij-server/src/ui/components/text.rs b/zellij-server/src/ui/components/text.rs
index 80aab01610..df82482f86 100644
--- a/zellij-server/src/ui/components/text.rs
+++ b/zellij-server/src/ui/components/text.rs
@@ -1,16 +1,7 @@
-use super::{
-    emphasis_variants_for_ribbon, emphasis_variants_for_selected_ribbon, is_too_wide,
-    nested_list::{emphasis_variants_for_nested_list, emphasis_variants_for_selected_nested_list},
-    parse_indices, parse_selected,
-    table::{
-        emphasis_variants_for_selected_table_cell, emphasis_variants_for_table_cell,
-        emphasis_variants_for_table_title,
-    },
-    Coordinates,
-};
-use crate::panes::terminal_character::{AnsiCode, CharacterStyles, RESET_STYLES};
+use super::{is_too_wide, parse_indices, parse_selected, Coordinates};
+use crate::panes::terminal_character::CharacterStyles;
 use zellij_utils::{
-    data::{PaletteColor, Style},
+    data::{PaletteColor, Style, StyleDeclaration},
     shared::ansi_len,
 };
 
@@ -18,28 +9,26 @@ use unicode_width::UnicodeWidthChar;
 use zellij_utils::errors::prelude::*;
 
 pub fn text(content: Text, style: &Style, component_coordinates: Option<Coordinates>) -> Vec<u8> {
-    let mut text_style = RESET_STYLES
-        .bold(Some(AnsiCode::On))
-        .background(Some(style.colors.text_unselected.background.into()))
-        .foreground(Some(style.colors.text_unselected.base.into()));
-    if content.selected {
-        text_style = text_style
-            .background(Some(style.colors.text_selected.background.into()))
-            .foreground(Some(style.colors.text_selected.base.into()));
-    }
+    let declaration = if content.selected {
+        style.colors.text_selected
+    } else {
+        style.colors.text_unselected
+    };
+    let base_text_style = CharacterStyles::from(declaration);
     let (text, _text_width) = stringify_text(
         &content,
         None,
         &component_coordinates,
-        style,
-        text_style,
-        TextComponentSite::Text,
+        &declaration,
+        base_text_style,
     );
     match component_coordinates {
-        Some(component_coordinates) => format!("{}{}{}", component_coordinates, text_style, text)
-            .as_bytes()
-            .to_vec(),
-        None => format!("{}{}", text_style, text).as_bytes().to_vec(),
+        Some(component_coordinates) => {
+            format!("{}{}{}", component_coordinates, base_text_style, text)
+                .as_bytes()
+                .to_vec()
+        },
+        None => format!("{}{}", base_text_style, text).as_bytes().to_vec(),
     }
 }
 
@@ -47,9 +36,8 @@ pub fn stringify_text(
     text: &Text,
     left_padding: Option<usize>,
     coordinates: &Option<Coordinates>,
-    style: &Style,
-    text_style: CharacterStyles,
-    site: TextComponentSite,
+    style: &StyleDeclaration,
+    base_text_style: CharacterStyles,
 ) -> (String, usize) {
     let mut text_width = 0;
     let mut stringified = String::new();
@@ -65,7 +53,7 @@ pub fn stringify_text(
         text_width += character_width;
         if !text.indices.is_empty() {
             let character_with_styling =
-                color_index_character(character, i, &text, style, text_style, site);
+                color_index_character(character, i, &text, style, base_text_style);
             stringified.push_str(&character_with_styling);
         } else {
             stringified.push(character);
@@ -78,35 +66,16 @@ pub fn color_index_character(
     character: char,
     index: usize,
     text: &Text,
-    style: &Style,
+    declaration: &StyleDeclaration,
     base_text_style: CharacterStyles,
-    site: TextComponentSite,
 ) -> String {
     let character_style = text
-        .style_of_index_for_component_site(index, style, site)
+        .style_of_index(index, declaration)
         .map(|foreground_style| base_text_style.foreground(Some(foreground_style.into())))
         .unwrap_or(base_text_style);
     format!("{}{}{}", character_style, character, base_text_style)
 }
 
-fn emphasis_variants(style: &Style) -> [PaletteColor; 4] {
-    [
-        style.colors.text_unselected.emphasis_1,
-        style.colors.text_unselected.emphasis_2,
-        style.colors.text_unselected.emphasis_3,
-        style.colors.text_unselected.emphasis_4,
-    ]
-}
-
-fn emphasis_variants_selected(style: &Style) -> [PaletteColor; 4] {
-    [
-        style.colors.text_selected.emphasis_1,
-        style.colors.text_selected.emphasis_2,
-        style.colors.text_selected.emphasis_3,
-        style.colors.text_selected.emphasis_4,
-    ]
-}
-
 pub fn parse_text_params<'a>(params_iter: impl Iterator<Item = &'a mut String>) -> Vec<Text> {
     params_iter
         .flat_map(|mut stringified| {
@@ -129,56 +98,20 @@ pub struct Text {
     pub indices: Vec<Vec<usize>>,
 }
 
-#[derive(Debug, Clone, Copy)]
-pub enum TextComponentSite {
-    Text,
-    Ribbon,
-    NestedList,
-    TableCell,
-    TableTitle,
-}
-
 impl Text {
     pub fn pad_text(&mut self, max_column_width: usize) {
         for _ in ansi_len(&self.text)..max_column_width {
             self.text.push(' ');
         }
     }
-    pub fn style_of_index(&self, index: usize, style: &Style) -> Option<PaletteColor> {
-        let index_variant_styles = emphasis_variants(style);
-        for i in (0..=3).rev() {
-            // we do this in reverse to give precedence to the last applied
-            // style
-            if let Some(indices) = self.indices.get(i) {
-                if indices.contains(&index) {
-                    return Some(index_variant_styles[i]);
-                }
-            }
-        }
-        None
-    }
 
-    pub fn style_of_index_for_component_site(
-        &self,
-        index: usize,
-        style: &Style,
-        site: TextComponentSite,
-    ) -> Option<PaletteColor> {
-        let index_variant_styles = match (site, self.selected) {
-            (TextComponentSite::Text, True) => emphasis_variants(style),
-            (TextComponentSite::Text, False) => emphasis_variants_selected(style),
-            (TextComponentSite::Ribbon, True) => emphasis_variants_for_selected_ribbon(style),
-            (TextComponentSite::Ribbon, False) => emphasis_variants_for_ribbon(style),
-            (TextComponentSite::NestedList, True) => {
-                emphasis_variants_for_selected_nested_list(style)
-            },
-            (TextComponentSite::NestedList, False) => emphasis_variants_for_nested_list(style),
-            (TextComponentSite::TableCell, True) => {
-                emphasis_variants_for_selected_table_cell(style)
-            },
-            (TextComponentSite::TableCell, False) => emphasis_variants_for_table_cell(style),
-            (TextComponentSite::TableTitle, _) => emphasis_variants_for_table_title(style),
-        };
+    pub fn style_of_index(&self, index: usize, style: &StyleDeclaration) -> Option<PaletteColor> {
+        let index_variant_styles = [
+            style.emphasis_1,
+            style.emphasis_2,
+            style.emphasis_3,
+            style.emphasis_4,
+        ];
         for i in (0..=3).rev() {
             // we do this in reverse to give precedence to the last applied
             // style
@@ -190,17 +123,6 @@ impl Text {
         }
         None
     }
-
-    pub fn style_of_index_for_ribbon(&self, index: usize, style: &Style) -> Option<PaletteColor> {
-        self.style_of_index_for_component_site(index, style, TextComponentSite::Ribbon)
-    }
-    pub fn style_of_index_for_selected_ribbon(
-        &self,
-        index: usize,
-        style: &Style,
-    ) -> Option<PaletteColor> {
-        self.style_of_index_for_component_site(index, style, TextComponentSite::Ribbon)
-    }
 }
 
 pub fn parse_text(stringified: &mut String) -> Result<String> {

From 8409da2ca68de2c4621df8e87b8fb0338fca651d Mon Sep 17 00:00:00 2001
From: Mark Grey <mgthesecond@spotify.com>
Date: Wed, 10 Jul 2024 15:42:01 -0400
Subject: [PATCH 33/40] update test snapshots

---
 ...__theme_test__dracula_theme_from_file.snap |  675 +++++-
 zellij-utils/src/input/unit/theme_test.rs     |    1 -
 zellij-utils/src/setup.rs                     |    1 -
 ..._layout_themes_override_config_themes.snap | 1960 ++++++++++++++---
 4 files changed, 2275 insertions(+), 362 deletions(-)

diff --git a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__theme__theme_test__dracula_theme_from_file.snap b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__theme__theme_test__dracula_theme_from_file.snap
index 315c6d50eb..dc1027a423 100644
--- a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__theme__theme_test__dracula_theme_from_file.snap
+++ b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__theme__theme_test__dracula_theme_from_file.snap
@@ -4,104 +4,583 @@ expression: "format!(\"{:#?}\", theme)"
 ---
 {
     "dracula": Theme {
-        palette: Palette {
-            source: Default,
-            theme_hue: Dark,
-            fg: Rgb(
-                (
-                    248,
-                    248,
-                    242,
-                ),
-            ),
-            bg: Rgb(
-                (
-                    40,
-                    42,
-                    54,
-                ),
-            ),
-            black: Rgb(
-                (
-                    0,
-                    0,
-                    0,
-                ),
-            ),
-            red: Rgb(
-                (
-                    255,
-                    85,
-                    85,
-                ),
-            ),
-            green: Rgb(
-                (
-                    80,
-                    250,
-                    123,
-                ),
-            ),
-            yellow: Rgb(
-                (
-                    241,
-                    250,
-                    140,
-                ),
-            ),
-            blue: Rgb(
-                (
-                    98,
-                    114,
-                    164,
-                ),
-            ),
-            magenta: Rgb(
-                (
-                    255,
-                    121,
-                    198,
-                ),
-            ),
-            cyan: Rgb(
-                (
-                    139,
-                    233,
-                    253,
-                ),
-            ),
-            white: Rgb(
-                (
-                    255,
-                    255,
-                    255,
-                ),
-            ),
-            orange: Rgb(
-                (
-                    255,
-                    184,
-                    108,
-                ),
-            ),
-            gray: EightBit(
-                0,
-            ),
-            purple: EightBit(
-                0,
-            ),
-            gold: EightBit(
-                0,
-            ),
-            silver: EightBit(
-                0,
-            ),
-            pink: EightBit(
-                0,
-            ),
-            brown: EightBit(
-                0,
-            ),
+        palette: Styling {
+            text_unselected: StyleDeclaration {
+                base: Rgb(
+                    (
+                        255,
+                        255,
+                        255,
+                    ),
+                ),
+                background: Rgb(
+                    (
+                        0,
+                        0,
+                        0,
+                    ),
+                ),
+                emphasis_1: Rgb(
+                    (
+                        255,
+                        184,
+                        108,
+                    ),
+                ),
+                emphasis_2: Rgb(
+                    (
+                        139,
+                        233,
+                        253,
+                    ),
+                ),
+                emphasis_3: Rgb(
+                    (
+                        80,
+                        250,
+                        123,
+                    ),
+                ),
+                emphasis_4: Rgb(
+                    (
+                        255,
+                        121,
+                        198,
+                    ),
+                ),
+            },
+            text_selected: StyleDeclaration {
+                base: Rgb(
+                    (
+                        255,
+                        255,
+                        255,
+                    ),
+                ),
+                background: Rgb(
+                    (
+                        40,
+                        42,
+                        54,
+                    ),
+                ),
+                emphasis_1: Rgb(
+                    (
+                        255,
+                        184,
+                        108,
+                    ),
+                ),
+                emphasis_2: Rgb(
+                    (
+                        139,
+                        233,
+                        253,
+                    ),
+                ),
+                emphasis_3: Rgb(
+                    (
+                        80,
+                        250,
+                        123,
+                    ),
+                ),
+                emphasis_4: Rgb(
+                    (
+                        255,
+                        121,
+                        198,
+                    ),
+                ),
+            },
+            ribbon_unselected: StyleDeclaration {
+                base: Rgb(
+                    (
+                        0,
+                        0,
+                        0,
+                    ),
+                ),
+                background: Rgb(
+                    (
+                        248,
+                        248,
+                        242,
+                    ),
+                ),
+                emphasis_1: Rgb(
+                    (
+                        255,
+                        85,
+                        85,
+                    ),
+                ),
+                emphasis_2: Rgb(
+                    (
+                        255,
+                        255,
+                        255,
+                    ),
+                ),
+                emphasis_3: Rgb(
+                    (
+                        98,
+                        114,
+                        164,
+                    ),
+                ),
+                emphasis_4: Rgb(
+                    (
+                        255,
+                        121,
+                        198,
+                    ),
+                ),
+            },
+            ribbon_selected: StyleDeclaration {
+                base: Rgb(
+                    (
+                        0,
+                        0,
+                        0,
+                    ),
+                ),
+                background: Rgb(
+                    (
+                        80,
+                        250,
+                        123,
+                    ),
+                ),
+                emphasis_1: Rgb(
+                    (
+                        255,
+                        85,
+                        85,
+                    ),
+                ),
+                emphasis_2: Rgb(
+                    (
+                        255,
+                        255,
+                        255,
+                    ),
+                ),
+                emphasis_3: Rgb(
+                    (
+                        98,
+                        114,
+                        164,
+                    ),
+                ),
+                emphasis_4: Rgb(
+                    (
+                        255,
+                        121,
+                        198,
+                    ),
+                ),
+            },
+            table_title: StyleDeclaration {
+                base: Rgb(
+                    (
+                        80,
+                        250,
+                        123,
+                    ),
+                ),
+                background: EightBit(
+                    0,
+                ),
+                emphasis_1: Rgb(
+                    (
+                        255,
+                        184,
+                        108,
+                    ),
+                ),
+                emphasis_2: Rgb(
+                    (
+                        139,
+                        233,
+                        253,
+                    ),
+                ),
+                emphasis_3: Rgb(
+                    (
+                        255,
+                        85,
+                        85,
+                    ),
+                ),
+                emphasis_4: Rgb(
+                    (
+                        255,
+                        121,
+                        198,
+                    ),
+                ),
+            },
+            table_cell_unselected: StyleDeclaration {
+                base: Rgb(
+                    (
+                        248,
+                        248,
+                        242,
+                    ),
+                ),
+                background: Rgb(
+                    (
+                        40,
+                        42,
+                        54,
+                    ),
+                ),
+                emphasis_1: Rgb(
+                    (
+                        255,
+                        184,
+                        108,
+                    ),
+                ),
+                emphasis_2: Rgb(
+                    (
+                        139,
+                        233,
+                        253,
+                    ),
+                ),
+                emphasis_3: Rgb(
+                    (
+                        80,
+                        250,
+                        123,
+                    ),
+                ),
+                emphasis_4: Rgb(
+                    (
+                        255,
+                        121,
+                        198,
+                    ),
+                ),
+            },
+            table_cell_selected: StyleDeclaration {
+                base: Rgb(
+                    (
+                        80,
+                        250,
+                        123,
+                    ),
+                ),
+                background: Rgb(
+                    (
+                        40,
+                        42,
+                        54,
+                    ),
+                ),
+                emphasis_1: Rgb(
+                    (
+                        255,
+                        184,
+                        108,
+                    ),
+                ),
+                emphasis_2: Rgb(
+                    (
+                        139,
+                        233,
+                        253,
+                    ),
+                ),
+                emphasis_3: Rgb(
+                    (
+                        255,
+                        85,
+                        85,
+                    ),
+                ),
+                emphasis_4: Rgb(
+                    (
+                        255,
+                        121,
+                        198,
+                    ),
+                ),
+            },
+            list_unselected: StyleDeclaration {
+                base: Rgb(
+                    (
+                        248,
+                        248,
+                        242,
+                    ),
+                ),
+                background: Rgb(
+                    (
+                        40,
+                        42,
+                        54,
+                    ),
+                ),
+                emphasis_1: Rgb(
+                    (
+                        255,
+                        184,
+                        108,
+                    ),
+                ),
+                emphasis_2: Rgb(
+                    (
+                        139,
+                        233,
+                        253,
+                    ),
+                ),
+                emphasis_3: Rgb(
+                    (
+                        80,
+                        250,
+                        123,
+                    ),
+                ),
+                emphasis_4: Rgb(
+                    (
+                        255,
+                        121,
+                        198,
+                    ),
+                ),
+            },
+            list_selected: StyleDeclaration {
+                base: Rgb(
+                    (
+                        80,
+                        250,
+                        123,
+                    ),
+                ),
+                background: Rgb(
+                    (
+                        40,
+                        42,
+                        54,
+                    ),
+                ),
+                emphasis_1: Rgb(
+                    (
+                        255,
+                        184,
+                        108,
+                    ),
+                ),
+                emphasis_2: Rgb(
+                    (
+                        139,
+                        233,
+                        253,
+                    ),
+                ),
+                emphasis_3: Rgb(
+                    (
+                        255,
+                        85,
+                        85,
+                    ),
+                ),
+                emphasis_4: Rgb(
+                    (
+                        255,
+                        121,
+                        198,
+                    ),
+                ),
+            },
+            frame_unselected: StyleDeclaration {
+                base: Rgb(
+                    (
+                        255,
+                        184,
+                        108,
+                    ),
+                ),
+                background: EightBit(
+                    0,
+                ),
+                emphasis_1: EightBit(
+                    0,
+                ),
+                emphasis_2: EightBit(
+                    0,
+                ),
+                emphasis_3: EightBit(
+                    0,
+                ),
+                emphasis_4: Rgb(
+                    (
+                        0,
+                        0,
+                        0,
+                    ),
+                ),
+            },
+            frame_selected: StyleDeclaration {
+                base: Rgb(
+                    (
+                        80,
+                        250,
+                        123,
+                    ),
+                ),
+                background: EightBit(
+                    0,
+                ),
+                emphasis_1: Rgb(
+                    (
+                        255,
+                        184,
+                        108,
+                    ),
+                ),
+                emphasis_2: Rgb(
+                    (
+                        139,
+                        233,
+                        253,
+                    ),
+                ),
+                emphasis_3: Rgb(
+                    (
+                        255,
+                        121,
+                        198,
+                    ),
+                ),
+                emphasis_4: EightBit(
+                    0,
+                ),
+            },
+            exit_code_success: StyleDeclaration {
+                base: Rgb(
+                    (
+                        80,
+                        250,
+                        123,
+                    ),
+                ),
+                background: EightBit(
+                    0,
+                ),
+                emphasis_1: Rgb(
+                    (
+                        139,
+                        233,
+                        253,
+                    ),
+                ),
+                emphasis_2: Rgb(
+                    (
+                        0,
+                        0,
+                        0,
+                    ),
+                ),
+                emphasis_3: Rgb(
+                    (
+                        255,
+                        121,
+                        198,
+                    ),
+                ),
+                emphasis_4: Rgb(
+                    (
+                        98,
+                        114,
+                        164,
+                    ),
+                ),
+            },
+            exit_code_error: StyleDeclaration {
+                base: Rgb(
+                    (
+                        255,
+                        85,
+                        85,
+                    ),
+                ),
+                background: EightBit(
+                    0,
+                ),
+                emphasis_1: Rgb(
+                    (
+                        241,
+                        250,
+                        140,
+                    ),
+                ),
+                emphasis_2: EightBit(
+                    0,
+                ),
+                emphasis_3: EightBit(
+                    0,
+                ),
+                emphasis_4: EightBit(
+                    0,
+                ),
+            },
+            multiplayer_user_colors: MultiplayerColors {
+                player_1: Rgb(
+                    (
+                        255,
+                        121,
+                        198,
+                    ),
+                ),
+                player_2: Rgb(
+                    (
+                        98,
+                        114,
+                        164,
+                    ),
+                ),
+                player_3: EightBit(
+                    0,
+                ),
+                player_4: Rgb(
+                    (
+                        241,
+                        250,
+                        140,
+                    ),
+                ),
+                player_5: Rgb(
+                    (
+                        139,
+                        233,
+                        253,
+                    ),
+                ),
+                player_6: EightBit(
+                    0,
+                ),
+                player_7: Rgb(
+                    (
+                        255,
+                        85,
+                        85,
+                    ),
+                ),
+                player_8: EightBit(
+                    0,
+                ),
+                player_9: EightBit(
+                    0,
+                ),
+                player_10: EightBit(
+                    0,
+                ),
+            },
         },
     },
 }
diff --git a/zellij-utils/src/input/unit/theme_test.rs b/zellij-utils/src/input/unit/theme_test.rs
index 22113d8f63..97d5adc925 100644
--- a/zellij-utils/src/input/unit/theme_test.rs
+++ b/zellij-utils/src/input/unit/theme_test.rs
@@ -8,7 +8,6 @@ fn theme_test_dir(theme: String) -> PathBuf {
     theme_dir.join(theme)
 }
 
-#[ignore]
 #[test]
 fn dracula_theme_from_file() {
     let path = theme_test_dir("dracula.kdl".into());
diff --git a/zellij-utils/src/setup.rs b/zellij-utils/src/setup.rs
index 949b126d1b..941c351b5f 100644
--- a/zellij-utils/src/setup.rs
+++ b/zellij-utils/src/setup.rs
@@ -824,7 +824,6 @@ mod setup_test {
         let (config, _layout, _options, _, _) = Setup::from_cli_args(&cli_args).unwrap();
         assert_snapshot!(format!("{:#?}", config));
     }
-    #[ignore]
     #[test]
     fn layout_themes_override_config_themes() {
         let mut cli_args = CliArgs::default();
diff --git a/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__layout_themes_override_config_themes.snap b/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__layout_themes_override_config_themes.snap
index 2cb867e73d..98d7c445dc 100644
--- a/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__layout_themes_override_config_themes.snap
+++ b/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__layout_themes_override_config_themes.snap
@@ -1,6 +1,5 @@
 ---
 source: zellij-utils/src/setup.rs
-assertion_line: 811
 expression: "format!(\"{:#?}\", config)"
 ---
 Config {
@@ -5396,306 +5395,1743 @@ Config {
     },
     themes: {
         "other-theme-from-config": Theme {
-            palette: Palette {
-                source: Default,
-                theme_hue: Dark,
-                fg: Rgb(
-                    (
-                        2,
-                        2,
-                        2,
+            palette: Styling {
+                text_unselected: StyleDeclaration {
+                    base: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
                     ),
-                ),
-                bg: Rgb(
-                    (
-                        2,
-                        2,
-                        2,
+                    background: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
                     ),
-                ),
-                black: Rgb(
-                    (
-                        2,
-                        2,
-                        2,
+                    emphasis_1: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
                     ),
-                ),
-                red: Rgb(
-                    (
-                        2,
-                        2,
-                        2,
+                    emphasis_2: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
                     ),
-                ),
-                green: Rgb(
-                    (
-                        2,
-                        2,
-                        2,
+                    emphasis_3: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
                     ),
-                ),
-                yellow: Rgb(
-                    (
-                        2,
-                        2,
-                        2,
+                    emphasis_4: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
                     ),
-                ),
-                blue: Rgb(
-                    (
-                        2,
-                        2,
-                        2,
+                },
+                text_selected: StyleDeclaration {
+                    base: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
                     ),
-                ),
-                magenta: Rgb(
-                    (
-                        2,
-                        2,
-                        2,
+                    background: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
                     ),
-                ),
-                cyan: Rgb(
-                    (
-                        2,
-                        2,
-                        2,
+                    emphasis_1: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
                     ),
-                ),
-                white: Rgb(
-                    (
-                        2,
-                        2,
-                        2,
+                    emphasis_2: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
                     ),
-                ),
-                orange: Rgb(
-                    (
-                        2,
-                        2,
-                        2,
+                    emphasis_3: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
                     ),
-                ),
-                gray: EightBit(
-                    0,
-                ),
-                purple: EightBit(
-                    0,
-                ),
-                gold: EightBit(
-                    0,
-                ),
-                silver: EightBit(
-                    0,
-                ),
-                pink: EightBit(
-                    0,
-                ),
-                brown: EightBit(
-                    0,
-                ),
+                    emphasis_4: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                },
+                ribbon_unselected: StyleDeclaration {
+                    base: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    background: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    emphasis_1: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    emphasis_2: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    emphasis_3: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    emphasis_4: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                },
+                ribbon_selected: StyleDeclaration {
+                    base: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    background: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    emphasis_1: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    emphasis_2: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    emphasis_3: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    emphasis_4: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                },
+                table_title: StyleDeclaration {
+                    base: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    background: EightBit(
+                        0,
+                    ),
+                    emphasis_1: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    emphasis_2: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    emphasis_3: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    emphasis_4: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                },
+                table_cell_unselected: StyleDeclaration {
+                    base: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    background: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    emphasis_1: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    emphasis_2: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    emphasis_3: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    emphasis_4: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                },
+                table_cell_selected: StyleDeclaration {
+                    base: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    background: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    emphasis_1: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    emphasis_2: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    emphasis_3: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    emphasis_4: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                },
+                list_unselected: StyleDeclaration {
+                    base: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    background: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    emphasis_1: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    emphasis_2: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    emphasis_3: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    emphasis_4: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                },
+                list_selected: StyleDeclaration {
+                    base: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    background: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    emphasis_1: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    emphasis_2: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    emphasis_3: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    emphasis_4: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                },
+                frame_unselected: StyleDeclaration {
+                    base: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    background: EightBit(
+                        0,
+                    ),
+                    emphasis_1: EightBit(
+                        0,
+                    ),
+                    emphasis_2: EightBit(
+                        0,
+                    ),
+                    emphasis_3: EightBit(
+                        0,
+                    ),
+                    emphasis_4: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                },
+                frame_selected: StyleDeclaration {
+                    base: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    background: EightBit(
+                        0,
+                    ),
+                    emphasis_1: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    emphasis_2: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    emphasis_3: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    emphasis_4: EightBit(
+                        0,
+                    ),
+                },
+                exit_code_success: StyleDeclaration {
+                    base: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    background: EightBit(
+                        0,
+                    ),
+                    emphasis_1: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    emphasis_2: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    emphasis_3: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    emphasis_4: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                },
+                exit_code_error: StyleDeclaration {
+                    base: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    background: EightBit(
+                        0,
+                    ),
+                    emphasis_1: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    emphasis_2: EightBit(
+                        0,
+                    ),
+                    emphasis_3: EightBit(
+                        0,
+                    ),
+                    emphasis_4: EightBit(
+                        0,
+                    ),
+                },
+                multiplayer_user_colors: MultiplayerColors {
+                    player_1: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    player_2: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    player_3: EightBit(
+                        0,
+                    ),
+                    player_4: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    player_5: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    player_6: EightBit(
+                        0,
+                    ),
+                    player_7: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    player_8: EightBit(
+                        0,
+                    ),
+                    player_9: EightBit(
+                        0,
+                    ),
+                    player_10: EightBit(
+                        0,
+                    ),
+                },
             },
         },
         "theme-from-config": Theme {
-            palette: Palette {
-                source: Default,
-                theme_hue: Dark,
-                fg: Rgb(
-                    (
-                        1,
-                        1,
-                        1,
+            palette: Styling {
+                text_unselected: StyleDeclaration {
+                    base: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
                     ),
-                ),
-                bg: Rgb(
-                    (
-                        1,
-                        1,
-                        1,
+                    background: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
                     ),
-                ),
-                black: Rgb(
-                    (
-                        1,
-                        1,
-                        1,
+                    emphasis_1: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
                     ),
-                ),
-                red: Rgb(
-                    (
-                        1,
-                        1,
-                        1,
+                    emphasis_2: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
                     ),
-                ),
-                green: Rgb(
-                    (
-                        1,
-                        1,
-                        1,
+                    emphasis_3: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
                     ),
-                ),
-                yellow: Rgb(
-                    (
-                        1,
-                        1,
-                        1,
+                    emphasis_4: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
                     ),
-                ),
-                blue: Rgb(
-                    (
-                        1,
-                        1,
-                        1,
+                },
+                text_selected: StyleDeclaration {
+                    base: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
                     ),
-                ),
-                magenta: Rgb(
-                    (
-                        1,
-                        1,
-                        1,
+                    background: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
                     ),
-                ),
-                cyan: Rgb(
-                    (
-                        1,
-                        1,
-                        1,
+                    emphasis_1: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
                     ),
-                ),
-                white: Rgb(
-                    (
-                        1,
-                        1,
-                        1,
+                    emphasis_2: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
                     ),
-                ),
-                orange: Rgb(
-                    (
-                        1,
-                        1,
-                        1,
+                    emphasis_3: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
                     ),
-                ),
-                gray: EightBit(
-                    0,
-                ),
-                purple: EightBit(
-                    0,
-                ),
-                gold: EightBit(
-                    0,
-                ),
-                silver: EightBit(
-                    0,
-                ),
-                pink: EightBit(
-                    0,
-                ),
-                brown: EightBit(
-                    0,
-                ),
+                    emphasis_4: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                },
+                ribbon_unselected: StyleDeclaration {
+                    base: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    background: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_1: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_2: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_3: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_4: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                },
+                ribbon_selected: StyleDeclaration {
+                    base: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    background: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_1: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_2: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_3: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_4: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                },
+                table_title: StyleDeclaration {
+                    base: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    background: EightBit(
+                        0,
+                    ),
+                    emphasis_1: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_2: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_3: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_4: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                },
+                table_cell_unselected: StyleDeclaration {
+                    base: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    background: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_1: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_2: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_3: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_4: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                },
+                table_cell_selected: StyleDeclaration {
+                    base: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    background: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_1: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_2: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_3: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_4: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                },
+                list_unselected: StyleDeclaration {
+                    base: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    background: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_1: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_2: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_3: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_4: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                },
+                list_selected: StyleDeclaration {
+                    base: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    background: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_1: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_2: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_3: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_4: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                },
+                frame_unselected: StyleDeclaration {
+                    base: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    background: EightBit(
+                        0,
+                    ),
+                    emphasis_1: EightBit(
+                        0,
+                    ),
+                    emphasis_2: EightBit(
+                        0,
+                    ),
+                    emphasis_3: EightBit(
+                        0,
+                    ),
+                    emphasis_4: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                },
+                frame_selected: StyleDeclaration {
+                    base: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    background: EightBit(
+                        0,
+                    ),
+                    emphasis_1: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_2: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_3: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_4: EightBit(
+                        0,
+                    ),
+                },
+                exit_code_success: StyleDeclaration {
+                    base: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    background: EightBit(
+                        0,
+                    ),
+                    emphasis_1: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_2: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_3: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_4: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                },
+                exit_code_error: StyleDeclaration {
+                    base: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    background: EightBit(
+                        0,
+                    ),
+                    emphasis_1: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_2: EightBit(
+                        0,
+                    ),
+                    emphasis_3: EightBit(
+                        0,
+                    ),
+                    emphasis_4: EightBit(
+                        0,
+                    ),
+                },
+                multiplayer_user_colors: MultiplayerColors {
+                    player_1: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    player_2: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    player_3: EightBit(
+                        0,
+                    ),
+                    player_4: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    player_5: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    player_6: EightBit(
+                        0,
+                    ),
+                    player_7: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    player_8: EightBit(
+                        0,
+                    ),
+                    player_9: EightBit(
+                        0,
+                    ),
+                    player_10: EightBit(
+                        0,
+                    ),
+                },
             },
         },
         "theme-from-layout": Theme {
-            palette: Palette {
-                source: Default,
-                theme_hue: Dark,
-                fg: Rgb(
-                    (
-                        1,
-                        1,
-                        1,
+            palette: Styling {
+                text_unselected: StyleDeclaration {
+                    base: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
                     ),
-                ),
-                bg: Rgb(
-                    (
-                        1,
-                        1,
-                        1,
+                    background: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
                     ),
-                ),
-                black: Rgb(
-                    (
-                        1,
-                        1,
-                        1,
+                    emphasis_1: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
                     ),
-                ),
-                red: Rgb(
-                    (
-                        1,
-                        1,
-                        1,
+                    emphasis_2: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
                     ),
-                ),
-                green: Rgb(
-                    (
-                        1,
-                        1,
-                        1,
+                    emphasis_3: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
                     ),
-                ),
-                yellow: Rgb(
-                    (
-                        1,
-                        1,
-                        1,
+                    emphasis_4: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
                     ),
-                ),
-                blue: Rgb(
-                    (
-                        1,
-                        1,
-                        1,
+                },
+                text_selected: StyleDeclaration {
+                    base: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
                     ),
-                ),
-                magenta: Rgb(
-                    (
-                        1,
-                        1,
-                        1,
+                    background: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
                     ),
-                ),
-                cyan: Rgb(
-                    (
-                        1,
-                        1,
-                        1,
+                    emphasis_1: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
                     ),
-                ),
-                white: Rgb(
-                    (
-                        1,
-                        1,
-                        1,
+                    emphasis_2: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
                     ),
-                ),
-                orange: Rgb(
-                    (
-                        1,
-                        1,
-                        1,
+                    emphasis_3: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
                     ),
-                ),
-                gray: EightBit(
-                    0,
-                ),
-                purple: EightBit(
-                    0,
-                ),
-                gold: EightBit(
-                    0,
-                ),
-                silver: EightBit(
-                    0,
-                ),
-                pink: EightBit(
-                    0,
-                ),
-                brown: EightBit(
-                    0,
-                ),
+                    emphasis_4: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                },
+                ribbon_unselected: StyleDeclaration {
+                    base: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    background: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_1: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_2: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_3: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_4: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                },
+                ribbon_selected: StyleDeclaration {
+                    base: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    background: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_1: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_2: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_3: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_4: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                },
+                table_title: StyleDeclaration {
+                    base: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    background: EightBit(
+                        0,
+                    ),
+                    emphasis_1: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_2: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_3: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_4: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                },
+                table_cell_unselected: StyleDeclaration {
+                    base: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    background: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_1: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_2: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_3: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_4: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                },
+                table_cell_selected: StyleDeclaration {
+                    base: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    background: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_1: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_2: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_3: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_4: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                },
+                list_unselected: StyleDeclaration {
+                    base: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    background: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_1: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_2: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_3: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_4: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                },
+                list_selected: StyleDeclaration {
+                    base: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    background: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_1: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_2: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_3: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_4: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                },
+                frame_unselected: StyleDeclaration {
+                    base: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    background: EightBit(
+                        0,
+                    ),
+                    emphasis_1: EightBit(
+                        0,
+                    ),
+                    emphasis_2: EightBit(
+                        0,
+                    ),
+                    emphasis_3: EightBit(
+                        0,
+                    ),
+                    emphasis_4: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                },
+                frame_selected: StyleDeclaration {
+                    base: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    background: EightBit(
+                        0,
+                    ),
+                    emphasis_1: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_2: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_3: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_4: EightBit(
+                        0,
+                    ),
+                },
+                exit_code_success: StyleDeclaration {
+                    base: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    background: EightBit(
+                        0,
+                    ),
+                    emphasis_1: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_2: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_3: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_4: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                },
+                exit_code_error: StyleDeclaration {
+                    base: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    background: EightBit(
+                        0,
+                    ),
+                    emphasis_1: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_2: EightBit(
+                        0,
+                    ),
+                    emphasis_3: EightBit(
+                        0,
+                    ),
+                    emphasis_4: EightBit(
+                        0,
+                    ),
+                },
+                multiplayer_user_colors: MultiplayerColors {
+                    player_1: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    player_2: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    player_3: EightBit(
+                        0,
+                    ),
+                    player_4: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    player_5: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    player_6: EightBit(
+                        0,
+                    ),
+                    player_7: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    player_8: EightBit(
+                        0,
+                    ),
+                    player_9: EightBit(
+                        0,
+                    ),
+                    player_10: EightBit(
+                        0,
+                    ),
+                },
             },
         },
     },

From 6c44157ae2758730a85b1a745464958dbe49263f Mon Sep 17 00:00:00 2001
From: Mark Grey <mgthesecond@spotify.com>
Date: Fri, 28 Jun 2024 09:55:57 -0400
Subject: [PATCH 34/40] formatting

---
 default-plugins/compact-bar/src/line.rs | 10 ++++++++--
 default-plugins/tab-bar/src/line.rs     | 10 ++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/default-plugins/compact-bar/src/line.rs b/default-plugins/compact-bar/src/line.rs
index 043b714e90..5e531772d4 100644
--- a/default-plugins/compact-bar/src/line.rs
+++ b/default-plugins/compact-bar/src/line.rs
@@ -122,7 +122,10 @@ fn left_more_message(
     // 238
     // chars length plus separator length on both sides
     let more_text_len = more_text.width() + 2 * separator.width();
-    let (text_color, sep_color) = (palette.ribbon_unselected.base, palette.text_unselected.background);
+    let (text_color, sep_color) = (
+        palette.ribbon_unselected.base,
+        palette.text_unselected.background,
+    );
     let plus_ribbon_bg = palette.text_selected.emphasis_1;
     let left_separator = style!(sep_color, plus_ribbon_bg).paint(separator);
     let more_styled_text = style!(text_color, plus_ribbon_bg).bold().paint(more_text);
@@ -153,7 +156,10 @@ fn right_more_message(
     // chars length plus separator length on both sides
     let more_text_len = more_text.width() + 2 * separator.width();
 
-    let (text_color, sep_color) = (palette.ribbon_unselected.base, palette.text_unselected.background);
+    let (text_color, sep_color) = (
+        palette.ribbon_unselected.base,
+        palette.text_unselected.background,
+    );
     let plus_ribbon_bg = palette.text_selected.emphasis_1;
     let left_separator = style!(sep_color, plus_ribbon_bg).paint(separator);
     let more_styled_text = style!(text_color, plus_ribbon_bg).bold().paint(more_text);
diff --git a/default-plugins/tab-bar/src/line.rs b/default-plugins/tab-bar/src/line.rs
index ef0a6b8a1e..65c732f8b8 100644
--- a/default-plugins/tab-bar/src/line.rs
+++ b/default-plugins/tab-bar/src/line.rs
@@ -128,7 +128,10 @@ fn left_more_message(
     // 238
     // chars length plus separator length on both sides
     let more_text_len = more_text.width() + 2 * separator.width();
-    let (text_color, sep_color) = (palette.text_unselected.base, palette.text_unselected.background);
+    let (text_color, sep_color) = (
+        palette.text_unselected.base,
+        palette.text_unselected.background,
+    );
     let left_separator = style!(sep_color, palette.ribbon_unselected.background).paint(separator);
     let more_styled_text = style!(text_color, palette.ribbon_unselected.background)
         .bold()
@@ -159,7 +162,10 @@ fn right_more_message(
     };
     // chars length plus separator length on both sides
     let more_text_len = more_text.width() + 2 * separator.width();
-    let (text_color, sep_color) = (palette.text_unselected.base, palette.text_unselected.background);
+    let (text_color, sep_color) = (
+        palette.text_unselected.base,
+        palette.text_unselected.background,
+    );
     let left_separator = style!(sep_color, palette.ribbon_unselected.background).paint(separator);
     let more_styled_text = style!(text_color, palette.ribbon_unselected.background)
         .bold()

From e90623aba455085b65387635cd348f48d6d96af7 Mon Sep 17 00:00:00 2001
From: Mark Grey <mgthesecond@spotify.com>
Date: Tue, 2 Jul 2024 15:01:56 -0400
Subject: [PATCH 35/40] correct styling for selected text

---
 zellij-server/src/panes/grid.rs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/zellij-server/src/panes/grid.rs b/zellij-server/src/panes/grid.rs
index 7b93b7f207..0686a9c177 100644
--- a/zellij-server/src/panes/grid.rs
+++ b/zellij-server/src/panes/grid.rs
@@ -1085,14 +1085,19 @@ impl Grid {
                 .selection
                 .contains_row(character_chunk.y.saturating_sub(content_y))
             {
-                let background_color = match style.colors.text_unselected.background {
+                let background_color = match style.colors.text_selected.background {
                     PaletteColor::Rgb(rgb) => AnsiCode::RgbCode(rgb),
                     PaletteColor::EightBit(col) => AnsiCode::ColorIndex(col),
                 };
+                let foreground_color = match style.colors.text_selected.base {
+                    PaletteColor::Rgb(rgb) => AnsiCode::RgbCode(rgb),
+                    PaletteColor::EightBit(col) => AnsiCode::ColorIndex(col),
+                };
+
                 character_chunk.add_selection_and_colors(
                     self.selection,
                     background_color,
-                    None,
+                    Some(foreground_color),
                     content_x,
                     content_y,
                 );

From 665129022af41a81cae8d766a1af5c2edb605a4d Mon Sep 17 00:00:00 2001
From: Mark Grey <mgthesecond@spotify.com>
Date: Tue, 2 Jul 2024 15:32:12 -0400
Subject: [PATCH 36/40] Add frame_highlight specification for non-normal state

---
 zellij-server/src/ui/pane_contents_and_ui.rs |  2 +-
 zellij-utils/assets/prost/api.style.rs       |  6 ++++--
 zellij-utils/src/data.rs                     | 17 +++++++++++++++++
 zellij-utils/src/kdl/mod.rs                  |  5 +++++
 zellij-utils/src/plugin_api/style.proto      |  7 ++++---
 zellij-utils/src/plugin_api/style.rs         |  2 ++
 6 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/zellij-server/src/ui/pane_contents_and_ui.rs b/zellij-server/src/ui/pane_contents_and_ui.rs
index e3292d9605..6918884f61 100644
--- a/zellij-server/src/ui/pane_contents_and_ui.rs
+++ b/zellij-server/src/ui/pane_contents_and_ui.rs
@@ -269,7 +269,7 @@ impl<'a> PaneContentsAndUi<'a> {
                         colors.map(|colors| colors.0)
                     }
                 },
-                _ => Some(self.style.colors.frame_unselected.base),
+                _ => Some(self.style.colors.frame_highlight.base),
             }
         } else {
             None
diff --git a/zellij-utils/assets/prost/api.style.rs b/zellij-utils/assets/prost/api.style.rs
index 3025656a83..62080a5f97 100644
--- a/zellij-utils/assets/prost/api.style.rs
+++ b/zellij-utils/assets/prost/api.style.rs
@@ -106,10 +106,12 @@ pub struct Styling {
     #[prost(message, repeated, tag = "11")]
     pub frame_selected: ::prost::alloc::vec::Vec<Color>,
     #[prost(message, repeated, tag = "12")]
-    pub exit_code_success: ::prost::alloc::vec::Vec<Color>,
+    pub frame_highlight: ::prost::alloc::vec::Vec<Color>,
     #[prost(message, repeated, tag = "13")]
-    pub exit_code_error: ::prost::alloc::vec::Vec<Color>,
+    pub exit_code_success: ::prost::alloc::vec::Vec<Color>,
     #[prost(message, repeated, tag = "14")]
+    pub exit_code_error: ::prost::alloc::vec::Vec<Color>,
+    #[prost(message, repeated, tag = "15")]
     pub multiplayer_user_colors: ::prost::alloc::vec::Vec<Color>,
 }
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
diff --git a/zellij-utils/src/data.rs b/zellij-utils/src/data.rs
index c626fd40c5..6d60821957 100644
--- a/zellij-utils/src/data.rs
+++ b/zellij-utils/src/data.rs
@@ -1149,6 +1149,7 @@ pub struct Styling {
     pub list_selected: StyleDeclaration,
     pub frame_unselected: StyleDeclaration,
     pub frame_selected: StyleDeclaration,
+    pub frame_highlight: StyleDeclaration,
     pub exit_code_success: StyleDeclaration,
     pub exit_code_error: StyleDeclaration,
     pub multiplayer_user_colors: MultiplayerColors,
@@ -1243,6 +1244,14 @@ pub const DEFAULT_STYLES: Styling = Styling {
         emphasis_4: PaletteColor::EightBit(default_colors::BROWN),
         background: PaletteColor::EightBit(default_colors::GRAY),
     },
+    frame_highlight: StyleDeclaration {
+        base: PaletteColor::EightBit(default_colors::GREEN),
+        emphasis_1: PaletteColor::EightBit(default_colors::GREEN),
+        emphasis_2: PaletteColor::EightBit(default_colors::GREEN),
+        emphasis_3: PaletteColor::EightBit(default_colors::GREEN),
+        emphasis_4: PaletteColor::EightBit(default_colors::GREEN),
+        background: PaletteColor::EightBit(default_colors::GREEN),
+    },
     table_title: StyleDeclaration {
         base: PaletteColor::EightBit(default_colors::GREEN),
         emphasis_1: PaletteColor::EightBit(default_colors::ORANGE),
@@ -1400,6 +1409,14 @@ impl From<Palette> for Styling {
                 emphasis_4: palette.brown,
                 background: Default::default(),
             },
+            frame_highlight: StyleDeclaration {
+                base: palette.green,
+                emphasis_1: palette.green,
+                emphasis_2: palette.green,
+                emphasis_3: palette.green,
+                emphasis_4: palette.green,
+                background: Default::default(),
+            },
             table_title: StyleDeclaration {
                 base: palette.green,
                 emphasis_1: palette.orange,
diff --git a/zellij-utils/src/kdl/mod.rs b/zellij-utils/src/kdl/mod.rs
index e8fd9cb82b..474fd2b85f 100644
--- a/zellij-utils/src/kdl/mod.rs
+++ b/zellij-utils/src/kdl/mod.rs
@@ -2117,6 +2117,11 @@ impl Themes {
                             "frame_selected",
                             DEFAULT_STYLES.frame_selected,
                         )?,
+                        frame_highlight: Themes::style_declaration_from_node(
+                            style,
+                            "frame_highlight",
+                            DEFAULT_STYLES.frame_highlight,
+                        )?,
                         exit_code_success: Themes::style_declaration_from_node(
                             style,
                             "exit_code_success",
diff --git a/zellij-utils/src/plugin_api/style.proto b/zellij-utils/src/plugin_api/style.proto
index 1d221af102..cfea362e52 100644
--- a/zellij-utils/src/plugin_api/style.proto
+++ b/zellij-utils/src/plugin_api/style.proto
@@ -66,7 +66,8 @@ message Styling {
     repeated Color list_selected = 9;
     repeated Color frame_unselected = 10;
     repeated Color frame_selected = 11;
-    repeated Color exit_code_success = 12;
-    repeated Color exit_code_error = 13;
-    repeated Color multiplayer_user_colors = 14;
+    repeated Color frame_highlight = 12;
+    repeated Color exit_code_success = 13;
+    repeated Color exit_code_error = 14;
+    repeated Color multiplayer_user_colors = 15;
 }
diff --git a/zellij-utils/src/plugin_api/style.rs b/zellij-utils/src/plugin_api/style.rs
index c39b3a2eb2..2b30ec15f2 100644
--- a/zellij-utils/src/plugin_api/style.rs
+++ b/zellij-utils/src/plugin_api/style.rs
@@ -116,6 +116,7 @@ impl TryFrom<ProtobufStyling> for Styling {
             list_selected: color_definitions!(proto, list_selected, 6),
             frame_unselected: color_definitions!(proto, frame_unselected, 6),
             frame_selected: color_definitions!(proto, frame_selected, 6),
+            frame_highlight: color_definitions!(proto, frame_highlight, 6),
             exit_code_success: color_definitions!(proto, exit_code_success, 6),
             exit_code_error: color_definitions!(proto, exit_code_error, 6),
             multiplayer_user_colors: multiplayer_colors!(proto, 10),
@@ -173,6 +174,7 @@ impl TryFrom<Styling> for ProtobufStyling {
             list_selected: style.list_selected.try_into()?,
             frame_unselected: style.frame_unselected.try_into()?,
             frame_selected: style.frame_selected.try_into()?,
+            frame_highlight: style.frame_highlight.try_into()?,
             exit_code_success: style.exit_code_success.try_into()?,
             exit_code_error: style.exit_code_error.try_into()?,
             multiplayer_user_colors: style.multiplayer_user_colors.try_into()?,

From 52dff3f3dac26332b6205d9e1b69c0d88ca9a1cd Mon Sep 17 00:00:00 2001
From: Mark Grey <mgthesecond@spotify.com>
Date: Wed, 10 Jul 2024 15:42:36 -0400
Subject: [PATCH 37/40] update snapshots for theme

---
 ...__theme_test__dracula_theme_from_file.snap |  40 ++++++
 ..._layout_themes_override_config_themes.snap | 120 ++++++++++++++++++
 2 files changed, 160 insertions(+)

diff --git a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__theme__theme_test__dracula_theme_from_file.snap b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__theme__theme_test__dracula_theme_from_file.snap
index dc1027a423..4f0d9ad1aa 100644
--- a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__theme__theme_test__dracula_theme_from_file.snap
+++ b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__theme__theme_test__dracula_theme_from_file.snap
@@ -461,6 +461,46 @@ expression: "format!(\"{:#?}\", theme)"
                     0,
                 ),
             },
+            frame_highlight: StyleDeclaration {
+                base: Rgb(
+                    (
+                        80,
+                        250,
+                        123,
+                    ),
+                ),
+                background: EightBit(
+                    0,
+                ),
+                emphasis_1: Rgb(
+                    (
+                        80,
+                        250,
+                        123,
+                    ),
+                ),
+                emphasis_2: Rgb(
+                    (
+                        80,
+                        250,
+                        123,
+                    ),
+                ),
+                emphasis_3: Rgb(
+                    (
+                        80,
+                        250,
+                        123,
+                    ),
+                ),
+                emphasis_4: Rgb(
+                    (
+                        80,
+                        250,
+                        123,
+                    ),
+                ),
+            },
             exit_code_success: StyleDeclaration {
                 base: Rgb(
                     (
diff --git a/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__layout_themes_override_config_themes.snap b/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__layout_themes_override_config_themes.snap
index 98d7c445dc..4fa928d2a0 100644
--- a/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__layout_themes_override_config_themes.snap
+++ b/zellij-utils/src/snapshots/zellij_utils__setup__setup_test__layout_themes_override_config_themes.snap
@@ -5852,6 +5852,46 @@ Config {
                         0,
                     ),
                 },
+                frame_highlight: StyleDeclaration {
+                    base: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    background: EightBit(
+                        0,
+                    ),
+                    emphasis_1: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    emphasis_2: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    emphasis_3: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                    emphasis_4: Rgb(
+                        (
+                            2,
+                            2,
+                            2,
+                        ),
+                    ),
+                },
                 exit_code_success: StyleDeclaration {
                     base: Rgb(
                         (
@@ -6432,6 +6472,46 @@ Config {
                         0,
                     ),
                 },
+                frame_highlight: StyleDeclaration {
+                    base: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    background: EightBit(
+                        0,
+                    ),
+                    emphasis_1: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_2: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_3: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_4: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                },
                 exit_code_success: StyleDeclaration {
                     base: Rgb(
                         (
@@ -7012,6 +7092,46 @@ Config {
                         0,
                     ),
                 },
+                frame_highlight: StyleDeclaration {
+                    base: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    background: EightBit(
+                        0,
+                    ),
+                    emphasis_1: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_2: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_3: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                    emphasis_4: Rgb(
+                        (
+                            1,
+                            1,
+                            1,
+                        ),
+                    ),
+                },
                 exit_code_success: StyleDeclaration {
                     base: Rgb(
                         (

From 08745a5822bfb7a0975e8f44be5123dc466e843e Mon Sep 17 00:00:00 2001
From: Mark Grey <mgthesecond@spotify.com>
Date: Wed, 10 Jul 2024 15:43:55 -0400
Subject: [PATCH 38/40] remove unused import

---
 zellij-server/src/ui/components/nested_list.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zellij-server/src/ui/components/nested_list.rs b/zellij-server/src/ui/components/nested_list.rs
index d8b69f9510..e1625312f3 100644
--- a/zellij-server/src/ui/components/nested_list.rs
+++ b/zellij-server/src/ui/components/nested_list.rs
@@ -2,7 +2,7 @@ use super::{
     is_too_high, parse_indices, parse_selected, parse_text, stringify_text, Coordinates, Text,
 };
 use crate::panes::terminal_character::{AnsiCode, CharacterStyles, RESET_STYLES};
-use zellij_utils::data::{PaletteColor, Style};
+use zellij_utils::data::Style;
 
 use unicode_width::UnicodeWidthChar;
 

From ecb7948190850c0303c8b4b735f9590f819b96e9 Mon Sep 17 00:00:00 2001
From: Mark Grey <mgthesecond@spotify.com>
Date: Mon, 8 Jul 2024 13:43:33 -0400
Subject: [PATCH 39/40] incorporate new status bar ui into theming

---
 default-plugins/status-bar/src/one_line_ui.rs    |  4 ++--
 zellij-utils/src/data.rs                         | 14 +++++++-------
 ...eme__theme_test__dracula_theme_from_file.snap | 16 ++++++++--------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/default-plugins/status-bar/src/one_line_ui.rs b/default-plugins/status-bar/src/one_line_ui.rs
index 87b1e2fd26..80b17512ba 100644
--- a/default-plugins/status-bar/src/one_line_ui.rs
+++ b/default-plugins/status-bar/src/one_line_ui.rs
@@ -1055,8 +1055,8 @@ fn add_keygroup_separator(help: &ModeInfo, max_len: usize) -> Option<LinePart> {
 
     let mut ret = LinePart::default();
 
-    let separator_color = palette_match!(palette.orange);
-    let bg_color = palette_match!(palette.black);
+    let separator_color = palette_match!(palette.ribbon_selected.emphasis_2);
+    let bg_color = palette_match!(palette.ribbon_selected.base);
     let mut bits: Vec<ANSIString> = vec![];
     let mode_help_text = match help.mode {
         InputMode::RenamePane => Some("RENAMING PANE"),
diff --git a/zellij-utils/src/data.rs b/zellij-utils/src/data.rs
index 6d60821957..f2da5819f0 100644
--- a/zellij-utils/src/data.rs
+++ b/zellij-utils/src/data.rs
@@ -1207,9 +1207,9 @@ pub const DEFAULT_STYLES: Styling = Styling {
     ribbon_selected: StyleDeclaration {
         base: PaletteColor::EightBit(default_colors::BLACK),
         emphasis_1: PaletteColor::EightBit(default_colors::RED),
-        emphasis_2: PaletteColor::EightBit(default_colors::WHITE),
-        emphasis_3: PaletteColor::EightBit(default_colors::BLUE),
-        emphasis_4: PaletteColor::EightBit(default_colors::MAGENTA),
+        emphasis_2: PaletteColor::EightBit(default_colors::ORANGE),
+        emphasis_3: PaletteColor::EightBit(default_colors::MAGENTA),
+        emphasis_4: PaletteColor::EightBit(default_colors::BLUE),
         background: PaletteColor::EightBit(default_colors::GREEN),
     },
     exit_code_success: StyleDeclaration {
@@ -1327,7 +1327,7 @@ impl From<Styling> for Palette {
             orange: styling.text_unselected.emphasis_1,
             cyan: styling.text_unselected.emphasis_2,
             black: styling.ribbon_unselected.base,
-            white: styling.ribbon_selected.emphasis_2,
+            white: styling.ribbon_unselected.emphasis_2,
             gray: styling.list_unselected.background,
             purple: styling.multiplayer_user_colors.player_3,
             gold: styling.multiplayer_user_colors.player_6,
@@ -1372,9 +1372,9 @@ impl From<Palette> for Styling {
             ribbon_selected: StyleDeclaration {
                 base: palette.black,
                 emphasis_1: palette.red,
-                emphasis_2: palette.white,
-                emphasis_3: palette.blue,
-                emphasis_4: palette.magenta,
+                emphasis_2: palette.orange,
+                emphasis_3: palette.magenta,
+                emphasis_4: palette.blue,
                 background: palette.green,
             },
             exit_code_success: StyleDeclaration {
diff --git a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__theme__theme_test__dracula_theme_from_file.snap b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__theme__theme_test__dracula_theme_from_file.snap
index 4f0d9ad1aa..3ed9288d48 100644
--- a/zellij-utils/src/input/unit/snapshots/zellij_utils__input__theme__theme_test__dracula_theme_from_file.snap
+++ b/zellij-utils/src/input/unit/snapshots/zellij_utils__input__theme__theme_test__dracula_theme_from_file.snap
@@ -162,22 +162,22 @@ expression: "format!(\"{:#?}\", theme)"
                 emphasis_2: Rgb(
                     (
                         255,
-                        255,
-                        255,
+                        184,
+                        108,
                     ),
                 ),
                 emphasis_3: Rgb(
                     (
-                        98,
-                        114,
-                        164,
+                        255,
+                        121,
+                        198,
                     ),
                 ),
                 emphasis_4: Rgb(
                     (
-                        255,
-                        121,
-                        198,
+                        98,
+                        114,
+                        164,
                     ),
                 ),
             },

From 0bc59cd7828d77c0fc06b9708860550801390366 Mon Sep 17 00:00:00 2001
From: Mark Grey <mgthesecond@spotify.com>
Date: Wed, 10 Jul 2024 15:36:59 -0400
Subject: [PATCH 40/40] improve test coverage of config behavior

---
 zellij-utils/src/input/config.rs | 73 ++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)

diff --git a/zellij-utils/src/input/config.rs b/zellij-utils/src/input/config.rs
index 611f118a10..e53a4a9be1 100644
--- a/zellij-utils/src/input/config.rs
+++ b/zellij-utils/src/input/config.rs
@@ -822,6 +822,79 @@ mod config_test {
         assert_eq!(config.themes, expected_themes, "Theme defined in config")
     }
 
+    #[test]
+    fn omitting_required_style_errors() {
+        let config_contents = r##"
+            themes {
+                named_theme {
+                    styling {
+                        text_unselected {
+                            base "#DCD7BA"
+                            emphasis_2 "#DCD8DD"
+                            emphasis_3 "#DCD899"
+                            emphasis_4 "#ACD7CD"
+                            background   "#1F1F28"
+                        }
+                    }
+                }
+            }
+            "##;
+
+        let config = Config::from_kdl(config_contents, None);
+        assert!(config.is_err());
+        if let Err(ConfigError::KdlError(KdlError {
+            error_message,
+            src: _,
+            offset: _,
+            len: _,
+            help_message: _,
+        })) = config
+        {
+            assert_eq!(error_message, "Missing theme color: emphasis_1")
+        }
+    }
+
+    #[test]
+    fn partial_declaration_of_styles_defaults_omitted() {
+        let config_contents = r##"
+            themes {
+                named_theme {
+                    styling {
+                        text_unselected {
+                            base "#DCD7BA"
+                            emphasis_1 "#DCD7CD"
+                            emphasis_2 "#DCD8DD"
+                            emphasis_3 "#DCD899"
+                            emphasis_4 "#ACD7CD"
+                            background   "#1F1F28"
+                        }
+                    }
+                }
+            }
+            "##;
+
+        let config = Config::from_kdl(config_contents, None).unwrap();
+        let mut expected_themes = HashMap::new();
+        expected_themes.insert(
+            "named_theme".into(),
+            Theme {
+                palette: Styling {
+                    text_unselected: StyleDeclaration {
+                        base: PaletteColor::Rgb((220, 215, 186)),
+                        emphasis_1: PaletteColor::Rgb((220, 215, 205)),
+                        emphasis_2: PaletteColor::Rgb((220, 216, 221)),
+                        emphasis_3: PaletteColor::Rgb((220, 216, 153)),
+                        emphasis_4: PaletteColor::Rgb((172, 215, 205)),
+                        background: PaletteColor::Rgb((31, 31, 40)),
+                    },
+                    ..Default::default()
+                },
+            },
+        );
+        let expected_themes = Themes::from_data(expected_themes);
+        assert_eq!(config.themes, expected_themes, "Theme defined in config")
+    }
+
     #[test]
     fn can_define_plugin_configuration_in_configfile() {
         let config_contents = r#"