From 3a5254fda10c070b7d719863293eb39ef7b256a7 Mon Sep 17 00:00:00 2001
From: Jeremy Wootten <jeremywootten@gmail.com>
Date: Thu, 19 Jun 2025 13:06:08 +0100
Subject: [PATCH 01/10] Trial elementary high contrast theme base on
 elementary-light

---
 data/meson.build                              |   1 +
 data/styles/elementary-highcontrast-light.xml | 120 ++++++++++++++++++
 src/Widgets/HeaderBar.vala                    |   2 +-
 src/Widgets/SourceView.vala                   |   2 +-
 4 files changed, 123 insertions(+), 2 deletions(-)
 create mode 100644 data/styles/elementary-highcontrast-light.xml

diff --git a/data/meson.build b/data/meson.build
index b28891a23d..0520e340be 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -16,6 +16,7 @@ endforeach
 install_data([
   'styles/elementary-dark.xml',
   'styles/elementary-light.xml',
+  'styles/elementary-highcontrast-light.xml',
 ], install_dir: get_option('datadir') / 'gtksourceview-4' / 'styles')
 
 install_data([
diff --git a/data/styles/elementary-highcontrast-light.xml b/data/styles/elementary-highcontrast-light.xml
new file mode 100644
index 0000000000..a522bfa87b
--- /dev/null
+++ b/data/styles/elementary-highcontrast-light.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<style-scheme id="elementary-highcontrast-light" _name="elementary High Contrast Light" version="1.0">
+  <author>Elementary Developers</author>
+  <_description>High Contrast color scheme using the elementary color palette</_description>
+
+  <!-- Background Colors Palette -->
+  <color name="bg-0"    value="#7e8087"/> <!-- SILVER700-->
+  <color name="bg-1"    value="#abacae"/> <!-- SILVER500-->
+  <color name="bg-2"    value="#fafafa"/> <!-- SILVER300-->
+  <color name="bg-3"    value="#fafafa"/> <!-- SILVER100-->
+  <color name="bg-4"    value="#FFFFFF"/> <!-- WHITE -->
+  <color name="bg-5"    value="#f7efe1"/> <!-- 50% LATTE100 + 50% WHITE
+  
+   -->
+
+  <!--Foreground Colors Palette -->
+  <color name="fg-0"    value="#000000"/> <!-- BLACK900 -->
+  <color name="fg-1"    value="#1a1a1a"/> <!-- BLACK700 -->
+  <color name="fg-2"    value="#abacae"/> <!-- SILVER500 -->
+
+  <!--Highlight Colors Palette -->
+  <color name="latte"   value="#e7c591"/> <!-- LATTE300 -->
+  <color name="yellow"  value="#d48e15"/> <!-- BANANA700 -->
+  <color name="orange"  value="#cc3b02"/> <!-- ORANGE700 -->
+  <color name="red"     value="#c6262e"/> <!-- STRAWBERRY500 -->
+  <color name="pink"    value="#bc245d"/> <!-- BUBBLEGUM700 -->
+  <color name="purple"  value="#a56de2"/> <!-- GRAPE500 -->
+  <color name="blue"    value="#3689e6"/> <!-- BLUEBERRY500 -->
+  <color name="cyan"    value="#0e9a83"/> <!-- MINT700 -->
+  <color name="green"   value="#68b723"/> <!-- LIME500 -->
+
+  <!-- Global Settings -->
+  <style name="text"                        foreground="fg-0" background="bg-4"/>
+  <!--<style name="selection"                   />-->
+  <style name="selection"                   background="latte"/>
+  <style name="cursor"                      foreground="fg-0"/>
+  <style name="secondary-cursor"            foreground="fg-1"/>
+  <style name="current-line"                background="bg-2"/>
+  <style name="line-numbers"                foreground="fg-1" background="bg-5"/>
+  <style name="background-pattern"          background="bg-5"/>
+  <style name="draw-spaces"                 foreground="fg-2"/>
+
+  <!-- Bracket Matching -->
+  <style name="bracket-match"               foreground="bg-4" background="fg-2"/>
+  <style name="bracket-mismatch"            foreground="red" background="fg-2"/>
+
+  <!-- Right Margin -->
+  <style name="right-margin"                foreground="bg-3" background="fg-1"/>
+
+  <!-- Search Matching -->
+  <style name="search-match"                foreground="bg-4" background="yellow"/>
+
+  <!-- Comments -->
+  <style name="def:comment"                 foreground="fg-1"/>
+  <style name="def:shebang"                 foreground="fg-1" bold="true"/>
+  <style name="def:doc-comment-element"     italic="true"/>
+
+  <!-- Constants -->
+  <style name="def:constant"                foreground="cyan"/>
+  <style name="def:special-char"            foreground="green"/>
+
+  <!-- Identifiers -->
+  <style name="def:identifier"              foreground="blue"/>
+
+  <!-- Statements -->
+  <style name="def:statement"               foreground="orange"/>
+
+  <!-- Types -->
+  <style name="def:type"                    foreground="yellow"/>
+
+  <!-- Markup -->
+  <style name="def:emphasis"                italic="true"/>
+  <style name="def:strong-emphasis"         foreground="orange"/>
+  <style name="def:inline-code"             foreground="blue"/>
+  <style name="def:insertion"               underline="single"/>
+  <style name="def:deletion"                strikethrough="true"/>
+  <style name="def:link-text"               foreground="fg-1"/>
+  <style name="def:link-symbol"             foreground="fg-1" bold="true"/>
+  <style name="def:link-destination"        italic="true" underline="single"/>
+  <style name="def:heading"                 foreground="yellow"/>
+  <style name="def:thematic-break"          foreground="yellow"/>
+  <style name="def:preformatted-section"    foreground="blue"/>
+  <style name="def:list-marker"             foreground="orange"/>
+
+  <!-- Operators -->
+  <style name="def:operator"                foreground="green"/>
+
+  <!-- Others -->
+  <style name="def:preprocessor"            foreground="purple"/>
+  <style name="def:error"                   foreground="red" bold="true"/>
+  <style name="def:note"                    foreground="pink" bold="true"/>
+  <style name="def:net-address"             italic="true" underline="single"/>
+
+  <!-- Language specific styles -->
+  <style name="diff:added-line"             foreground="green"/>
+  <style name="diff:removed-line"           foreground="red"/>
+  <style name="diff:changed-line"           foreground="yellow"/>
+  <style name="diff:special-case"           use-style="def:constant"/>
+  <style name="diff:location"               use-style="def:statement"/>
+  <style name="diff:diff-file"              use-style="def:type"/>
+
+  <style name="xml:tags"                    foreground="cyan"/>
+  <style name="xml:attribute-name"          foreground="purple"/>
+  <style name="xml:namespace"               foreground="green" bold="true"/>
+
+  <style name="js:built-in-constructor"     use-style="def:identifier"/>
+
+  <style name="latex:display-math"          foreground="purple"/>
+  <style name="latex:command"               foreground="green" bold="true"/>
+  <style name="latex:include"               use-style="def:preprocessor"/>
+
+  <style name="sh:variable"                 foreground="purple"/>
+
+  <!-- legacy styles for old lang files -->
+  <style name="Others"                      foreground="green" bold="true"/>
+  <style name="Others 2"                    foreground="cyan"/>
+  <style name="Others 3"                    foreground="purple"/>
+
+</style-scheme>
diff --git a/src/Widgets/HeaderBar.vala b/src/Widgets/HeaderBar.vala
index 55e3ce2f0b..94cb024460 100644
--- a/src/Widgets/HeaderBar.vala
+++ b/src/Widgets/HeaderBar.vala
@@ -16,7 +16,7 @@ public class Scratch.HeaderBar : Hdy.HeaderBar {
     public Gtk.ToggleButton sidebar_button { get; private set; }
     public Gtk.ToggleButton terminal_button { get; private set; }
 
-    private const string STYLE_SCHEME_HIGH_CONTRAST = "classic";
+    private const string STYLE_SCHEME_HIGH_CONTRAST = "elementary-highcontrast-light";
     private const string STYLE_SCHEME_LIGHT = "elementary-light";
     private const string STYLE_SCHEME_DARK = "elementary-dark";
 
diff --git a/src/Widgets/SourceView.vala b/src/Widgets/SourceView.vala
index 85d490e5b1..5a04ad048b 100644
--- a/src/Widgets/SourceView.vala
+++ b/src/Widgets/SourceView.vala
@@ -305,7 +305,7 @@ namespace Scratch.Widgets {
                 }
             } else {
                 var scheme = style_scheme_manager.get_scheme (Scratch.settings.get_string ("style-scheme"));
-                source_buffer.style_scheme = scheme ?? style_scheme_manager.get_scheme ("classic");
+                source_buffer.style_scheme = scheme ?? style_scheme_manager.get_scheme ("elementary-highcontrast-light");
             }
 
             git_diff_gutter_renderer.set_style_scheme (source_buffer.style_scheme);

From b974fd448855ab137ce1c09618c346d06282d83c Mon Sep 17 00:00:00 2001
From: Jeremy Wootten <jeremywootten@gmail.com>
Date: Thu, 19 Jun 2025 14:54:15 +0100
Subject: [PATCH 02/10] Tweak for improved contrast

---
 data/styles/elementary-highcontrast-light.xml | 62 +++++++++----------
 1 file changed, 30 insertions(+), 32 deletions(-)

diff --git a/data/styles/elementary-highcontrast-light.xml b/data/styles/elementary-highcontrast-light.xml
index a522bfa87b..1fc6617586 100644
--- a/data/styles/elementary-highcontrast-light.xml
+++ b/data/styles/elementary-highcontrast-light.xml
@@ -5,12 +5,10 @@
   <_description>High Contrast color scheme using the elementary color palette</_description>
 
   <!-- Background Colors Palette -->
-  <color name="bg-0"    value="#7e8087"/> <!-- SILVER700-->
-  <color name="bg-1"    value="#abacae"/> <!-- SILVER500-->
-  <color name="bg-2"    value="#fafafa"/> <!-- SILVER300-->
-  <color name="bg-3"    value="#fafafa"/> <!-- SILVER100-->
-  <color name="bg-4"    value="#FFFFFF"/> <!-- WHITE -->
-  <color name="bg-5"    value="#f7efe1"/> <!-- 50% LATTE100 + 50% WHITE
+  <color name="bg-0"    value="#abacae"/> <!-- SILVER700-->
+  <color name="bg-1"    value="#d4d4d4"/> <!-- SILVER300-->
+  <color name="bg-2"    value="#fafafa"/> <!-- SILVER100-->
+  <color name="bg-3"    value="#f7efe1"/> <!-- 50% LATTE100 + 50% WHITE
   
    -->
 
@@ -21,35 +19,34 @@
 
   <!--Highlight Colors Palette -->
   <color name="latte"   value="#e7c591"/> <!-- LATTE300 -->
-  <color name="yellow"  value="#d48e15"/> <!-- BANANA700 -->
+  <color name="yellow"  value="#d48e15"/> <!--   BANANA700 -->
   <color name="orange"  value="#cc3b02"/> <!-- ORANGE700 -->
-  <color name="red"     value="#c6262e"/> <!-- STRAWBERRY500 -->
+  <!--<color name="red"     value="#c6262e"/> <!   STRAWBERRY500 -->-->
   <color name="pink"    value="#bc245d"/> <!-- BUBBLEGUM700 -->
-  <color name="purple"  value="#a56de2"/> <!-- GRAPE500 -->
-  <color name="blue"    value="#3689e6"/> <!-- BLUEBERRY500 -->
-  <color name="cyan"    value="#0e9a83"/> <!-- MINT700 -->
-  <color name="green"   value="#68b723"/> <!-- LIME500 -->
+  <color name="purple"  value="#452981"/> <!-- GRAPE900 -->
+  <color name="cyan"    value="#3689e6"/> <!--   BLUEBERRY500 -->
+  <color name="blue"    value="#0d52bf"/> <!--   BLUEBERRY700 -->
+  <!--<color name="green"   value="#206b00"/> <!   LIME900 -->-->
 
   <!-- Global Settings -->
-  <style name="text"                        foreground="fg-0" background="bg-4"/>
-  <!--<style name="selection"                   />-->
+  <style name="text"                        foreground="fg-0" background="bg-2"/>
   <style name="selection"                   background="latte"/>
   <style name="cursor"                      foreground="fg-0"/>
   <style name="secondary-cursor"            foreground="fg-1"/>
-  <style name="current-line"                background="bg-2"/>
-  <style name="line-numbers"                foreground="fg-1" background="bg-5"/>
-  <style name="background-pattern"          background="bg-5"/>
+  <style name="current-line"                background="bg-1"/>
+  <style name="line-numbers"                foreground="fg-1" background="bg-3"/>
+  <style name="background-pattern"          background="bg-3"/>
   <style name="draw-spaces"                 foreground="fg-2"/>
 
   <!-- Bracket Matching -->
-  <style name="bracket-match"               foreground="bg-4" background="fg-2"/>
-  <style name="bracket-mismatch"            foreground="red" background="fg-2"/>
+  <style name="bracket-match"               foreground="#green" background="bg-2" bold="true"/>
+  <style name="bracket-mismatch"            foreground="#red" background="fg-2" bold="true"/>
 
   <!-- Right Margin -->
   <style name="right-margin"                foreground="bg-3" background="fg-1"/>
 
   <!-- Search Matching -->
-  <style name="search-match"                foreground="bg-4" background="yellow"/>
+  <style name="search-match"                foreground="#black" background="yellow"/>
 
   <!-- Comments -->
   <style name="def:comment"                 foreground="fg-1"/>
@@ -58,16 +55,17 @@
 
   <!-- Constants -->
   <style name="def:constant"                foreground="cyan"/>
-  <style name="def:special-char"            foreground="green"/>
+  <style name="def:special-char"            foreground="#green"/>
 
   <!-- Identifiers -->
-  <style name="def:identifier"              foreground="blue"/>
+  <style name="def:identifier"              foreground="blue" bold="true"/>
 
   <!-- Statements -->
   <style name="def:statement"               foreground="orange"/>
 
   <!-- Types -->
-  <style name="def:type"                    foreground="yellow"/>
+  <style name="def:type"                    foreground="#green" bold="true"/>
+  <style name="def:string"                  foreground="pink"/>
 
   <!-- Markup -->
   <style name="def:emphasis"                italic="true"/>
@@ -84,36 +82,36 @@
   <style name="def:list-marker"             foreground="orange"/>
 
   <!-- Operators -->
-  <style name="def:operator"                foreground="green"/>
+  <style name="def:operator"                foreground="#green" bold="true" />
 
   <!-- Others -->
   <style name="def:preprocessor"            foreground="purple"/>
-  <style name="def:error"                   foreground="red" bold="true"/>
+  <style name="def:error"                   foreground="#red" bold="true"/>
   <style name="def:note"                    foreground="pink" bold="true"/>
   <style name="def:net-address"             italic="true" underline="single"/>
 
   <!-- Language specific styles -->
-  <style name="diff:added-line"             foreground="green"/>
-  <style name="diff:removed-line"           foreground="red"/>
+  <style name="diff:added-line"             foreground="#green"/>
+  <style name="diff:removed-line"           foreground="#red"/>
   <style name="diff:changed-line"           foreground="yellow"/>
   <style name="diff:special-case"           use-style="def:constant"/>
   <style name="diff:location"               use-style="def:statement"/>
   <style name="diff:diff-file"              use-style="def:type"/>
 
-  <style name="xml:tags"                    foreground="cyan"/>
-  <style name="xml:attribute-name"          foreground="purple"/>
-  <style name="xml:namespace"               foreground="green" bold="true"/>
+  <style name="xml:tags"                    foreground="cyan"  bold="true"/>
+  <style name="xml:attribute-name"          foreground="purple"  bold="true"/>
+  <style name="xml:namespace"               foreground="#green" bold="true"/>
 
   <style name="js:built-in-constructor"     use-style="def:identifier"/>
 
   <style name="latex:display-math"          foreground="purple"/>
-  <style name="latex:command"               foreground="green" bold="true"/>
+  <style name="latex:command"               foreground="#green" bold="true"/>
   <style name="latex:include"               use-style="def:preprocessor"/>
 
   <style name="sh:variable"                 foreground="purple"/>
 
   <!-- legacy styles for old lang files -->
-  <style name="Others"                      foreground="green" bold="true"/>
+  <style name="Others"                      foreground="#green" bold="true"/>
   <style name="Others 2"                    foreground="cyan"/>
   <style name="Others 3"                    foreground="purple"/>
 

From a21c309c15da9484a5c18da15b49c822324c0b87 Mon Sep 17 00:00:00 2001
From: Jeremy Wootten <jeremywootten@gmail.com>
Date: Thu, 19 Jun 2025 15:13:49 +0100
Subject: [PATCH 03/10] Further tweaks

---
 data/styles/elementary-highcontrast-light.xml | 37 +++++++++++--------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/data/styles/elementary-highcontrast-light.xml b/data/styles/elementary-highcontrast-light.xml
index 1fc6617586..f4f1c92e48 100644
--- a/data/styles/elementary-highcontrast-light.xml
+++ b/data/styles/elementary-highcontrast-light.xml
@@ -18,15 +18,19 @@
   <color name="fg-2"    value="#abacae"/> <!-- SILVER500 -->
 
   <!--Highlight Colors Palette -->
+  <color name="mud"   value="#804b00"/> <!-- LATTE900 -->
   <color name="latte"   value="#e7c591"/> <!-- LATTE300 -->
   <color name="yellow"  value="#d48e15"/> <!--   BANANA700 -->
   <color name="orange"  value="#cc3b02"/> <!-- ORANGE700 -->
-  <!--<color name="red"     value="#c6262e"/> <!   STRAWBERRY500 -->-->
   <color name="pink"    value="#bc245d"/> <!-- BUBBLEGUM700 -->
   <color name="purple"  value="#452981"/> <!-- GRAPE900 -->
-  <color name="cyan"    value="#3689e6"/> <!--   BLUEBERRY500 -->
-  <color name="blue"    value="#0d52bf"/> <!--   BLUEBERRY700 -->
-  <!--<color name="green"   value="#206b00"/> <!   LIME900 -->-->
+  <color name="cyan"    value="#3689e6"/> <!-- BLUEBERRY500 -->
+  <color name="blue"    value="#0d52bf"/> <!-- BLUEBERRY700 -->
+  <color name="lime"    value="#68b723"/> <!-- LIME500 -->
+  <color name="green"   value="#206b00"/> <!-- LIME900 -->
+  <color name="red"     value="#FF0000"/>
+  <color name="black"   value="#000000"/>
+
 
   <!-- Global Settings -->
   <style name="text"                        foreground="fg-0" background="bg-2"/>
@@ -39,14 +43,14 @@
   <style name="draw-spaces"                 foreground="fg-2"/>
 
   <!-- Bracket Matching -->
-  <style name="bracket-match"               foreground="#green" background="bg-2" bold="true"/>
-  <style name="bracket-mismatch"            foreground="#red" background="fg-2" bold="true"/>
+  <style name="bracket-match"               foreground="lime" background="bg-2" bold="true"/>
+  <style name="bracket-mismatch"            foreground="red" background="fg-2" bold="true"/>
 
   <!-- Right Margin -->
   <style name="right-margin"                foreground="bg-3" background="fg-1"/>
 
   <!-- Search Matching -->
-  <style name="search-match"                foreground="#black" background="yellow"/>
+  <style name="search-match"                foreground="black" background="yellow"/>
 
   <!-- Comments -->
   <style name="def:comment"                 foreground="fg-1"/>
@@ -55,7 +59,7 @@
 
   <!-- Constants -->
   <style name="def:constant"                foreground="cyan"/>
-  <style name="def:special-char"            foreground="#green"/>
+  <style name="def:special-char"            foreground="green"/>
 
   <!-- Identifiers -->
   <style name="def:identifier"              foreground="blue" bold="true"/>
@@ -64,8 +68,9 @@
   <style name="def:statement"               foreground="orange"/>
 
   <!-- Types -->
-  <style name="def:type"                    foreground="#green" bold="true"/>
+  <style name="def:type"                    foreground="green" bold="true"/>
   <style name="def:string"                  foreground="pink"/>
+  <style name="def:keyword"                  foreground="mud" bold="true"/>
 
   <!-- Markup -->
   <style name="def:emphasis"                italic="true"/>
@@ -82,17 +87,17 @@
   <style name="def:list-marker"             foreground="orange"/>
 
   <!-- Operators -->
-  <style name="def:operator"                foreground="#green" bold="true" />
+  <style name="def:operator"                foreground="lime" bold="true" />
 
   <!-- Others -->
   <style name="def:preprocessor"            foreground="purple"/>
-  <style name="def:error"                   foreground="#red" bold="true"/>
+  <style name="def:error"                   foreground="red" bold="true"/>
   <style name="def:note"                    foreground="pink" bold="true"/>
   <style name="def:net-address"             italic="true" underline="single"/>
 
   <!-- Language specific styles -->
-  <style name="diff:added-line"             foreground="#green"/>
-  <style name="diff:removed-line"           foreground="#red"/>
+  <style name="diff:added-line"             foreground="green"/>
+  <style name="diff:removed-line"           foreground="red"/>
   <style name="diff:changed-line"           foreground="yellow"/>
   <style name="diff:special-case"           use-style="def:constant"/>
   <style name="diff:location"               use-style="def:statement"/>
@@ -100,18 +105,18 @@
 
   <style name="xml:tags"                    foreground="cyan"  bold="true"/>
   <style name="xml:attribute-name"          foreground="purple"  bold="true"/>
-  <style name="xml:namespace"               foreground="#green" bold="true"/>
+  <style name="xml:namespace"               foreground="lime" bold="true"/>
 
   <style name="js:built-in-constructor"     use-style="def:identifier"/>
 
   <style name="latex:display-math"          foreground="purple"/>
-  <style name="latex:command"               foreground="#green" bold="true"/>
+  <style name="latex:command"               foreground="green" bold="true"/>
   <style name="latex:include"               use-style="def:preprocessor"/>
 
   <style name="sh:variable"                 foreground="purple"/>
 
   <!-- legacy styles for old lang files -->
-  <style name="Others"                      foreground="#green" bold="true"/>
+  <style name="Others"                      foreground="green" bold="true"/>
   <style name="Others 2"                    foreground="cyan"/>
   <style name="Others 3"                    foreground="purple"/>
 

From 539027051fc0e49faba884d8f591cec5405e1d45 Mon Sep 17 00:00:00 2001
From: Jeremy Wootten <jeremywootten@gmail.com>
Date: Thu, 19 Jun 2025 18:51:24 +0100
Subject: [PATCH 04/10] Provide fallback for failure to get scheme or colors

---
 src/Widgets/HeaderBar.vala | 84 ++++++++++++++++++++++++++++----------
 1 file changed, 62 insertions(+), 22 deletions(-)

diff --git a/src/Widgets/HeaderBar.vala b/src/Widgets/HeaderBar.vala
index 94cb024460..caa7369905 100644
--- a/src/Widgets/HeaderBar.vala
+++ b/src/Widgets/HeaderBar.vala
@@ -169,7 +169,6 @@ public class Scratch.HeaderBar : Hdy.HeaderBar {
             margin_top = 6,
             margin_bottom = 6
         };
-
         color_box.add (color_button_white);
         color_box.add (color_button_light);
         color_box.add (color_button_dark);
@@ -320,28 +319,52 @@ public class Scratch.HeaderBar : Hdy.HeaderBar {
         });
     }
 
-    private void style_color_button (Gtk.Widget color_button, string style_id) {
-        string background = "#FFF";
-        string foreground = "#333";
+    private void style_color_button (Gtk.ToggleButton color_button, string style_id) {
+        var background = "";
+        var foreground = "";
 
+        Gtk.SourceStyleScheme? scheme = null;
         var sssm = Gtk.SourceStyleSchemeManager.get_default ();
         if (style_id in sssm.scheme_ids) {
-            var scheme = sssm.get_scheme (style_id);
-            color_button.tooltip_text = scheme.name;
+            scheme = sssm.get_scheme (style_id);
+            // We currently ship and hard-code the style schemes so can assume the "text" key
+            // is present but if in future we permit the user to specify their own default
+            // schemes(e.g. through separate settings keys) then this may not be the case.
+            // so do a certain amount of validity checking
+            var text_style = scheme.get_style ("text");
+            var background_pattern_style = scheme.get_style ("background-pattern");
+            if (text_style != null) {
+                if (text_style.background_set) {
+                    background = text_style.background;
+                }
+
+                if (text_style.foreground_set) {
+                    foreground = text_style.foreground;
+                }
+            }
 
-            var background_style = scheme.get_style ("background-pattern");
-            var foreground_style = scheme.get_style ("text");
+            if (background_pattern_style != null) {
+                if (background == "" && background_pattern_style.background_set) {
+                    background = background_pattern_style.background;
+                }
+
+                if (foreground == "" && background_pattern_style.foreground_set) {
+                    foreground = background_pattern_style.foreground;
+                }
+            }
 
-            if (background_style != null && background_style.background_set && !("rgba" in background_style.background)) {
-                background = background_style.background;
+            //Fallback to white and grey  if necessary
+            if (background == "" || background.contains ("rgba")) {
+                background ="";
             }
 
-            if (foreground_style != null && foreground_style.foreground_set) {
-                foreground = foreground_style.foreground;
+            if (foreground == "" || foreground.contains ("rgba")) {
+                foreground ="";
             }
         }
 
-        var style_css = """
+        if (background != "" && foreground != "") {
+            var style_css = """
             .color-button radio {
                 background-color: %s;
                 color: %s;
@@ -350,17 +373,34 @@ public class Scratch.HeaderBar : Hdy.HeaderBar {
             }
         """.printf (background, foreground);
 
-        var css_provider = new Gtk.CssProvider ();
+            var css_provider = new Gtk.CssProvider ();
 
-        try {
-            css_provider.load_from_data (style_css);
-        } catch (Error e) {
-            critical ("Unable to style color button: %s", e.message);
-        }
+            try {
+                css_provider.load_from_data (style_css);
+            } catch (Error e) {
+                critical ("Unable to style color button: %s", e.message);
+            }
 
-        unowned var style_context = color_button.get_style_context ();
-        style_context.add_class (Granite.STYLE_CLASS_COLOR_BUTTON);
-        style_context.add_provider (css_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
+            unowned var style_context = color_button.get_style_context ();
+            style_context.add_class (Granite.STYLE_CLASS_COLOR_BUTTON);
+            style_context.add_provider (css_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
+            color_button.tooltip_text = scheme.name;
+        } else if (scheme != null || background == "" || foreground == "") {
+            //Fallback to standard radio buttons (shouldnt happen)
+            switch (style_id) {
+                case STYLE_SCHEME_LIGHT:
+                    color_button.label = _("Light");
+                    break;
+                case STYLE_SCHEME_DARK:
+                    color_button.label = _("Dark");
+                    break;
+                case STYLE_SCHEME_HIGH_CONTRAST:
+                    color_button.label = _("Contrast");
+                    break;
+                default:
+                    assert_not_reached ();
+            }
+        }
     }
 
     private void on_share_menu_changed () {

From 7b296970d32dce35ebf95b06879176fea0747022 Mon Sep 17 00:00:00 2001
From: Jeremy Wootten <jeremywootten@gmail.com>
Date: Fri, 24 Oct 2025 15:03:05 +0100
Subject: [PATCH 05/10] Lint and other cleanup

---
 src/Widgets/HeaderBar.vala | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Widgets/HeaderBar.vala b/src/Widgets/HeaderBar.vala
index caa7369905..9f95e13686 100644
--- a/src/Widgets/HeaderBar.vala
+++ b/src/Widgets/HeaderBar.vala
@@ -329,7 +329,7 @@ public class Scratch.HeaderBar : Hdy.HeaderBar {
             scheme = sssm.get_scheme (style_id);
             // We currently ship and hard-code the style schemes so can assume the "text" key
             // is present but if in future we permit the user to specify their own default
-            // schemes(e.g. through separate settings keys) then this may not be the case.
+            // schemes (e.g. through separate settings keys) then this may not be the case.
             // so do a certain amount of validity checking
             var text_style = scheme.get_style ("text");
             var background_pattern_style = scheme.get_style ("background-pattern");
@@ -355,11 +355,11 @@ public class Scratch.HeaderBar : Hdy.HeaderBar {
 
             //Fallback to white and grey  if necessary
             if (background == "" || background.contains ("rgba")) {
-                background ="";
+                background = "";
             }
 
             if (foreground == "" || foreground.contains ("rgba")) {
-                foreground ="";
+                foreground = "";
             }
         }
 
@@ -386,7 +386,7 @@ public class Scratch.HeaderBar : Hdy.HeaderBar {
             style_context.add_provider (css_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
             color_button.tooltip_text = scheme.name;
         } else if (scheme != null || background == "" || foreground == "") {
-            //Fallback to standard radio buttons (shouldnt happen)
+            //Fallback to standard radio buttons (should not happen)
             switch (style_id) {
                 case STYLE_SCHEME_LIGHT:
                     color_button.label = _("Light");

From 3918bd08cdbcd5ab5f7fa4a4300117fc88624c8f Mon Sep 17 00:00:00 2001
From: Jeremy Wootten <jeremywootten@gmail.com>
Date: Mon, 27 Oct 2025 15:58:13 +0000
Subject: [PATCH 06/10] Change cyan from BLUEBERRY500 to MINT900

---
 data/styles/elementary-highcontrast-light.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/styles/elementary-highcontrast-light.xml b/data/styles/elementary-highcontrast-light.xml
index f4f1c92e48..a8c13bf6ed 100644
--- a/data/styles/elementary-highcontrast-light.xml
+++ b/data/styles/elementary-highcontrast-light.xml
@@ -24,7 +24,7 @@
   <color name="orange"  value="#cc3b02"/> <!-- ORANGE700 -->
   <color name="pink"    value="#bc245d"/> <!-- BUBBLEGUM700 -->
   <color name="purple"  value="#452981"/> <!-- GRAPE900 -->
-  <color name="cyan"    value="#3689e6"/> <!-- BLUEBERRY500 -->
+  <color name="cyan"    value="#007367"/> <!-- MINT900 -->
   <color name="blue"    value="#0d52bf"/> <!-- BLUEBERRY700 -->
   <color name="lime"    value="#68b723"/> <!-- LIME500 -->
   <color name="green"   value="#206b00"/> <!-- LIME900 -->

From 57e8b94c1f5a1f80cff7f442e263d373573f48a8 Mon Sep 17 00:00:00 2001
From: Jeremy Wootten <jeremywootten@gmail.com>
Date: Mon, 27 Oct 2025 16:13:28 +0000
Subject: [PATCH 07/10] Use silver for line number background

---
 data/styles/elementary-highcontrast-light.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/styles/elementary-highcontrast-light.xml b/data/styles/elementary-highcontrast-light.xml
index a8c13bf6ed..2b08271d14 100644
--- a/data/styles/elementary-highcontrast-light.xml
+++ b/data/styles/elementary-highcontrast-light.xml
@@ -8,7 +8,7 @@
   <color name="bg-0"    value="#abacae"/> <!-- SILVER700-->
   <color name="bg-1"    value="#d4d4d4"/> <!-- SILVER300-->
   <color name="bg-2"    value="#fafafa"/> <!-- SILVER100-->
-  <color name="bg-3"    value="#f7efe1"/> <!-- 50% LATTE100 + 50% WHITE
+  <color name="bg-3"    value="#EAEAEA"/> <!-- 50% SILVER300 + 50% WHITE
   
    -->
 

From 50203a2eab89d51a08c6186ee022babfc84ab152 Mon Sep 17 00:00:00 2001
From: Jeremy Wootten <jeremywootten@gmail.com>
Date: Mon, 27 Oct 2025 16:35:30 +0000
Subject: [PATCH 08/10] Make comments more distinct

---
 data/styles/elementary-highcontrast-light.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/styles/elementary-highcontrast-light.xml b/data/styles/elementary-highcontrast-light.xml
index 2b08271d14..e005ba07c6 100644
--- a/data/styles/elementary-highcontrast-light.xml
+++ b/data/styles/elementary-highcontrast-light.xml
@@ -53,7 +53,7 @@
   <style name="search-match"                foreground="black" background="yellow"/>
 
   <!-- Comments -->
-  <style name="def:comment"                 foreground="fg-1"/>
+  <style name="def:comment"                 foreground="blue" italic="true"/>
   <style name="def:shebang"                 foreground="fg-1" bold="true"/>
   <style name="def:doc-comment-element"     italic="true"/>
 

From af88945b32decf6f6e91722acafe2a7d26dad274 Mon Sep 17 00:00:00 2001
From: Jeremy Wootten <jeremywootten@gmail.com>
Date: Tue, 18 Nov 2025 11:10:15 +0000
Subject: [PATCH 09/10] Update data/styles/elementary-highcontrast-light.xml

Fix extra spaces

Co-authored-by: Micah Ilbery <micah.ilbery@protonmail.com>
---
 data/styles/elementary-highcontrast-light.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/styles/elementary-highcontrast-light.xml b/data/styles/elementary-highcontrast-light.xml
index e005ba07c6..1340182763 100644
--- a/data/styles/elementary-highcontrast-light.xml
+++ b/data/styles/elementary-highcontrast-light.xml
@@ -20,7 +20,7 @@
   <!--Highlight Colors Palette -->
   <color name="mud"   value="#804b00"/> <!-- LATTE900 -->
   <color name="latte"   value="#e7c591"/> <!-- LATTE300 -->
-  <color name="yellow"  value="#d48e15"/> <!--   BANANA700 -->
+  <color name="yellow"  value="#d48e15"/> <!-- BANANA700 -->
   <color name="orange"  value="#cc3b02"/> <!-- ORANGE700 -->
   <color name="pink"    value="#bc245d"/> <!-- BUBBLEGUM700 -->
   <color name="purple"  value="#452981"/> <!-- GRAPE900 -->

From f506b1841184eb050cf89a0f00fc577d581c4803 Mon Sep 17 00:00:00 2001
From: Jeremy Wootten <jeremywootten@gmail.com>
Date: Tue, 18 Nov 2025 11:11:14 +0000
Subject: [PATCH 10/10] Update data/styles/elementary-highcontrast-light.xml

Use elementary red color

Co-authored-by: Micah Ilbery <micah.ilbery@protonmail.com>
---
 data/styles/elementary-highcontrast-light.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/styles/elementary-highcontrast-light.xml b/data/styles/elementary-highcontrast-light.xml
index 1340182763..aa877eeb17 100644
--- a/data/styles/elementary-highcontrast-light.xml
+++ b/data/styles/elementary-highcontrast-light.xml
@@ -28,7 +28,7 @@
   <color name="blue"    value="#0d52bf"/> <!-- BLUEBERRY700 -->
   <color name="lime"    value="#68b723"/> <!-- LIME500 -->
   <color name="green"   value="#206b00"/> <!-- LIME900 -->
-  <color name="red"     value="#FF0000"/>
+  <color name="red"     value="#a10705"/> <!-- STRAWBERRY700 -->
   <color name="black"   value="#000000"/>