From 4615591c16be0cbd5b71beb51b206611415e4e53 Mon Sep 17 00:00:00 2001
From: Hartley McGuire <skipkayhil@gmail.com>
Date: Thu, 26 Jan 2023 18:16:06 -0500
Subject: [PATCH 1/3] Order Base16 Theme styles by foreground color

This helps make it very obvious which tokens will end up with the same
base16 color.
---
 lib/rouge/themes/base16.rb | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/lib/rouge/themes/base16.rb b/lib/rouge/themes/base16.rb
index 6e77c6acfe..4fba0787ee 100644
--- a/lib/rouge/themes/base16.rb
+++ b/lib/rouge/themes/base16.rb
@@ -49,43 +49,43 @@ def self.make_light!
       light!
 
       style Error, :fg => :base00, :bg => :base08
-      style Comment, :fg => :base03
 
-      style Comment::Preproc,
-            Name::Tag, :fg => :base0A
+      style Comment, :fg => :base03
 
       style Operator,
             Punctuation, :fg => :base05
 
-      style Generic::Inserted, :fg => :base0B
       style Generic::Deleted, :fg => :base08
-      style Generic::Heading, :fg => :base0D, :bg => :base00, :bold => true
 
       style Generic::Emph, :italic => true
       style Generic::EmphStrong, :italic => true, :bold => true
       style Generic::Strong, :bold => true
 
-      style Keyword, :fg => :base0E
       style Keyword::Constant,
+            Keyword::Declaration,
             Keyword::Type, :fg => :base09
 
-      style Keyword::Declaration, :fg => :base09
-
-      style Literal::String, :fg => :base0B
-      style Literal::String::Affix, :fg => :base0E
-      style Literal::String::Regex, :fg => :base0C
+      style Comment::Preproc,
+            Name::Class,
+            Name::Constant,
+            Name::Namespace,
+            Name::Tag, :fg => :base0A
 
-      style Literal::String::Interpol,
-            Literal::String::Escape, :fg => :base0F
+      style Generic::Inserted,
+            Literal::Number,
+            Literal::String,
+            Literal::String::Symbol, :fg => :base0B
 
-      style Name::Namespace,
-            Name::Class,
-            Name::Constant, :fg => :base0A
+      style Literal::String::Regex, :fg => :base0C
 
       style Name::Attribute, :fg => :base0D
+      style Generic::Heading, :fg => :base0D, :bg => :base00, :bold => true
 
-      style Literal::Number,
-            Literal::String::Symbol, :fg => :base0B
+      style Keyword,
+            Literal::String::Affix, :fg => :base0E
+
+      style Literal::String::Escape,
+            Literal::String::Interpol, :fg => :base0F
 
       class Solarized < Base16
         name 'base16.solarized'

From 7c0aa86e424741d8130a4c686f94fa6a60898263 Mon Sep 17 00:00:00 2001
From: Hartley McGuire <skipkayhil@gmail.com>
Date: Mon, 30 Jan 2023 20:29:06 -0500
Subject: [PATCH 2/3] Make Literal::Number base09 per spec

Previously
- base0B: Strings, Inherited Class, Markup Code, Diff Inserted

Now:
- base09 - Integers, Boolean, Constants, XML Attributes, Markup Link Url
           ^^^^^^^^
---
 lib/rouge/themes/base16.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/rouge/themes/base16.rb b/lib/rouge/themes/base16.rb
index 4fba0787ee..af6bf439c9 100644
--- a/lib/rouge/themes/base16.rb
+++ b/lib/rouge/themes/base16.rb
@@ -63,7 +63,8 @@ def self.make_light!
 
       style Keyword::Constant,
             Keyword::Declaration,
-            Keyword::Type, :fg => :base09
+            Keyword::Type,
+            Literal::Number, :fg => :base09
 
       style Comment::Preproc,
             Name::Class,
@@ -72,7 +73,6 @@ def self.make_light!
             Name::Tag, :fg => :base0A
 
       style Generic::Inserted,
-            Literal::Number,
             Literal::String,
             Literal::String::Symbol, :fg => :base0B
 

From 5ae18a817e97b30fa02450cb92cea514f6e9824a Mon Sep 17 00:00:00 2001
From: Hartley McGuire <skipkayhil@gmail.com>
Date: Mon, 30 Jan 2023 20:48:09 -0500
Subject: [PATCH 3/3] Add variable and function styles to base16 theme

Variables:
- base08 - Variables, XML Tags, Markup Link Text, Markup Lists, Diff
  Deleted

Functions:
- base0D - Functions, Methods, Attribute IDs, Headings
---
 lib/rouge/themes/base16.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/rouge/themes/base16.rb b/lib/rouge/themes/base16.rb
index af6bf439c9..2e7e203513 100644
--- a/lib/rouge/themes/base16.rb
+++ b/lib/rouge/themes/base16.rb
@@ -55,7 +55,8 @@ def self.make_light!
       style Operator,
             Punctuation, :fg => :base05
 
-      style Generic::Deleted, :fg => :base08
+      style Generic::Deleted,
+            Name, :fg => :base08
 
       style Generic::Emph, :italic => true
       style Generic::EmphStrong, :italic => true, :bold => true
@@ -78,7 +79,8 @@ def self.make_light!
 
       style Literal::String::Regex, :fg => :base0C
 
-      style Name::Attribute, :fg => :base0D
+      style Name::Attribute,
+            Name::Function, :fg => :base0D
       style Generic::Heading, :fg => :base0D, :bg => :base00, :bold => true
 
       style Keyword,