diff --git a/assets/themes/solarized-dark.json b/assets/themes/solarized-dark.json
index 082a4eb686..49ca372e7c 100644
--- a/assets/themes/solarized-dark.json
+++ b/assets/themes/solarized-dark.json
@@ -89,10 +89,6 @@
         "top": 7
       }
     },
-    "margin": {
-      "bottom": 52,
-      "top": 52
-    },
     "shadow": {
       "blur": 16,
       "color": "#00000052",
@@ -158,6 +154,13 @@
         "right": 8
       }
     },
+    "modal": {
+      "margin": {
+        "bottom": 52,
+        "top": 52
+      },
+      "cursor": "Arrow"
+    },
     "left_sidebar": {
       "width": 30,
       "background": "#073642",
@@ -689,33 +692,88 @@
       }
     },
     "syntax": {
-      "keyword": "#268bd2",
-      "function": "#b58900",
-      "string": "#cb4b16",
-      "type": "#2aa198",
-      "number": "#859900",
-      "comment": "#eee8d5",
-      "property": "#268bd2",
-      "variant": "#268bd2",
-      "constant": "#839496",
+      "primary": {
+        "color": "#fdf6e3",
+        "weight": "normal"
+      },
+      "comment": {
+        "color": "#eee8d5",
+        "weight": "normal"
+      },
+      "punctuation": {
+        "color": "#93a1a1",
+        "weight": "normal"
+      },
+      "constant": {
+        "color": "#839496",
+        "weight": "normal"
+      },
+      "keyword": {
+        "color": "#268bd2",
+        "weight": "normal"
+      },
+      "function": {
+        "color": "#b58900",
+        "weight": "normal"
+      },
+      "type": {
+        "color": "#2aa198",
+        "weight": "normal"
+      },
+      "variant": {
+        "color": "#268bd2",
+        "weight": "normal"
+      },
+      "property": {
+        "color": "#268bd2",
+        "weight": "normal"
+      },
+      "enum": {
+        "color": "#cb4b16",
+        "weight": "normal"
+      },
+      "operator": {
+        "color": "#cb4b16",
+        "weight": "normal"
+      },
+      "string": {
+        "color": "#cb4b16",
+        "weight": "normal"
+      },
+      "number": {
+        "color": "#859900",
+        "weight": "normal"
+      },
+      "boolean": {
+        "color": "#859900",
+        "weight": "normal"
+      },
+      "predictive": {
+        "color": "#93a1a1",
+        "weight": "normal"
+      },
       "title": {
         "color": "#b58900",
         "weight": "bold"
       },
-      "emphasis": "#268bd2",
-      "emphasis_strong": {
+      "emphasis": {
+        "color": "#268bd2",
+        "weight": "normal"
+      },
+      "emphasis.strong": {
         "color": "#268bd2",
         "weight": "bold"
       },
       "link_uri": {
         "color": "#859900",
+        "weight": "normal",
         "underline": true
       },
       "link_text": {
         "color": "#cb4b16",
+        "weight": "normal",
         "italic": true
-      },
-      "list_marker": "#93a1a1"
+      }
     }
   },
   "project_diagnostics": {
diff --git a/assets/themes/solarized-light.json b/assets/themes/solarized-light.json
index ce8042152d..f086d651dd 100644
--- a/assets/themes/solarized-light.json
+++ b/assets/themes/solarized-light.json
@@ -89,10 +89,6 @@
         "top": 7
       }
     },
-    "margin": {
-      "bottom": 52,
-      "top": 52
-    },
     "shadow": {
       "blur": 16,
       "color": "#00000052",
@@ -158,6 +154,13 @@
         "right": 8
       }
     },
+    "modal": {
+      "margin": {
+        "bottom": 52,
+        "top": 52
+      },
+      "cursor": "Arrow"
+    },
     "left_sidebar": {
       "width": 30,
       "background": "#eee8d5",
@@ -689,33 +692,88 @@
       }
     },
     "syntax": {
-      "keyword": "#268bd2",
-      "function": "#b58900",
-      "string": "#cb4b16",
-      "type": "#2aa198",
-      "number": "#859900",
-      "comment": "#073642",
-      "property": "#268bd2",
-      "variant": "#268bd2",
-      "constant": "#657b83",
+      "primary": {
+        "color": "#002b36",
+        "weight": "normal"
+      },
+      "comment": {
+        "color": "#073642",
+        "weight": "normal"
+      },
+      "punctuation": {
+        "color": "#586e75",
+        "weight": "normal"
+      },
+      "constant": {
+        "color": "#657b83",
+        "weight": "normal"
+      },
+      "keyword": {
+        "color": "#268bd2",
+        "weight": "normal"
+      },
+      "function": {
+        "color": "#b58900",
+        "weight": "normal"
+      },
+      "type": {
+        "color": "#2aa198",
+        "weight": "normal"
+      },
+      "variant": {
+        "color": "#268bd2",
+        "weight": "normal"
+      },
+      "property": {
+        "color": "#268bd2",
+        "weight": "normal"
+      },
+      "enum": {
+        "color": "#cb4b16",
+        "weight": "normal"
+      },
+      "operator": {
+        "color": "#cb4b16",
+        "weight": "normal"
+      },
+      "string": {
+        "color": "#cb4b16",
+        "weight": "normal"
+      },
+      "number": {
+        "color": "#859900",
+        "weight": "normal"
+      },
+      "boolean": {
+        "color": "#859900",
+        "weight": "normal"
+      },
+      "predictive": {
+        "color": "#586e75",
+        "weight": "normal"
+      },
       "title": {
         "color": "#b58900",
         "weight": "bold"
       },
-      "emphasis": "#268bd2",
-      "emphasis_strong": {
+      "emphasis": {
+        "color": "#268bd2",
+        "weight": "normal"
+      },
+      "emphasis.strong": {
         "color": "#268bd2",
         "weight": "bold"
       },
       "link_uri": {
         "color": "#859900",
+        "weight": "normal",
         "underline": true
       },
       "link_text": {
         "color": "#cb4b16",
+        "weight": "normal",
         "italic": true
-      },
-      "list_marker": "#586e75"
+      }
     }
   },
   "project_diagnostics": {
diff --git a/styles/src/themes/solarized.ts b/styles/src/themes/solarized.ts
index 94c853c1a5..5065c4d668 100644
--- a/styles/src/themes/solarized.ts
+++ b/styles/src/themes/solarized.ts
@@ -217,22 +217,22 @@ export function solarized(darkTheme: boolean): Theme {
       weight: fontWeights.bold,
     },
     emphasis: {
-      color: textColor.active,
+      color: textColor.feature,
       weight: fontWeights.normal,
     },
-    emphasisStrong: {
-      color: textColor.active,
+    "emphasis.strong": {
+      color: textColor.feature,
       weight: fontWeights.bold,
     },
-    linkUrl: {
+    linkUri: {
       color: colors.green,
       weight: fontWeights.normal,
-      // TODO: add underline
+      underline: true,
     },
     linkText: {
       color: colors.orange,
       weight: fontWeights.normal,
-      // TODO: add italic
+      italic: true,
     },
   };