From edc61d428c9045982030cf2b54ea20ef8cd5baab Mon Sep 17 00:00:00 2001
From: Clement Tsang <34804052+ClementTsang@users.noreply.github.com>
Date: Sat, 18 Feb 2023 00:51:13 -0500
Subject: bug: fix selected text bg colour being wrong if only the fg colour
 was set (#1021)

* rename file to be more generic

* fix selected text BG colour being wrong by default

* update changelog

* add test for bug
---
 src/bin/main.rs                           |   2 +-
 src/canvas.rs                             |   4 +-
 src/canvas/canvas_colours.rs              | 370 ---------------------------
 src/canvas/canvas_colours/colour_utils.rs | 217 ----------------
 src/canvas/canvas_styling.rs              | 410 ++++++++++++++++++++++++++++++
 src/canvas/canvas_styling/colour_utils.rs | 192 ++++++++++++++
 src/components/data_table/styling.rs      |   2 +-
 src/options.rs                            |   2 +-
 src/widgets/cpu_graph.rs                  |   2 +-
 src/widgets/disk_table.rs                 |   2 +-
 src/widgets/process_table.rs              |   2 +-
 src/widgets/temperature_table.rs          |   2 +-
 12 files changed, 611 insertions(+), 596 deletions(-)
 delete mode 100644 src/canvas/canvas_colours.rs
 delete mode 100644 src/canvas/canvas_colours/colour_utils.rs
 create mode 100644 src/canvas/canvas_styling.rs
 create mode 100644 src/canvas/canvas_styling/colour_utils.rs

(limited to 'src')

diff --git a/src/bin/main.rs b/src/bin/main.rs
index 328cd7a0..946ca1aa 100644
--- a/src/bin/main.rs
+++ b/src/bin/main.rs
@@ -19,7 +19,7 @@ use std::{
 
 use anyhow::{Context, Result};
 use bottom::{
-    canvas::{self, canvas_colours::CanvasColours},
+    canvas::{self, canvas_styling::CanvasColours},
     constants::*,
     data_conversion::*,
     options::*,
diff --git a/src/canvas.rs b/src/canvas.rs
index b1eca362..9ac75585 100644
--- a/src/canvas.rs
+++ b/src/canvas.rs
@@ -1,6 +1,6 @@
 use std::str::FromStr;
 
-use canvas_colours::*;
+use canvas_styling::*;
 use itertools::izip;
 use tui::{
     backend::Backend,
@@ -21,7 +21,7 @@ use crate::{
     utils::error::BottomError,
 };
 
-pub mod canvas_colours;
+pub mod canvas_styling;
 mod dialogs;
 mod drawing_utils;
 mod widgets;
diff --git a/src/canvas/canvas_colours.rs b/src/canvas/canvas_colours.rs
deleted file mode 100644
index e7996a32..00000000
--- a/src/canvas/canvas_colours.rs
+++ /dev/null
@@ -1,370 +0,0 @@
-use std::borrow::Cow;
-
-use anyhow::Context;
-use colour_utils::*;
-use tui::style::{Color, Style};
-
-use super::ColourScheme;
-use crate::{
-    constants::*,
-    options::{Config, ConfigColours},
-    utils::error,
-};
-mod colour_utils;
-
-pub struct CanvasColours {
-    pub currently_selected_text_colour: Color,
-    pub currently_selected_bg_colour: Color,
-    pub currently_selected_text_style: Style,
-    pub table_header_style: Style,
-    pub ram_style: Style,
-    pub swap_style: Style,
-    pub arc_style: Style,
-    pub gpu_colour_styles: Vec<Style>,
-    pub rx_style: Style,
-    pub tx_style: Style,
-    pub total_rx_style: Style,
-    pub total_tx_style: Style,
-    pub all_colour_style: Style,
-    pub avg_colour_style: Style,
-    pub cpu_colour_styles: Vec<Style>,
-    pub border_style: Style,
-    pub highlighted_border_style: Style,
-    pub text_style: Style,
-    pub widget_title_style: Style,
-    pub graph_style: Style,
-    pub high_battery_colour: Style,
-    pub medium_battery_colour: Style,
-    pub low_battery_colour: Style,
-    pub invalid_query_style: Style,
-    pub disabled_text_style: Style,
-}
-
-impl Default for CanvasColours {
-    fn default() -> Self {
-        let text_colour = Color::Gray;
-
-        CanvasColours {
-            currently_selected_text_colour: Color::Black,
-            currently_selected_bg_colour: Color::Cyan,
-            currently_selected_text_style: Style::default().fg(Color::Black).bg(HIGHLIGHT_COLOUR),
-            table_header_style: Style::default().fg(HIGHLIGHT_COLOUR),
-            ram_style: Style::default().fg(FIRST_COLOUR),
-            swap_style: Style::default().fg(SECOND_COLOUR),
-            arc_style: Style::default().fg(THIRD_COLOUR),
-            gpu_colour_styles: vec![
-                Style::default().fg(FOURTH_COLOUR),
-                Style::default().fg(Color::LightBlue),
-                Style::default().fg(Color::LightRed),
-                Style::default().fg(Color::Cyan),
-                Style::default().fg(Color::Green),
-                Style::default().fg(Color::Blue),
-                Style::default().fg(Color::Red),
-            ],
-            rx_style: Style::default().fg(FIRST_COLOUR),
-            tx_style: Style::default().fg(SECOND_COLOUR),
-            total_rx_style: Style::default().fg(THIRD_COLOUR),
-            total_tx_style: Style::default().fg(FOURTH_COLOUR),
-            all_colour_style: Style::default().fg(ALL_COLOUR),
-            avg_colour_style: Style::default().fg(AVG_COLOUR),
-            cpu_colour_styles: vec![
-                Style::default().fg(Color::LightMagenta),
-                Style::default().fg(Color::LightYellow),
-                Style::default().fg(Color::LightCyan),
-                Style::default().fg(Color::LightGreen),
-                Style::default().fg(Color::LightBlue),
-                Style::default().fg(Color::Cyan),
-                Style::default().fg(Color::Green),
-                Style::default().fg(Color::Blue),
-            ],
-            border_style: Style::default().fg(text_colour),
-            highlighted_border_style: Style::default().fg(HIGHLIGHT_COLOUR),
-            text_style: Style::default().fg(text_colour),
-            widget_title_style: Style::default().fg(text_colour),
-            graph_style: Style::default().fg(text_colour),
-            high_battery_colour: Style::default().fg(Color::Green),
-            medium_battery_colour: Style::default().fg(Color::Yellow),
-            low_battery_colour: Style::default().fg(Color::Red),
-            invalid_query_style: Style::default().fg(tui::style::Color::Red),
-            disabled_text_style: Style::default().fg(Color::DarkGray),
-        }
-    }
-}
-
-impl CanvasColours {
-    pub fn new(colour_scheme: ColourScheme, config: &Config) -> anyhow::Result<Self> {
-        let mut canvas_colours = Self::default();
-
-        match colour_scheme {
-            ColourScheme::Default => {}
-            ColourScheme::DefaultLight => {
-                canvas_colours.set_colours_from_palette(&DEFAULT_LIGHT_MODE_COLOUR_PALETTE)?;
-            }
-            ColourScheme::Gruvbox => {
-                canvas_colours.set_colours_from_palette(&GRUVBOX_COLOUR_PALETTE)?;
-            }
-            ColourScheme::GruvboxLight => {
-                canvas_colours.set_colours_from_palette(&GRUVBOX_LIGHT_COLOUR_PALETTE)?;
-            }
-            ColourScheme::Nord => {
-                canvas_colours.set_colours_from_palette(&NORD_COLOUR_PALETTE)?;
-            }
-            ColourScheme::NordLight => {
-                canvas_colours.set_colours_from_palette(&NORD_LIGHT_COLOUR_PALETTE)?;
-            }
-            ColourScheme::Custom => {
-                if let Some(colors) = &config.colors {
-                    canvas_colours.set_colours_from_palette(colors)?;
-                }
-            }
-        }
-
-        Ok(canvas_colours)
-    }
-
-    pub fn set_colours_from_palette(&mut self, colours: &ConfigColours) -> anyhow::Result<()> {
-        if let Some(border_color) = &colours.border_color {
-            self.set_border_colour(border_color)
-                .context("Update 'border_color' in your config file..")?;
-        }
-
-        if let Some(highlighted_border_color) = &colours.highlighted_border_color {
-            self.set_highlighted_border_colour(highlighted_border_color)
-                .context("Update 'highlighted_border_color' in your config file..")?;
-        }
-
-        if let Some(text_color) = &colours.text_color {
-            self.set_text_colour(text_color)
-                .context("Update 'text_color' in your config file..")?;
-        }
-
-        if let Some(avg_cpu_color) = &colours.avg_cpu_color {
-            self.set_avg_cpu_colour(avg_cpu_color)
-                .context("Update 'avg_cpu_color' in your config file..")?;
-        }
-
-        if let Some(all_cpu_color) = &colours.all_cpu_color {
-            self.set_all_cpu_colour(all_cpu_color)
-                .context("Update 'all_cpu_color' in your config file..")?;
-        }
-
-        if let Some(cpu_core_colors) = &colours.cpu_core_colors {
-            self.set_cpu_colours(cpu_core_colors)
-                .context("Update 'cpu_core_colors' in your config file..")?;
-        }
-
-        if let Some(ram_color) = &colours.ram_color {
-            self.set_ram_colour(ram_color)
-                .context("Update 'ram_color' in your config file..")?;
-        }
-
-        if let Some(swap_color) = &colours.swap_color {
-            self.set_swap_colour(swap_color)
-                .context("Update 'swap_color' in your config file..")?;
-        }
-
-        if let Some(arc_color) = &colours.arc_color {
-            self.set_arc_colour(arc_color)
-                .context("Update 'arc_color' in your config file..")?;
-        }
-
-        if let Some(gpu_core_colors) = &colours.gpu_core_colors {
-            self.set_gpu_colours(gpu_core_colors)
-                .context("Update 'gpu_core_colors' in your config file..")?;
-        }
-
-        if let Some(rx_color) = &colours.rx_color {
-            self.set_rx_colour(rx_color)
-                .context("Update 'rx_color' in your config file..")?;
-        }
-
-        if let Some(tx_color) = &colours.tx_color {
-            self.set_tx_colour(tx_color)
-                .context("Update 'tx_color' in your config file..")?;
-        }
-
-        if let Some(table_header_color) = &colours.table_header_color {
-            self.set_table_header_colour(table_header_color)
-                .context("Update 'table_header_color' in your config file..")?;
-        }
-
-        if let Some(scroll_entry_text_color) = &colours.selected_text_color {
-            self.set_scroll_entry_text_color(scroll_entry_text_color)
-                .context("Update 'selected_text_color' in your config file..")?;
-        }
-
-        if let Some(scroll_entry_bg_color) = &colours.selected_bg_color {
-            self.set_scroll_entry_bg_color(scroll_entry_bg_color)
-                .context("Update 'selected_bg_color' in your config file..")?;
-        }
-
-        if let Some(widget_title_color) = &colours.widget_title_color {
-            self.set_widget_title_colour(widget_title_color)
-                .context("Update 'widget_title_color' in your config file..")?;
-        }
-
-        if let Some(graph_color) = &colours.graph_color {
-            self.set_graph_colour(graph_color)
-                .context("Update 'graph_color' in your config file..")?;
-        }
-
-        if let Some(high_battery_color) = &colours.high_battery_color {
-            self.set_high_battery_color(high_battery_color)
-                .context("Update 'high_battery_color' in your config file.")?;
-        }
-
-        if let Some(medium_battery_color) = &colours.medium_battery_color {
-            self.set_medium_battery_color(medium_battery_color)
-                .context("Update 'medium_battery_color' in your config file.")?;
-        }
-
-        if let Some(low_battery_color) = &colours.low_battery_color {
-            self.set_low_battery_color(low_battery_color)
-                .context("Update 'low_battery_color' in your config file.")?;
-        }
-
-        if let Some(disabled_text_color) = &colours.disabled_text_color {
-            self.set_disabled_text_colour(disabled_text_color)
-                .context("Update 'disabled_text_color' in your config file.")?;
-        }
-
-        if let Some(rx_total_color) = &colours.rx_total_color {
-            self.set_rx_total_colour(rx_total_color)?;
-        }
-
-        if let Some(tx_total_color) = &colours.tx_total_color {
-            self.set_tx_total_colour(tx_total_color)?;
-        }
-
-        Ok(())
-    }
-
-    pub fn set_disabled_text_colour(&mut self, colour: &str) -> error::Result<()> {
-        self.disabled_text_style = get_style_from_config(colour)?;
-        Ok(())
-    }
-
-    pub fn set_text_colour(&mut self, colour: &str) -> error::Result<()> {
-        self.text_style = get_style_from_config(colour)?;
-        Ok(())
-    }
-
-    pub fn set_border_colour(&mut self, colour: &str) -> error::Result<()> {
-        self.border_style = get_style_from_config(colour)?;
-        Ok(())
-    }
-
-    pub fn set_highlighted_border_colour(&mut self, colour: &str) -> error::Result<()> {
-        self.highlighted_border_style = get_style_from_config(colour)?;
-        Ok(())
-    }
-
-    pub fn set_table_header_colour(&mut self, colour: &str) -> error::Result<()> {
-        self.table_header_style = get_style_from_config(colour)?;
-        // Disabled as it seems to be bugged when I go into full command mode...?  It becomes huge lol
-        // self.table_header_style = get_style_from_config(colour)?.modifier(Modifier::BOLD);
-        Ok(())
-    }
-
-    pub fn set_ram_colour(&mut self, colour: &str) -> error::Result<()> {
-        self.ram_style = get_style_from_config(colour)?;
-        Ok(())
-    }
-
-    pub fn set_swap_colour(&mut self, colour: &str) -> error::Result<()> {
-        self.swap_style = get_style_from_config(colour)?;
-        Ok(())
-    }
-
-    pub fn set_arc_colour(&mut self, colour: &str) -> error::Result<()> {
-        self.arc_style = get_style_from_config(colour)?;
-        Ok(())
-    }
-
-    pub fn set_gpu_colours(&mut self, colours: &[Cow<'static, str>]) -> error::Result<()> {
-        self.gpu_colour_styles = colours
-            .iter()
-            .map(|colour| get_style_from_config(colour))
-            .collect::<error::Result<Vec<Style>>>()?;
-        Ok(())
-    }
-
-    pub fn set_rx_colour(&mut self, colour: &str) -> error::Result<()> {
-        self.rx_style = get_style_from_config(colour)?;
-        Ok(())
-    }
-
-    pub fn set_tx_colour(&mut self, colour: &str) -> error::Result<()> {
-        self.tx_style = get_style_from_config(colour)?;
-        Ok(())
-    }
-
-    pub fn set_rx_total_colour(&mut self, colour: &str) -> error::Result<()> {
-        self.total_rx_style = get_style_from_config(colour)?;
-        Ok(())
-    }
-
-    pub fn set_tx_total_colour(&mut self, colour: &str) -> error::Result<()> {
-        self.total_tx_style = get_style_from_config(colour)?;
-        Ok(())
-    }
-
-    pub fn set_avg_cpu_colour(&mut self, colour: &str) -> error::Result<()> {
-        self.avg_colour_style = get_style_from_config(colour)?;
-        Ok(())
-    }
-
-    pub fn set_all_cpu_colour(&mut self, colour: &str) -> error::Result<()> {
-        self.all_colour_style = get_style_from_config(colour)?;
-        Ok(())
-    }
-
-    pub fn set_cpu_colours(&mut self, colours: &[Cow<'static, str>]) -> error::Result<()> {
-        self.cpu_colour_styles = colours
-            .iter()
-            .map(|colour| get_style_from_config(colour))
-            .collect::<error::Result<Vec<Style>>>()?;
-        Ok(())
-    }
-
-    pub fn set_scroll_entry_text_color(&mut self, colour: &str) -> error::Result<()> {
-        self.currently_selected_text_colour = get_colour_from_config(colour)?;
-        self.currently_selected_text_style = Style::default()
-            .fg(self.currently_selected_text_colour)
-            .bg(self.currently_selected_bg_colour);
-        Ok(())
-    }
-
-    pub fn set_scroll_entry_bg_color(&mut self, colour: &str) -> error::Result<()> {
-        self.currently_selected_bg_colour = get_colour_from_config(colour)?;
-        self.currently_selected_text_style = Style::default()
-            .fg(self.currently_selected_text_colour)
-            .bg(self.currently_selected_bg_colour);
-        Ok(())
-    }
-
-    pub fn set_widget_title_colour(&mut self, colour: &str) -> error::Result<()> {
-        self.widget_title_style = get_style_from_config(colour)?;
-        Ok(())
-    }
-
-    pub fn set_graph_colour(&mut self, colour: &str) -> error::Result<()> {
-        self.graph_style = get_style_from_config(colour)?;
-        Ok(())
-    }
-
-    pub fn set_high_battery_color(&mut self, colour: &str) -> error::Result<()> {
-        self.high_battery_colour = get_style_from_config(colour)?;
-        Ok(())
-    }
-
-    pub fn set_medium_battery_color(&mut self, colour: &str) -> error::Result<()> {
-        self.medium_battery_colour = get_style_from_config(colour)?;
-        Ok(())
-    }
-
-    pub fn set_low_battery_color(&mut self, colour: &str) -> error::Result<()> {
-        self.low_battery_colour = get_style_from_config(colour)?;
-        Ok(())
-    }
-}
diff --git a/src/canvas/canvas_colours/colour_utils.rs b/src/canvas/canvas_colours/colour_utils.rs
deleted file mode 100644
index c5c4e294..00000000
--- a/src/canvas/canvas_colours/colour_utils.rs
+++ /dev/null
@@ -1,217 +0,0 @@
-use tui::style::{Color, Style};
-
-use crate::utils::error;
-
-pub const FIRST_COLOUR: Color = Color::LightMagenta;
-pub const SECOND_COLOUR: Color = Color::LightYellow;
-pub const THIRD_COLOUR: Color = Color::LightCyan;
-pub const FOURTH_COLOUR: Color = Color::LightGreen;
-pub const HIGHLIGHT_COLOUR: Color = Color::LightBlue;
-pub const AVG_COLOUR: Color = Color::Red;
-pub const ALL_COLOUR: Color = Color::Green;
-
-pub fn convert_hex_to_color(hex: &str) -> error::Result<Color> {
-    fn hex_err(hex: &str) -> error::Result<u8> {
-        Err(
-            error::BottomError::ConfigError(format!(
-                "\"{}\" is an invalid hex colour.  It must be a valid 7 character hex string of the (ie: \"#112233\")."
-            , hex))
-        )
-    }
-
-    fn convert_hex_to_rgb(hex: &str) -> error::Result<(u8, u8, u8)> {
-        let hex_components: Vec<char> = hex.chars().collect();
-
-        if hex_components.len() == 7 {
-            let mut r_string = hex_components[1].to_string();
-            r_string.push(hex_components[2]);
-            let mut g_string = hex_components[3].to_string();
-            g_string.push(hex_components[4]);
-            let mut b_string = hex_components[5].to_string();
-            b_string.push(hex_components[6]);
-
-            let r = u8::from_str_radix(&r_string, 16).or_else(|_err| hex_err(hex))?;
-            let g = u8::from_str_radix(&g_string, 16).or_else(|_err| hex_err(hex))?;
-            let b = u8::from_str_radix(&b_string, 16).or_else(|_err| hex_err(hex))?;
-
-            return Ok((r, g, b));
-        }
-
-        Err(error::BottomError::ConfigError(format!(
-            "\"{}\" is an invalid hex colour.  It must be a 7 character string of the form \"#112233\".",
-            hex
-        )))
-    }
-
-    let rgb = convert_hex_to_rgb(hex)?;
-    Ok(Color::Rgb(rgb.0, rgb.1, rgb.2))
-}
-
-pub fn get_style_from_config(input_val: &str) -> error::Result<Style> {
-    if input_val.len() > 1 {
-        if &input_val[0..1] == "#" {
-            get_style_from_hex(input_val)
-        } else if input_val.contains(',') {
-            get_style_from_rgb(input_val)
-        } else {
-            get_style_from_color_name(input_val)
-        }
-    } else {
-        Err(error::BottomError::ConfigError(format!(
-            "value \"{}\" is not valid.",
-            input_val
-        )))
-    }
-}
-
-pub fn get_colour_from_config(input_val: &str) -> error::Result<Color> {
-    if input_val.len() > 1 {
-        if &input_val[0..1] == "#" {
-            convert_hex_to_color(input_val)
-        } else if input_val.contains(',') {
-            convert_rgb_to_color(input_val)
-        } else {
-            convert_name_to_color(input_val)
-        }
-    } else {
-        Err(error::BottomError::ConfigError(format!(
-            "value \"{}\" is not valid.",
-            input_val
-        )))
-    }
-}
-
-pub fn get_style_from_hex(hex: &str) -> error::Result<Style> {
-    Ok(Style::default().fg(convert_hex_to_color(hex)?))
-}
-
-fn convert_rgb_to_color(rgb_str: &str) -> error::Result<Color> {
-    let rgb_list = rgb_str.split(',').collect::<Vec<&str>>();
-    if rgb_list.len() != 3 {
-        return Err(error::BottomError::ConfigError(format!(
-            "value \"{}\" is an invalid RGB colour.  It must be a comma separated value with 3 integers from 0 to 255 (ie: \"255, 0, 155\").",
-            rgb_str
-        )));
-    }
-
-    let rgb = rgb_list
-        .iter()
-        .filter_map(|val| {
-            if let Ok(res) = (*(*val)).to_string().trim().parse::<u8>() {
-                Some(res)
-            } else {
-                None
-            }
-        })
-        .collect::<Vec<_>>();
-    if rgb.len() == 3 {
-        Ok(Color::Rgb(rgb[0], rgb[1], rgb[2]))
-    } else {
-        Err(error::BottomError::ConfigError(format!(
-            "value \"{}\" contained invalid RGB values.  It must be a comma separated value with 3 integers from 0 to 255 (ie: \"255, 0, 155\").",
-            rgb_str
-        )))
-    }
-}
-
-pub fn get_style_from_rgb(rgb_str: &str) -> error::Result<Style> {
-    Ok(Style::default().fg(convert_rgb_to_color(rgb_str)?))
-}
-
-fn convert_name_to_color(color_name: &str) -> error::Result<Color> {
-    match color_name.to_lowercase().trim() {
-        "reset" => Ok(Color::Reset),
-        "black" => Ok(Color::Black),
-        "red" => Ok(Color::Red),
-        "green" => Ok(Color::Green),
-        "yellow" => Ok(Color::Yellow),
-        "blue" => Ok(Color::Blue),
-        "magenta" => Ok(Color::Magenta),
-        "cyan" => Ok(Color::Cyan),
-        "gray" | "grey" => Ok(Color::Gray),
-        "darkgray" | "darkgrey" | "dark gray" | "dark grey" => Ok(Color::DarkGray),
-        "lightred" | "light red" => Ok(Color::LightRed),
-        "lightgreen" | "light green" => Ok(Color::LightGreen),
-        "lightyellow" | "light yellow" => Ok(Color::LightYellow),
-        "lightblue" | "light blue" => Ok(Color::LightBlue),
-        "lightmagenta" | "light magenta" => Ok(Color::LightMagenta),
-        "lightcyan" | "light cyan" => Ok(Color::LightCyan),
-        "white" => Ok(Color::White),
-        _ => Err(error::BottomError::ConfigError(format!(
-            "\"{}\" is an invalid named colour.
-            
-The following are supported strings: 
-+--------+-------------+---------------------+
-|  Reset | Magenta     | Light Yellow        |
-+--------+-------------+---------------------+
-|  Black | Cyan        | Light Blue          |
-+--------+-------------+---------------------+
-|   Red  | Gray/Grey   | Light Magenta       |
-+--------+-------------+---------------------+
-|  Green | Light Cyan  | Dark Gray/Dark Grey |
-+--------+-------------+---------------------+
-| Yellow | Light Red   | White               |
-+--------+-------------+---------------------+
-|  Blue  | Light Green |                     |
-+--------+-------------+---------------------+
-        ",
-            color_name
-        ))),
-    }
-}
-
-pub fn get_style_from_color_name(color_name: &str) -> error::Result<Style> {
-    Ok(Style::default().fg(convert_name_to_color(color_name)?))
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    #[test]
-    fn test_invalid_colours() {
-        // Test invalid spacing in single word.
-        assert!(convert_name_to_color("bl ack").is_err());
-
-        // Test invalid spacing in dual word.
-        assert!(convert_name_to_color("darkg ray").is_err());
-
-        // Test completely invalid colour.
-        assert!(convert_name_to_color("darkreset").is_err());
-    }
-
-    #[test]
-    fn test_valid_colours() {
-        // Standard color should work
-        assert_eq!(convert_name_to_color("red"), Ok(Color::Red));
-
-        // Capitalizing should be fine.
-        assert_eq!(convert_name_to_color("RED"), Ok(Color::Red));
-
-        // Spacing shouldn't be an issue now.
-        assert_eq!(convert_name_to_color(" red "), Ok(Color::Red));
-
-        // The following are all equivalent.
-        assert_eq!(convert_name_to_color("darkgray"), Ok(Color::DarkGray));
-        assert_eq!(convert_name_to_color("darkgrey"), Ok(Color::DarkGray));
-        assert_eq!(convert_name_to_color("dark grey"), Ok(Color::DarkGray));
-        assert_eq!(convert_name_to_color("dark gray"), Ok(Color::DarkGray));
-
-        assert_eq!(convert_name_to_color("grey"), Ok(Color::Gray));
-        assert_eq!(convert_name_to_color("gray"), Ok(Color::Gray));
-
-        // One more test with spacing.
-        assert_eq!(
-            convert_name_to_color(" lightmagenta "),
-            Ok(Color::LightMagenta)
-        );
-        assert_eq!(
-            convert_name_to_color("light magenta"),
-            Ok(Color::LightMagenta)
-        );
-        assert_eq!(
-            convert_name_to_color(" light magenta "),
-            Ok(Color::LightMagenta)
-        );
-    }
-}
diff --git a/src/canvas/canvas_styling.rs b/src/canvas/canvas_styling.rs
new file mode 100644
index 00000000..e0de7285
--- /dev/null
+++ b/src/canvas/canvas_styling.rs
@@ -0,0 +1,410 @@
+use std::borrow::Cow;
+
+use anyhow::Context;
+use colour_utils::*;
+use tui::style::{Color, Style};
+
+use super::ColourScheme;
+use crate::{
+    constants::*,
+    options::{Config, ConfigColours},
+    utils::error,
+};
+mod colour_utils;
+
+pub struct CanvasColours {
+    pub currently_selected_text_colour: Color,
+    pub currently_selected_bg_colour: Color,
+    pub currently_selected_text_style: Style,
+    pub table_header_style: Style,
+    pub ram_style: Style,
+    pub swap_style: Style,
+    pub arc_style: Style,
+    pub gpu_colour_styles: Vec<Style>,
+    pub rx_style: Style,
+    pub tx_style: Style,
+    pub total_rx_style: Style,
+    pub total_tx_style: Style,
+    pub all_colour_style: Style,
+    pub avg_colour_style: Style,
+    pub cpu_colour_styles: Vec<Style>,
+    pub border_style: Style,
+    pub highlighted_border_style: Style,
+    pub text_style: Style,
+    pub widget_title_style: Style,
+    pub graph_style: Style,
+    pub high_battery_colour: Style,
+    pub medium_battery_colour: Style,
+    pub low_battery_colour: Style,
+    pub invalid_query_style: Style,
+    pub disabled_text_style: Style,
+}
+
+impl Default for CanvasColours {
+    fn default() -> Self {
+        let text_colour = Color::Gray;
+        let currently_selected_text_colour = Color::Black;
+        let currently_selected_bg_colour = HIGHLIGHT_COLOUR;
+
+        CanvasColours {
+            currently_selected_text_colour,
+            currently_selected_bg_colour,
+            currently_selected_text_style: Style::default()
+                .fg(currently_selected_text_colour)
+                .bg(currently_selected_bg_colour),
+            table_header_style: Style::default().fg(HIGHLIGHT_COLOUR),
+            ram_style: Style::default().fg(FIRST_COLOUR),
+            swap_style: Style::default().fg(SECOND_COLOUR),
+            arc_style: Style::default().fg(THIRD_COLOUR),
+            gpu_colour_styles: vec![
+                Style::default().fg(FOURTH_COLOUR),
+                Style::default().fg(Color::LightBlue),
+                Style::default().fg(Color::LightRed),
+                Style::default().fg(Color::Cyan),
+                Style::default().fg(Color::Green),
+                Style::default().fg(Color::Blue),
+                Style::default().fg(Color::Red),
+            ],
+            rx_style: Style::default().fg(FIRST_COLOUR),
+            tx_style: Style::default().fg(SECOND_COLOUR),
+            total_rx_style: Style::default().fg(THIRD_COLOUR),
+            total_tx_style: Style::default().fg(FOURTH_COLOUR),
+            all_colour_style: Style::default().fg(ALL_COLOUR),
+            avg_colour_style: Style::default().fg(AVG_COLOUR),
+            cpu_colour_styles: vec![
+                Style::default().fg(Color::LightMagenta),
+                Style::default().fg(Color::LightYellow),
+                Style::default().fg(Color::LightCyan),
+                Style::default().fg(Color::LightGreen),
+                Style::default().fg(Color::LightBlue),
+                Style::default().fg(Color::Cyan),
+                Style::default().fg(Color::Green),
+                Style::default().fg(Color::Blue),
+            ],
+            border_style: Style::default().fg(text_colour),
+            highlighted_border_style: Style::default().fg(HIGHLIGHT_COLOUR),
+            text_style: Style::default().fg(text_colour),
+            widget_title_style: Style::default().fg(text_colour),
+            graph_style: Style::default().fg(text_colour),
+            high_battery_colour: Style::default().fg(Color::Green),
+            medium_battery_colour: Style::default().fg(Color::Yellow),
+            low_battery_colour: Style::default().fg(Color::Red),
+            invalid_query_style: Style::default().fg(tui::style::Color::Red),
+            disabled_text_style: Style::default().fg(Color::DarkGray),
+        }
+    }
+}
+
+impl CanvasColours {
+    pub fn new(colour_scheme: ColourScheme, config: &Config) -> anyhow::Result<Self> {
+        let mut canvas_colours = Self::default();
+
+        match colour_scheme {
+            ColourScheme::Default => {}
+            ColourScheme::DefaultLight => {
+                canvas_colours.set_colours_from_palette(&DEFAULT_LIGHT_MODE_COLOUR_PALETTE)?;
+            }
+            ColourScheme::Gruvbox => {
+                canvas_colours.set_colours_from_palette(&GRUVBOX_COLOUR_PALETTE)?;
+            }
+            ColourScheme::GruvboxLight => {
+                canvas_colours.set_colours_from_palette(&GRUVBOX_LIGHT_COLOUR_PALETTE)?;
+            }
+            ColourScheme::Nord => {
+                canvas_colours.set_colours_from_palette(&NORD_COLOUR_PALETTE)?;
+            }
+            ColourScheme::NordLight => {
+                canvas_colours.set_colours_from_palette(&NORD_LIGHT_COLOUR_PALETTE)?;
+            }
+            ColourScheme::Custom => {
+                if let Some(colors) = &config.colors {
+                    canvas_colours.set_colours_from_palette(colors)?;
+                }
+            }
+        }
+
+        Ok(canvas_colours)
+    }
+
+    pub fn set_colours_from_palette(&mut self, colours: &ConfigColours) -> anyhow::Result<()> {
+        if let Some(border_color) = &colours.border_color {
+            self.set_border_colour(border_color)
+                .context("Update 'border_color' in your config file..")?;
+        }
+
+        if let Some(highlighted_border_color) = &colours.highlighted_border_color {
+            self.set_highlighted_border_colour(highlighted_border_color)
+                .context("Update 'highlighted_border_color' in your config file..")?;
+        }
+
+        if let Some(text_color) = &colours.text_color {
+            self.set_text_colour(text_color)
+                .context("Update 'text_color' in your config file..")?;
+        }
+
+        if let Some(avg_cpu_color) = &colours.avg_cpu_color {
+            self.set_avg_cpu_colour(avg_cpu_color)
+                .context("Update 'avg_cpu_color' in your config file..")?;
+        }
+
+        if let Some(all_cpu_color) = &colours.all_cpu_color {
+            self.set_all_cpu_colour(all_cpu_color)
+                .context("Update 'all_cpu_color' in your config file..")?;
+        }
+
+        if let Some(cpu_core_colors) = &colours.cpu_core_colors {
+            self.set_cpu_colours(cpu_core_colors)
+                .context("Update 'cpu_core_colors' in your config file..")?;
+        }
+
+        if let Some(ram_color) = &colours.ram_color {
+            self.set_ram_colour(ram_color)
+                .context("Update 'ram_color' in your config file..")?;
+        }
+
+        if let Some(swap_color) = &colours.swap_color {
+            self.set_swap_colour(swap_color)
+                .context("Update 'swap_color' in your config file..")?;
+        }
+
+        if let Some(arc_color) = &colours.arc_color {
+            self.set_arc_colour(arc_color)
+                .context("Update 'arc_color' in your config file..")?;
+        }
+
+        if let Some(gpu_core_colors) = &colours.gpu_core_colors {
+            self.set_gpu_colours(gpu_core_colors)
+                .context("Update 'gpu_core_colors' in your config file..")?;
+        }
+
+        if let Some(rx_color) = &colours.rx_color {
+            self.set_rx_colour(rx_color)
+                .context("Update 'rx_color' in your config file..")?;
+        }
+
+        if let Some(tx_color) = &colours.tx_color {
+            self.set_tx_colour(tx_color)
+                .context("Update 'tx_color' in your config file..")?;
+        }
+
+        if let Some(table_header_color) = &colours.table_header_color {
+            self.set_table_header_colour(table_header_color)
+                .context("Update 'table_header_color' in your config file..")?;
+        }
+
+        if let Some(scroll_entry_text_color) = &colours.selected_text_color {
+            self.set_scroll_entry_text_color(scroll_entry_text_color)
+                .context("Update 'selected_text_color' in your config file..")?;
+        }
+
+        if let Some(scroll_entry_bg_color) = &colours.selected_bg_color {
+            self.set_scroll_entry_bg_color(scroll_entry_bg_color)
+                .context("Update 'selected_bg_color' in your config file..")?;
+        }
+
+        if let Some(widget_title_color) = &colours.widget_title_color {
+            self.set_widget_title_colour(widget_title_color)
+                .context("Update 'widget_title_color' in your config file..")?;
+        }
+
+        if let Some(graph_color) = &colours.graph_color {
+            self.set_graph_colour(graph_color)
+                .context("Update 'graph_color' in your config file..")?;
+        }
+
+        if let Some(high_battery_color) = &colours.high_battery_color {
+            self.set_high_battery_color(high_battery_color)
+                .context("Update 'high_battery_color' in your config file.")?;
+        }
+
+        if let Some(medium_battery_color) = &colours.medium_battery_color {
+            self.set_medium_battery_color(medium_battery_color)
+                .context("Update 'medium_battery_color' in your config file.")?;
+        }
+
+        if let Some(low_battery_color) = &colours.low_battery_color {
+            self.set_low_battery_color(low_battery_color)
+                .context("Update 'low_battery_color' in your config file.")?;
+        }
+
+        if let Some(disabled_text_color) = &colours.disabled_text_color {
+            self.set_disabled_text_colour(disabled_text_color)
+                .context("Update 'disabled_text_color' in your config file.")?;
+        }
+
+        if let Some(rx_total_color) = &colours.rx_total_color {
+            self.set_rx_total_colour(rx_total_color)?;
+        }
+
+        if let Some(tx_total_color) = &colours.tx_total_color {
+            self.set_tx_total_colour(tx_total_color)?;
+        }
+
+        Ok(())
+    }
+
+    pub fn set_disabled_text_colour(&mut self, colour: &str) -> error::Result<()> {
+        self.disabled_text_style = str_to_fg(colour)?;
+        Ok(())
+    }
+
+    pub fn set_text_colour(&mut self, colour: &str) -> error::Result<()> {
+        self.text_style = str_to_fg(colour)?;
+        Ok(())
+    }
+
+    pub fn set_border_colour(&mut self, colour: &str) -> error::Result<()> {
+        self.border_style = str_to_fg(colour)?;
+        Ok(())
+    }
+
+    pub fn set_highlighted_border_colour(&mut self, colour: &str) -> error::Result<()> {
+        self.highlighted_border_style = str_to_fg(colour)?;
+        Ok(())
+    }
+
+    pub fn set_table_header_colour(&mut self, colour: &str) -> error::Result<()> {
+        self.table_header_style = str_to_fg(colour)?;
+        // Disabled as it seems to be bugged when I go into full command mode...?  It becomes huge lol
+        // self.table_header_style = get_style_from_config(colour)?.modifier(Modifier::BOLD);
+        Ok(())
+    }
+
+    pub fn set_ram_colour(&mut self, colour: &str) -> error::Result<()> {
+        self.ram_style = str_to_fg(colour)?;
+        Ok(())
+    }
+
+    pub fn set_swap_colour(&mut self, colour: &str) -> error::Result<()> {
+        self.swap_style = str_to_fg(colour)?;
+        Ok(())
+    }
+
+    pub fn set_arc_colour(&mut self, colour: &str) -> error::Result<()> {
+        self.arc_style = str_to_fg(colour)?;
+        Ok(())
+    }
+
+    pub fn set_gpu_colours(&mut self, colours: &[Cow<'static, str>]) -> error::Result<()> {
+        self.gpu_colour_styles = colours
+            .iter()
+            .map(|colour| str_to_fg(colour))
+            .collect::<error::Result<Vec<Style>>>()?;
+        Ok(())
+    }
+
+    pub fn set_rx_colour(&mut self, colour: &str) -> error::Result<()> {
+        self.rx_style = str_to_fg(colour)?;
+        Ok(())
+    }
+
+    pub fn set_tx_colour(&mut self, colour: &str) -> error::Result<()> {
+        self.tx_style = str_to_fg(colour)?;
+        Ok(())
+    }
+
+    pub fn set_rx_total_colour(&mut self, colour: &str) -> error::Result<()> {
+        self.total_rx_style = str_to_fg(colour)?;
+        Ok(())
+    }
+
+    pub fn set_tx_total_colour(&mut self, colour: &str) -> error::Result<()> {
+        self.total_tx_style = str_to_fg(colour)?;
+        Ok(())
+    }
+
+    pub fn set_avg_cpu_colour(&mut self, colour: &str) -> error::Result<()> {
+        self.avg_colour_style = str_to_fg(colour)?;
+        Ok(())
+    }
+
+    pub fn set_all_cpu_colour(&mut self, colour: &str) -> error::Result<()> {
+        self.all_colour_style = str_to_fg(colour)?;
+        Ok(())
+    }
+
+    pub fn set_cpu_colours(&mut self, colours: &[Cow<'static, str>]) -> error::Result<()> {
+        self.cpu_colour_styles = colours
+            .iter()
+            .map(|colour| str_to_fg(colour))
+            .collect::<error::Result<Vec<Style>>>()?;
+        Ok(())
+    }
+
+    pub fn set_scroll_entry_text_color(&mut self, colour: &str) -> error::Result<()> {
+        self.currently_selected_text_colour = str_to_colour(colour)?;
+        self.currently_selected_text_style = Style::default()
+            .fg(self.currently_selected_text_colour)
+            .bg(self.currently_selected_bg_colour);
+        Ok(())
+    }
+
+    pub fn set_scroll_entry_bg_color(&mut self, colour: &str) -> error::Result<()> {
+        self.currently_selected_bg_colour = str_to_colour(colour)?;
+        self.currently_selected_text_style = Style::default()
+            .fg(self.currently_selected_text_colour)
+            .bg(self.currently_selected_bg_colour);
+        Ok(())
+    }
+
+    pub fn set_widget_title_colour(&mut self, colour: &str) -> error::Result<()> {
+        self.widget_title_style = str_to_fg(colour)?;
+        Ok(())
+    }
+
+    pub fn set_graph_colour(&mut self, colour: &str) -> error::Result<()> {
+        self.graph_style = str_to_fg(colour)?;
+        Ok(())
+    }
+
+    pub fn set_high_battery_color(&mut self, colour: &str) -> error::Result<()> {
+        self.high_battery_colour = str_to_fg(colour)?;
+        Ok(())
+    }
+
+    pub fn set_medium_battery_color(&mut self, colour: &str) -> error::Result<()> {
+        self.medium_battery_colour = str_to_fg(colour)?;
+        Ok(())
+    }
+
+    pub fn set_low_battery_color(&mut self, colour: &str) -> error::Result<()> {
+        self.low_battery_colour = str_to_fg(colour)?;
+        Ok(())
+    }
+}
+
+#[cfg(test)]
+mod test {
+
+    use tui::style::{Color, Style};
+
+    use super::CanvasColours;
+
+    #[test]
+    fn default_selected_colour_works() {
+        let mut colours = CanvasColours::default();
+
+        assert_eq!(
+            colours.currently_selected_text_style,
+            Style::default()
+                .fg(colours.currently_selected_text_colour)
+                .bg(colours.currently_selected_bg_colour),
+        );
+
+        colours.set_scroll_entry_text_color("red").unwrap();
+
+        assert_eq!(
+            colours.currently_selected_text_style,
+            Style::default()
+                .fg(Color::Red)
+                .bg(colours.currently_selected_bg_colour),
+        );
+
+        colours.set_scroll_entry_bg_color("magenta").unwrap();
+
+        assert_eq!(
+            colours.currently_selected_text_style,
+            Style::default().fg(Color::Red).bg(Color::Magenta),
+        );
+    }
+}
diff --git a/src/canvas/canvas_styling/colour_utils.rs b/src/canvas/canvas_styling/colour_utils.rs
new file mode 100644
index 00000000..89b1b170
--- /dev/null
+++ b/src/canvas/canvas_styling/colour_utils.rs
@@ -0,0 +1,192 @@
+use tui::style::{Color, Style};
+
+use crate::utils::error;
+
+pub const FIRST_COLOUR: Color = Color::LightMagenta;
+pub const SECOND_COLOUR: Color = Color::LightYellow;
+pub const THIRD_COLOUR: Color = Color::LightCyan;
+pub const FOURTH_COLOUR: Color = Color::LightGreen;
+pub const HIGHLIGHT_COLOUR: Color = Color::LightBlue;
+pub const AVG_COLOUR: Color = Color::Red;
+pub const ALL_COLOUR: Color = Color::Green;
+
+fn convert_hex_to_color(hex: &str) -> error::Result<Color> {
+    fn hex_err(hex: &str) -> error::Result<u8> {
+        Err(
+            error::BottomError::ConfigError(format!(
+                "\"{}\" is an invalid hex colour.  It must be a valid 7 character hex string of the (ie: \"#112233\")."
+            , hex))
+        )
+    }
+
+    fn convert_hex_to_rgb(hex: &str) -> error::Result<(u8, u8, u8)> {
+        let hex_components: Vec<char> = hex.chars().collect();
+
+        if hex_components.len() == 7 {
+            let mut r_string = hex_components[1].to_string();
+            r_string.push(hex_components[2]);
+            let mut g_string = hex_components[3].to_string();
+            g_string.push(hex_components[4]);
+            let mut b_string = hex_components[5].to_string();
+            b_string.push(hex_components[6]);
+
+            let r = u8::from_str_radix(&r_string, 16).or_else(|_err| hex_err(hex))?;
+            let g = u8::from_str_radix(&g_string, 16).or_else(|_err| hex_err(hex))?;
+            let b = u8::from_str_radix(&b_string, 16).or_else(|_err| hex_err(hex))?;
+
+            return Ok((r, g, b));
+        }
+
+        Err(error::BottomError::ConfigError(format!(
+            "\"{}\" is an invalid hex colour.  It must be a 7 character string of the form \"#112233\".",
+            hex
+        )))
+    }
+
+    let rgb = convert_hex_to_rgb(hex)?;
+    Ok(Color::Rgb(rgb.0, rgb.1, rgb.2))
+}
+
+pub fn str_to_fg(input_val: &str) -> error::Result<Style> {
+    Ok(Style::default().fg(str_to_colour(input_val)?))
+}
+
+pub fn str_to_colour(input_val: &str) -> error::Result<Color> {
+    if input_val.len() > 1 {
+        if input_val.starts_with('#') {
+            convert_hex_to_color(input_val)
+        } else if input_val.contains(',') {
+            convert_rgb_to_color(input_val)
+        } else {
+            convert_name_to_color(input_val)
+        }
+    } else {
+        Err(error::BottomError::ConfigError(format!(
+            "value \"{}\" is not valid.",
+            input_val
+        )))
+    }
+}
+
+fn convert_rgb_to_color(rgb_str: &str) -> error::Result<Color> {
+    let rgb_list = rgb_str.split(',').collect::<Vec<&str>>();
+    if rgb_list.len() != 3 {
+        return Err(error::BottomError::ConfigError(format!(
+            "value \"{}\" is an invalid RGB colour.  It must be a comma separated value with 3 integers from 0 to 255 (ie: \"255, 0, 155\").",
+            rgb_str
+        )));
+    }
+
+    let rgb = rgb_list
+        .iter()
+        .filter_map(|val| {
+            if let Ok(res) = (*(*val)).to_string().trim().parse::<u8>() {
+                Some(res)
+            } else {
+                None
+            }
+        })
+        .collect::<Vec<_>>();
+    if rgb.len() == 3 {
+        Ok(Color::Rgb(rgb[0], rgb[1], rgb[2]))
+    } else {
+        Err(error::BottomError::ConfigError(format!(
+            "value \"{}\" contained invalid RGB values.  It must be a comma separated value with 3 integers from 0 to 255 (ie: \"255, 0, 155\").",
+            rgb_str
+        )))
+    }
+}
+
+fn convert_name_to_color(color_name: &str) -> error::Result<Color> {
+    match color_name.to_lowercase().trim() {
+        "reset" => Ok(Color::Reset),
+        "black" => Ok(Color::Black),
+        "red" => Ok(Color::Red),
+        "green" => Ok(Color::Green),
+        "yellow" => Ok(Color::Yellow),
+        "blue" => Ok(Color::Blue),
+        "magenta" => Ok(Color::Magenta),
+        "cyan" => Ok(Color::Cyan),
+        "gray" | "grey" => Ok(Color::Gray),
+        "darkgray" | "darkgrey" | "dark gray" | "dark grey" => Ok(Color::DarkGray),
+        "lightred" | "light red" => Ok(Color::LightRed),
+        "lightgreen" | "light green" => Ok(Color::LightGreen),
+        "lightyellow" | "light yellow" => Ok(Color::LightYellow),
+        "lightblue" | "light blue" => Ok(Color::LightBlue),
+        "lightmagenta" | "light magenta" => Ok(Color::LightMagenta),
+        "lightcyan" | "light cyan" => Ok(Color::LightCyan),
+        "white" => Ok(Color::White),
+        _ => Err(error::BottomError::ConfigError(format!(
+            "\"{}\" is an invalid named colour.
+            
+The following are supported strings: 
++--------+-------------+---------------------+
+|  Reset | Magenta     | Light Yellow        |
++--------+-------------+---------------------+
+|  Black | Cyan        | Light Blue          |
++--------+-------------+---------------------+
+|   Red  | Gray/Grey   | Light Magenta       |
++--------+-------------+---------------------+
+|  Green | Light Cyan  | Dark Gray/Dark Grey |
++--------+-------------+---------------------+
+| Yellow | Light Red   | White               |
++--------+-------------+---------------------+
+|  Blue  | Light Green |                     |
++--------+-------------+---------------------+
+        ",
+            color_name
+        ))),
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn test_invalid_colours() {
+        // Test invalid spacing in single word.
+        assert!(convert_name_to_color("bl ack").is_err());
+
+        // Test invalid spacing in dual word.
+        assert!(convert_name_to_color("darkg ray").is_err());
+
+        // Test completely invalid colour.
+        assert!(convert_name_to_color("darkreset").is_err());
+    }
+
+    #[test]
+    fn test_valid_colours() {
+        // Standard color should work
+        assert_eq!(convert_name_to_color("red"), Ok(Color::Red));
+
+        // Capitalizing should be fine.
+        assert_eq!(convert_name_to_color("RED"), Ok(Color::Red));
+
+        // Spacing shouldn't be an issue now.
+        assert_eq!(convert_name_to_color(" red "), Ok(Color::Red));
+
+        // The following are all equivalent.
+        assert_eq!(convert_name_to_color("darkgray"), Ok(Color::DarkGray));
+        assert_eq!(convert_name_to_color("darkgrey"), Ok(Color::DarkGray));
+        assert_eq!(convert_name_to_color("dark grey"), Ok(Color::DarkGray));
+        assert_eq!(convert_name_to_color("dark gray"), Ok(Color::DarkGray));
+
+        assert_eq!(convert_name_to_color("grey"), Ok(Color::Gray));
+        assert_eq!(convert_name_to_color("gray"), Ok(Color::Gray));
+
+        // One more test with spacing.
+        assert_eq!(
+            convert_name_to_color(" lightmagenta "),
+            Ok(Color::LightMagenta)
+        );
+        assert_eq!(
+            convert_name_to_color("light magenta"),
+            Ok(Color::LightMagenta)
+        );
+        assert_eq!(
+            convert_name_to_color(" light magenta "),
+            Ok(Color::LightMagenta)
+        );
+    }
+}
diff --git a/src/components/data_table/styling.rs b/src/components/data_table/styling.rs
index 241bc3ff..2f871887 100644
--- a/src/components/data_table/styling.rs
+++ b/src/components/data_table/styling.rs
@@ -1,6 +1,6 @@
 use tui::style::Style;
 
-use crate::canvas::canvas_colours::CanvasColours;
+use crate::canvas::canvas_styling::CanvasColours;
 
 #[derive(Default)]
 pub struct DataTableStyling {
diff --git a/src/options.rs b/src/options.rs
index 28c49a61..c72aaa52 100644
--- a/src/options.rs
+++ b/src/options.rs
@@ -18,7 +18,7 @@ use typed_builder::*;
 
 use crate::{
     app::{layout_manager::*, *},
-    canvas::{canvas_colours::CanvasColours, ColourScheme},
+    canvas::{canvas_styling::CanvasColours, ColourScheme},
     constants::*,
     units::data_units::DataUnit,
     utils::error::{self, BottomError},
diff --git a/src/widgets/cpu_graph.rs b/src/widgets/cpu_graph.rs
index 3d68b889..f4e95328 100644
--- a/src/widgets/cpu_graph.rs
+++ b/src/widgets/cpu_graph.rs
@@ -5,7 +5,7 @@ use tui::{style::Style, text::Text, widgets::Row};
 
 use crate::{
     app::{data_harvester::cpu::CpuDataType, AppConfigFields},
-    canvas::{canvas_colours::CanvasColours, Painter},
+    canvas::{canvas_styling::CanvasColours, Painter},
     components::data_table::{
         Column, ColumnHeader, DataTable, DataTableColumn, DataTableProps, DataTableStyling,
         DataToCell,
diff --git a/src/widgets/disk_table.rs b/src/widgets/disk_table.rs
index 19bee86f..494c01b5 100644
--- a/src/widgets/disk_table.rs
+++ b/src/widgets/disk_table.rs
@@ -5,7 +5,7 @@ use tui::text::Text;
 
 use crate::{
     app::AppConfigFields,
-    canvas::canvas_colours::CanvasColours,
+    canvas::canvas_styling::CanvasColours,
     components::data_table::{
         ColumnHeader, DataTableColumn, DataTableProps, DataTableStyling, DataToCell, SortColumn,
         SortDataTable, SortDataTableProps, SortOrder, SortsRow,
diff --git a/src/widgets/process_table.rs b/src/widgets/process_table.rs
index f6515f97..830c5aad 100644
--- a/src/widgets/process_table.rs
+++ b/src/widgets/process_table.rs
@@ -11,7 +11,7 @@ use crate::{
         query::*,
         AppConfigFields, AppSearchState,
     },
-    canvas::canvas_colours::CanvasColours,
+    canvas::canvas_styling::CanvasColours,
     components::data_table::{
         Column, ColumnHeader, ColumnWidthBounds, DataTable, DataTableColumn, DataTableProps,
         DataTableStyling, SortColumn, SortDataTable, SortDataTableProps, SortOrder, SortsRow,
diff --git a/src/widgets/temperature_table.rs b/src/widgets/temperature_table.rs
index 4db6567f..d71c518d 100644
--- a/src/widgets/temperature_table.rs
+++ b/src/widgets/temperature_table.rs
@@ -6,7 +6,7 @@ use tui::text::Text;
 
 use crate::{
     app::{data_harvester::temperature::TemperatureType, AppConfigFields},
-    canvas::canvas_colours::CanvasColours,
+    canvas::canvas_styling::CanvasColours,
     components::data_table::{
         ColumnHeader, DataTableColumn, DataTableProps, DataTableStyling, DataToCell, SortColumn,
         SortDataTable, SortDataTableProps, SortOrder, SortsRow,
-- 
cgit v1.2.3