7 files changed, 255 insertions, 156 deletions
diff --git a/themes/Adwaita/Makefile.am b/themes/Adwaita/Makefile.am
index dd9b215..fad763a 100644
--- a/themes/Adwaita/Makefile.am
+++ b/themes/Adwaita/Makefile.am
@@ -5,7 +5,9 @@ GTK3_CSS =								\
 	display.css							\
 	icons.css							\
 	portions.css						\
-	widgets.css							\
+	tokens-light.css					\
+	tokens-dark.css						\
+	widgets-light.css					\
 	widgets-dark.css					\
 	clean.png							\
 	redo.png							\
diff --git a/themes/Adwaita/definition.xml b/themes/Adwaita/definition.xml
index b469695..70efbae 100644
--- a/themes/Adwaita/definition.xml
+++ b/themes/Adwaita/definition.xml
@@ -13,9 +13,11 @@
       <path>portions.css</path>
     </common>
     <light>
-      <path>widgets.css</path>
+      <path>tokens-light.css</path>
+      <path>widgets-light.css</path>
     </light>
     <dark>
+      <path>tokens-dark.css</path>
       <path>widgets-dark.css</path>
     </dark>
   </resources>
diff --git a/themes/Adwaita/display.css b/themes/Adwaita/display.css
index 977490d..952dd99 100644
--- a/themes/Adwaita/display.css
+++ b/themes/Adwaita/display.css
@@ -1,157 +1,4 @@
 
-.segment-raw {
-
-    color: #000;
-
-
-}
-
-.segment-comment {
-
-    color: #37b05b;
-
-
-}
-
-.segment-indication {
-
-    color: #828282;
-
-    font-style: italic;
-
-}
-
-.segment-phys-addr-padding {
-
-    color: darker(#7c7c7b);
-
-}
-
-.segment-phys-addr {
-
-    color: #7c7c7b;
-
-}
-
-.segment-virt-addr-padding {
-
-    color: darker(#7c7c7b);
-
-}
-
-.segment-virt-addr {
-
-    color: #7c7c7b;
-
-}
-
-.segment-raw-code {
-
-    color: #000;
-
-}
-
-.segment-label {
-
-    color: #ffd200;
-
-}
-
-.segment-instruction {
-
-    color: #bebebe;
-
-
-}
-
-.segment-immediate {
-
-    color: #a020f0;
-
-
-}
-
-.segment-register {
-
-    color: #4141d1;
-
-
-}
-
-.segment-punct {
-
-    color: #000;
-
-    font-weight: bold;
-
-}
-
-.segment-hooks {
-
-    color: #000;
-
-    font-weight: bold;
-
-}
-
-.segment-signs {
-
-    color: #000;
-
-    font-weight: bold;
-
-}
-
-.segment-ltgt {
-
-    color: #000;
-
-
-}
-
-.segment-section {
-
-    color: #c80a0a;
-
-
-}
-
-.segment-segment {
-
-    color: #000;
-
-
-}
-
-.segment-string {
-
-    color: #cc7e00;
-
-
-}
-
-.segment-var-name {
-
-    color: #000;
-
-
-}
-
-.segment-keyword {
-
-    color: #000;
-
-
-}
-
-.segment-error {
-
-    color: #ff0000;
-
-    font-weight: bold;
-
-}
-
 .filter-error {
 
     color: #f00
diff --git a/themes/Adwaita/gresource.xml b/themes/Adwaita/gresource.xml
index 32a8a09..ddefbf6 100644
--- a/themes/Adwaita/gresource.xml
+++ b/themes/Adwaita/gresource.xml
@@ -6,7 +6,9 @@
         <file compressed="true">display.css</file>
         <file compressed="true">icons.css</file>
         <file compressed="true">portions.css</file>
-        <file compressed="true">widgets.css</file>
+        <file compressed="true">tokens-light.css</file>
+        <file compressed="true">widgets-light.css</file>
+        <file compressed="true">tokens-dark.css</file>
         <file compressed="true">widgets-dark.css</file>
     </gresource>
 </gresources>
diff --git a/themes/Adwaita/tokens-dark.css b/themes/Adwaita/tokens-dark.css
new file mode 100644
index 0000000..78b7f57
--- /dev/null
+++ b/themes/Adwaita/tokens-dark.css
@@ -0,0 +1,123 @@
+
+/* Hex display */
+
+.token-raw {
+
+    color: #999;
+
+}
+
+.token-raw-full {
+
+    color: #fff;
+
+    font-weight: bold;
+
+}
+
+.token-raw-null {
+
+    color: #000;
+
+}
+
+.token-printable {
+
+    color: #999;
+
+}
+
+.token-not-printable {
+
+    color: #000;
+
+}
+
+/* Assembly views */
+
+.token-comment,
+.token-indication {
+
+    color: #37b05b;
+
+}
+
+.token-phys-addr-padding,
+.token-virt-addr-padding {
+
+    color: darker(#7c7c7b);
+
+}
+
+.token-phys-addr,
+.token-virt-addr {
+
+    color: #7c7c7b;
+
+}
+
+.token-raw-code,
+.token-raw-code-null {
+
+    color: #000;
+
+
+}
+
+.token-label,
+.token-section,
+.token-segment {
+
+    color: #ffd200;
+
+}
+
+.token-instruction,
+.token-keyword {
+
+    color: #bebebe;
+
+}
+
+.token-immediate {
+
+    color: #a020f0;
+
+}
+
+.token-register {
+
+    color: #4141d1;
+
+}
+
+.token-punct,
+.token-hooks,
+.token-signs,
+.token-ltgt {
+
+    color: #000;
+
+    font-weight: bold;
+
+}
+
+.token-string {
+
+    color: #cc7e00;
+
+}
+
+.token-var-name {
+
+    color: #c50;
+
+}
+
+.token-error {
+
+    color: #ff0000;
+
+    font-weight: bold;
+
+}
diff --git a/themes/Adwaita/tokens-light.css b/themes/Adwaita/tokens-light.css
new file mode 100644
index 0000000..3485288
--- /dev/null
+++ b/themes/Adwaita/tokens-light.css
@@ -0,0 +1,123 @@
+
+/* Hex display */
+
+.token-raw {
+
+    color: #555;
+
+}
+
+.token-raw-full {
+
+    color: #000;
+
+    font-weight: bold;
+
+}
+
+.token-raw-null {
+
+    color: #ccc;
+
+}
+
+.token-printable {
+
+    color: #555;
+
+}
+
+.token-not-printable {
+
+    color: #ccc;
+
+}
+
+/* Assembly views */
+
+.token-comment,
+.token-indication {
+
+    color: #37b05b;
+
+}
+
+.token-phys-addr-padding,
+.token-virt-addr-padding {
+
+    color: #bebebe;
+
+}
+
+.token-phys-addr,
+.token-virt-addr {
+
+    color: #7c7c7b;
+
+}
+
+.token-raw-code,
+.token-raw-code-null {
+
+    color: #000;
+
+
+}
+
+.token-label,
+.token-section,
+.token-segment {
+
+    color: #d2ad00;
+
+}
+
+.token-instruction,
+.token-keyword {
+
+    color: darker(#7c7c7b);
+
+}
+
+.token-immediate {
+
+    color: #a020f0;
+
+}
+
+.token-register {
+
+    color: #4141d1;
+
+}
+
+.token-punct,
+.token-hooks,
+.token-signs,
+.token-ltgt {
+
+    color: #000;
+
+    font-weight: bold;
+
+}
+
+.token-string {
+
+    color: #cc7e00;
+
+}
+
+.token-var-name {
+
+    color: #c50;
+
+}
+
+.token-error {
+
+    color: #ff0000;
+
+    font-weight: bold;
+
+}
diff --git a/themes/Adwaita/widgets.css b/themes/Adwaita/widgets-light.css
index 6666efb..6666efb 100644
--- a/themes/Adwaita/widgets.css
+++ b/themes/Adwaita/widgets-light.css