8 files changed, 267 insertions, 179 deletions
diff --git a/themes/Solarized/Makefile.am b/themes/Solarized/Makefile.am
index 2a4af8b..3df6e8b 100644
--- a/themes/Solarized/Makefile.am
+++ b/themes/Solarized/Makefile.am
@@ -1,10 +1,10 @@
 
 GTK3_CSS =								\
 	palette.css							\
+	tokens-light.css					\
+	tokens-dark.css						\
 	widgets-light.css					\
-	widgets-dark.css					\
-	segments.css						\
-	segments-dark.css
+	widgets-dark.css
 
 solarized.ctm: gresource.xml $(GTK3_CSS)
 	glib-compile-resources --target=$@ --sourcedir=$(srcdir) gresource.xml
diff --git a/themes/Solarized/definition.xml b/themes/Solarized/definition.xml
index 5fc3e83..24f83de 100644
--- a/themes/Solarized/definition.xml
+++ b/themes/Solarized/definition.xml
@@ -8,15 +8,14 @@
   <resources>
     <common>
       <path>palette.css</path>
-      <path>segments.css</path>
     </common>
     <light>
+      <path>tokens-light.css</path>
       <path>widgets-light.css</path>
-      <path>segments-light.css</path>
     </light>
     <dark>
+      <path>tokens-dark.css</path>
       <path>widgets-dark.css</path>
-      <path>segments-dark.css</path>
     </dark>
   </resources>
 </ChrysalideTheme>
diff --git a/themes/Solarized/gresource.xml b/themes/Solarized/gresource.xml
index a12dcba..28b1abd 100644
--- a/themes/Solarized/gresource.xml
+++ b/themes/Solarized/gresource.xml
@@ -3,10 +3,9 @@
     <gresource prefix="/org/chrysalide/gui/themes/Solarized">
         <file compressed="true">definition.xml</file>
         <file compressed="true">palette.css</file>
-        <file compressed="true">segments.css</file>
+        <file compressed="true">tokens-light.css</file>
         <file compressed="true">widgets-light.css</file>
-        <file compressed="true">segments-light.css</file>
+        <file compressed="true">tokens-dark.css</file>
         <file compressed="true">widgets-dark.css</file>
-        <file compressed="true">segments-dark.css</file>
     </gresource>
 </gresources>
diff --git a/themes/Solarized/segments-dark.css b/themes/Solarized/segments-dark.css
deleted file mode 100644
index 3c9a6fd..0000000
--- a/themes/Solarized/segments-dark.css
+++ /dev/null
@@ -1,61 +0,0 @@
-
-/* Hex display */
-
-.segment-raw {
-
-    color: @base1;
-
-}
-
-.segment-raw-full {
-
-    color: @base01;
-
-}
-
-.segment-raw-null {
-
-    color: @base02;
-
-}
-
-.segment-printable {
-
-    color: @base1;
-
-}
-
-.segment-not-printable {
-
-    color: @base02;
-
-}
-
-/* Assembly views */
-
-.segment-phys-addr-padding,
-.segment-virt-addr-padding {
-
-    color: @base02;
-
-}
-
-.segment-phys-addr,
-.segment-virt-addr {
-
-    color: @base01;
-
-}
-
-.segment-comment {
-
-    color: @base1;
-
-}
-
-.segment-keyword,
-.segment-instruction {
-
-    color: @base2;
-
-}
diff --git a/themes/Solarized/segments-light.css b/themes/Solarized/segments-light.css
deleted file mode 100644
index 74255e4..0000000
--- a/themes/Solarized/segments-light.css
+++ /dev/null
@@ -1,61 +0,0 @@
-
-/* Hex display */
-
-.segment-raw {
-
-    color: @base01;
-
-}
-
-.segment-raw-full {
-
-    color: @base1;
-
-}
-
-.segment-raw-null {
-
-    color: @base2;
-
-}
-
-.segment-printable {
-
-    color: @base01;
-
-}
-
-.segment-not-printable {
-
-    color: @base2;
-
-}
-
-/* Assembly views */
-
-.segment-phys-addr-padding,
-.segment-virt-addr-padding {
-
-    color: @base2;
-
-}
-
-.segment-phys-addr,
-.segment-virt-addr {
-
-    color: @base1;
-
-}
-
-.segment-comment {
-
-    color: @base01;
-
-}
-
-.segment-keyword,
-.segment-instruction {
-
-    color: @base02;
-
-}
diff --git a/themes/Solarized/segments.css b/themes/Solarized/segments.css
deleted file mode 100644
index 0391466..0000000
--- a/themes/Solarized/segments.css
+++ /dev/null
@@ -1,48 +0,0 @@
-
-/* Assembly views */
-
-.segment-label {
-
-    color: @blue;
-
-}
-
-.segment-register {
-
-    color: @violet;
-
-}
-
-.segment-immediate {
-
-    color: @orange;
-
-}
-
-.segment-string {
-
-    color: @yellow;
-
-}
-
-.segment-keyword {
-
-    font-style: italic;
-
-}
-
-.segment-punct {
-
-    color: @cyan;
-
-}
-
-.segment-hooks,
-.segment-ltgt,
-.segment-signs {
-
-    color: @cyan;
-
-    font-weight: bold;
-
-}
diff --git a/themes/Solarized/tokens-dark.css b/themes/Solarized/tokens-dark.css
new file mode 100644
index 0000000..7272de1
--- /dev/null
+++ b/themes/Solarized/tokens-dark.css
@@ -0,0 +1,130 @@
+
+/* Hex display */
+
+.token-raw {
+
+    color: @base1;
+
+}
+
+.token-raw-full {
+
+    color: @base2;
+
+    font-weight: bold;
+
+}
+
+.token-raw-null {
+
+    color: @base02;
+
+}
+
+.token-printable {
+
+    color: @base1;
+
+}
+
+.token-not-printable {
+
+    color: @base02;
+
+}
+
+/* Assembly views */
+
+.token-comment,
+.token-indication {
+
+    color: @green;
+
+}
+
+.token-phys-addr-padding,
+.token-virt-addr-padding {
+
+    color: @base02;
+
+}
+
+.token-phys-addr,
+.token-virt-addr {
+
+    color: @base01;
+
+}
+
+.token-raw-code,
+.token-raw-code-null {
+
+    color: @base00;
+
+
+}
+
+.token-label,
+.token-section,
+.token-segment {
+
+    color: @blue;
+
+}
+
+.token-instruction {
+
+    color: @base3;
+
+}
+
+.token-immediate {
+
+    color: @orange;
+
+}
+
+.token-register {
+
+    color: @violet;
+
+}
+
+.token-punct,
+.token-hooks,
+.token-signs,
+.token-ltgt {
+
+    color: @cyan;
+
+    font-weight: bold;
+
+}
+
+.token-string {
+
+    color: @yellow;
+
+}
+
+.token-var-name {
+
+    color: @magenta;
+
+}
+
+.token-keyword {
+
+    color: @base3;
+
+    font-style: italic;
+
+}
+
+.token-error {
+
+    color: @red;
+
+    font-weight: bold;
+
+}
diff --git a/themes/Solarized/tokens-light.css b/themes/Solarized/tokens-light.css
new file mode 100644
index 0000000..f5963b2
--- /dev/null
+++ b/themes/Solarized/tokens-light.css
@@ -0,0 +1,130 @@
+
+/* Hex display */
+
+.token-raw {
+
+    color: @base01;
+
+}
+
+.token-raw-full {
+
+    color: @base02;
+
+    font-weight: bold;
+
+}
+
+.token-raw-null {
+
+    color: @base2;
+
+}
+
+.token-printable {
+
+    color: @base01;
+
+}
+
+.token-not-printable {
+
+    color: @base2;
+
+}
+
+/* Assembly views */
+
+.token-comment,
+.token-indication {
+
+    color: @green;
+
+}
+
+.token-phys-addr-padding,
+.token-virt-addr-padding {
+
+    color: @base2;
+
+}
+
+.token-phys-addr,
+.token-virt-addr {
+
+    color: @base1;
+
+}
+
+.token-raw-code,
+.token-raw-code-null {
+
+    color: @base0;
+
+
+}
+
+.token-label,
+.token-section,
+.token-segment {
+
+    color: @blue;
+
+}
+
+.token-instruction {
+
+    color: @base03;
+
+}
+
+.token-immediate {
+
+    color: @orange;
+
+}
+
+.token-register {
+
+    color: @violet;
+
+}
+
+.token-punct,
+.token-hooks,
+.token-signs,
+.token-ltgt {
+
+    color: @cyan;
+
+    font-weight: bold;
+
+}
+
+.token-string {
+
+    color: @yellow;
+
+}
+
+.token-var-name {
+
+    color: @magenta;
+
+}
+
+.token-keyword {
+
+    color: @base03;
+
+    font-style: italic;
+
+}
+
+.token-error {
+
+    color: @red;
+
+    font-weight: bold;
+
+}