@@ -390,8 +390,23 @@ impl ThemePalette {
390 Self { palette: default }
390 Self { palette: default }
393− pub fn hex_string_to_rgb(s: &str) -> Result<Color, String> {
393+ pub fn string_to_rgb(s: &str) -> Result<Color, String> {
394− if s.starts_with('#') && s.len() >= 7 {
394+ if s.starts_with('#') {
395+ Self::hex_string_to_rgb(s)
397+ Self::ansi_string_to_rgb(s)
401+ fn ansi_string_to_rgb(s: &str) -> Result<Color, String> {
402+ if let Ok(index) = s.parse::<u8>() {
403+ return Ok(Color::Indexed(index));
405+ Err(format!("Theme: malformed ANSI: {}", s))
408+ fn hex_string_to_rgb(s: &str) -> Result<Color, String> {
395 if let (Ok(red), Ok(green), Ok(blue)) = (
410 if let (Ok(red), Ok(green), Ok(blue)) = (
396 u8::from_str_radix(&s[1..3], 16),
411 u8::from_str_radix(&s[1..3], 16),
397 u8::from_str_radix(&s[3..5], 16),
412 u8::from_str_radix(&s[3..5], 16),
@@ -417,7 +432,7 @@ impl ThemePalette {
417 .get(value)
432 .get(value)
418 .copied()
433 .copied()
419 .ok_or("")
434 .ok_or("")
420− .or_else(|_| Self::hex_string_to_rgb(value))
435+ .or_else(|_| Self::string_to_rgb(value))
423 pub fn parse_modifier(value: &Value) -> Result<Modifier, String> {
438 pub fn parse_modifier(value: &Value) -> Result<Modifier, String> {
@@ -493,7 +508,7 @@ impl TryFrom<Value> for ThemePalette {
493 let mut palette = HashMap::with_capacity(map.len());
508 let mut palette = HashMap::with_capacity(map.len());
494 for (name, value) in map {
509 for (name, value) in map {
495 let value = Self::parse_value_as_str(&value)?;
510 let value = Self::parse_value_as_str(&value)?;
496− let color = Self::hex_string_to_rgb(value)?;
511+ let color = Self::string_to_rgb(value)?;
497 palette.insert(name, color);
512 palette.insert(name, color);