From a1576b7dcaef489abe7c48c6cd70b77bc77768b8 Mon Sep 17 00:00:00 2001
From: Keith Simmons <keith@zed.dev>
Date: Fri, 22 Apr 2022 14:58:24 -0700
Subject: [PATCH] fix solarized element backgrounds

---
 assets/themes/solarized-dark.json  |   2 +-
 assets/themes/solarized-light.json |   2 +-
 styles/dist/solarized-dark.json    | 112 ++---
 styles/dist/solarized-light.json   | 567 ++++++++++++++++++++++++
 styles/dist/tokens.json            | 679 ++++++++++++++++++++++++++---
 styles/src/themes/solarized.ts     |   8 +-
 6 files changed, 1252 insertions(+), 118 deletions(-)
 create mode 100644 styles/dist/solarized-light.json

diff --git a/assets/themes/solarized-dark.json b/assets/themes/solarized-dark.json
index 618d25e9ca..082a4eb686 100644
--- a/assets/themes/solarized-dark.json
+++ b/assets/themes/solarized-dark.json
@@ -745,7 +745,7 @@
         "size": 12
       },
       "corner_radius": 4,
-      "background": "#073642",
+      "background": "#002b36",
       "border": {
         "color": "#073642",
         "width": 1
diff --git a/assets/themes/solarized-light.json b/assets/themes/solarized-light.json
index d58172e8d4..ce8042152d 100644
--- a/assets/themes/solarized-light.json
+++ b/assets/themes/solarized-light.json
@@ -745,7 +745,7 @@
         "size": 12
       },
       "corner_radius": 4,
-      "background": "#eee8d5",
+      "background": "#fdf6e3",
       "border": {
         "color": "#eee8d5",
         "width": 1
diff --git a/styles/dist/solarized-dark.json b/styles/dist/solarized-dark.json
index f6f19297fe..e5ed5d181f 100644
--- a/styles/dist/solarized-dark.json
+++ b/styles/dist/solarized-dark.json
@@ -4,15 +4,15 @@
   },
   "text": {
     "primary": {
-      "value": "#fdf6e3",
-      "type": "color"
-    },
-    "secondary": {
       "value": "#eee8d5",
       "type": "color"
     },
+    "secondary": {
+      "value": "#93a1a1",
+      "type": "color"
+    },
     "muted": {
-      "value": "#839496",
+      "value": "#93a1a1",
       "type": "color"
     },
     "placeholder": {
@@ -20,7 +20,7 @@
       "type": "color"
     },
     "active": {
-      "value": "#002b36",
+      "value": "#fdf6e3",
       "type": "color"
     },
     "feature": {
@@ -46,15 +46,15 @@
   },
   "icon": {
     "primary": {
-      "value": "#fdf6e3",
-      "type": "color"
-    },
-    "secondary": {
       "value": "#eee8d5",
       "type": "color"
     },
+    "secondary": {
+      "value": "#93a1a1",
+      "type": "color"
+    },
     "muted": {
-      "value": "#839496",
+      "value": "#93a1a1",
       "type": "color"
     },
     "placeholder": {
@@ -62,7 +62,7 @@
       "type": "color"
     },
     "active": {
-      "value": "#002b36",
+      "value": "#fdf6e3",
       "type": "color"
     },
     "feature": {
@@ -93,7 +93,7 @@
         "type": "color"
       },
       "hovered": {
-        "value": "#002b36",
+        "value": "#586e75",
         "type": "color"
       },
       "active": {
@@ -101,49 +101,49 @@
         "type": "color"
       },
       "focused": {
-        "value": "#657b83",
+        "value": "#586e75",
         "type": "color"
       }
     },
     "300": {
       "base": {
-        "value": "#586e75",
-        "type": "color"
-      },
-      "hovered": {
         "value": "#073642",
         "type": "color"
       },
+      "hovered": {
+        "value": "#586e75",
+        "type": "color"
+      },
       "active": {
-        "value": "#657b83",
+        "value": "#586e75",
         "type": "color"
       },
       "focused": {
-        "value": "#839496",
+        "value": "#586e75",
         "type": "color"
       }
     },
     "500": {
       "base": {
-        "value": "#657b83",
+        "value": "#002b36",
         "type": "color"
       },
       "hovered": {
-        "value": "#586e75",
+        "value": "#073642",
         "type": "color"
       },
       "active": {
-        "value": "#839496",
+        "value": "#073642",
         "type": "color"
       },
       "focused": {
-        "value": "#839496",
+        "value": "#073642",
         "type": "color"
       }
     },
     "on300": {
       "base": {
-        "value": "#586e75",
+        "value": "#002b36",
         "type": "color"
       },
       "hovered": {
@@ -151,29 +151,29 @@
         "type": "color"
       },
       "active": {
-        "value": "#657b83",
+        "value": "#073642",
         "type": "color"
       },
       "focused": {
-        "value": "#839496",
+        "value": "#073642",
         "type": "color"
       }
     },
     "on500": {
       "base": {
-        "value": "#586e75",
-        "type": "color"
-      },
-      "hovered": {
         "value": "#073642",
         "type": "color"
       },
+      "hovered": {
+        "value": "#586e75",
+        "type": "color"
+      },
       "active": {
-        "value": "#657b83",
+        "value": "#586e75",
         "type": "color"
       },
       "focused": {
-        "value": "#839496",
+        "value": "#586e75",
         "type": "color"
       }
     },
@@ -252,23 +252,23 @@
   },
   "border": {
     "primary": {
-      "value": "#657b83",
-      "type": "color"
-    },
-    "secondary": {
-      "value": "#586e75",
-      "type": "color"
-    },
-    "muted": {
-      "value": "#073642",
-      "type": "color"
-    },
-    "focused": {
       "value": "#002b36",
       "type": "color"
     },
+    "secondary": {
+      "value": "#073642",
+      "type": "color"
+    },
+    "muted": {
+      "value": "#586e75",
+      "type": "color"
+    },
+    "focused": {
+      "value": "#586e75",
+      "type": "color"
+    },
     "active": {
-      "value": "#839496",
+      "value": "#586e75",
       "type": "color"
     },
     "ok": {
@@ -290,24 +290,24 @@
   },
   "editor": {
     "background": {
-      "value": "#657b83",
+      "value": "#002b36",
       "type": "color"
     },
     "indent_guide": {
-      "value": "#073642",
+      "value": "#586e75",
       "type": "color"
     },
     "indent_guide_active": {
-      "value": "#586e75",
+      "value": "#073642",
       "type": "color"
     },
     "line": {
       "active": {
-        "value": "#002b3612",
+        "value": "#fdf6e312",
         "type": "color"
       },
       "highlighted": {
-        "value": "#002b361f",
+        "value": "#fdf6e31f",
         "type": "color"
       },
       "inserted": {
@@ -329,15 +329,15 @@
         "type": "color"
       },
       "occurrence": {
-        "value": "#002b361f",
+        "value": "#657b831f",
         "type": "color"
       },
       "activeOccurrence": {
-        "value": "#002b3629",
+        "value": "#657b8329",
         "type": "color"
       },
       "matchingBracket": {
-        "value": "#839496",
+        "value": "#073642",
         "type": "color"
       },
       "match": {
@@ -349,7 +349,7 @@
         "type": "color"
       },
       "related": {
-        "value": "#839496",
+        "value": "#073642",
         "type": "color"
       }
     },
@@ -359,7 +359,7 @@
         "type": "color"
       },
       "active": {
-        "value": "#002b36",
+        "value": "#fdf6e3",
         "type": "color"
       }
     }
diff --git a/styles/dist/solarized-light.json b/styles/dist/solarized-light.json
new file mode 100644
index 0000000000..73eae57a7f
--- /dev/null
+++ b/styles/dist/solarized-light.json
@@ -0,0 +1,567 @@
+{
+  "meta": {
+    "themeName": "solarized-light"
+  },
+  "text": {
+    "primary": {
+      "value": "#073642",
+      "type": "color"
+    },
+    "secondary": {
+      "value": "#586e75",
+      "type": "color"
+    },
+    "muted": {
+      "value": "#586e75",
+      "type": "color"
+    },
+    "placeholder": {
+      "value": "#657b83",
+      "type": "color"
+    },
+    "active": {
+      "value": "#002b36",
+      "type": "color"
+    },
+    "feature": {
+      "value": "#268bd2",
+      "type": "color"
+    },
+    "ok": {
+      "value": "#859900",
+      "type": "color"
+    },
+    "error": {
+      "value": "#dc322f",
+      "type": "color"
+    },
+    "warning": {
+      "value": "#b58900",
+      "type": "color"
+    },
+    "info": {
+      "value": "#268bd2",
+      "type": "color"
+    }
+  },
+  "icon": {
+    "primary": {
+      "value": "#073642",
+      "type": "color"
+    },
+    "secondary": {
+      "value": "#586e75",
+      "type": "color"
+    },
+    "muted": {
+      "value": "#586e75",
+      "type": "color"
+    },
+    "placeholder": {
+      "value": "#657b83",
+      "type": "color"
+    },
+    "active": {
+      "value": "#002b36",
+      "type": "color"
+    },
+    "feature": {
+      "value": "#268bd2",
+      "type": "color"
+    },
+    "ok": {
+      "value": "#859900",
+      "type": "color"
+    },
+    "error": {
+      "value": "#dc322f",
+      "type": "color"
+    },
+    "warning": {
+      "value": "#b58900",
+      "type": "color"
+    },
+    "info": {
+      "value": "#268bd2",
+      "type": "color"
+    }
+  },
+  "background": {
+    "100": {
+      "base": {
+        "value": "#eee8d5",
+        "type": "color"
+      },
+      "hovered": {
+        "value": "#93a1a1",
+        "type": "color"
+      },
+      "active": {
+        "value": "#93a1a1",
+        "type": "color"
+      },
+      "focused": {
+        "value": "#93a1a1",
+        "type": "color"
+      }
+    },
+    "300": {
+      "base": {
+        "value": "#eee8d5",
+        "type": "color"
+      },
+      "hovered": {
+        "value": "#93a1a1",
+        "type": "color"
+      },
+      "active": {
+        "value": "#93a1a1",
+        "type": "color"
+      },
+      "focused": {
+        "value": "#93a1a1",
+        "type": "color"
+      }
+    },
+    "500": {
+      "base": {
+        "value": "#fdf6e3",
+        "type": "color"
+      },
+      "hovered": {
+        "value": "#eee8d5",
+        "type": "color"
+      },
+      "active": {
+        "value": "#eee8d5",
+        "type": "color"
+      },
+      "focused": {
+        "value": "#eee8d5",
+        "type": "color"
+      }
+    },
+    "on300": {
+      "base": {
+        "value": "#fdf6e3",
+        "type": "color"
+      },
+      "hovered": {
+        "value": "#eee8d5",
+        "type": "color"
+      },
+      "active": {
+        "value": "#eee8d5",
+        "type": "color"
+      },
+      "focused": {
+        "value": "#eee8d5",
+        "type": "color"
+      }
+    },
+    "on500": {
+      "base": {
+        "value": "#eee8d5",
+        "type": "color"
+      },
+      "hovered": {
+        "value": "#93a1a1",
+        "type": "color"
+      },
+      "active": {
+        "value": "#93a1a1",
+        "type": "color"
+      },
+      "focused": {
+        "value": "#93a1a1",
+        "type": "color"
+      }
+    },
+    "ok": {
+      "base": {
+        "value": "#859900",
+        "type": "color"
+      },
+      "hovered": {
+        "value": "#859900",
+        "type": "color"
+      },
+      "active": {
+        "value": "#859900",
+        "type": "color"
+      },
+      "focused": {
+        "value": "#859900",
+        "type": "color"
+      }
+    },
+    "error": {
+      "base": {
+        "value": "#dc322f",
+        "type": "color"
+      },
+      "hovered": {
+        "value": "#dc322f",
+        "type": "color"
+      },
+      "active": {
+        "value": "#dc322f",
+        "type": "color"
+      },
+      "focused": {
+        "value": "#dc322f",
+        "type": "color"
+      }
+    },
+    "warning": {
+      "base": {
+        "value": "#b58900",
+        "type": "color"
+      },
+      "hovered": {
+        "value": "#b58900",
+        "type": "color"
+      },
+      "active": {
+        "value": "#b58900",
+        "type": "color"
+      },
+      "focused": {
+        "value": "#b58900",
+        "type": "color"
+      }
+    },
+    "info": {
+      "base": {
+        "value": "#268bd2",
+        "type": "color"
+      },
+      "hovered": {
+        "value": "#268bd2",
+        "type": "color"
+      },
+      "active": {
+        "value": "#268bd2",
+        "type": "color"
+      },
+      "focused": {
+        "value": "#268bd2",
+        "type": "color"
+      }
+    }
+  },
+  "border": {
+    "primary": {
+      "value": "#fdf6e3",
+      "type": "color"
+    },
+    "secondary": {
+      "value": "#eee8d5",
+      "type": "color"
+    },
+    "muted": {
+      "value": "#93a1a1",
+      "type": "color"
+    },
+    "focused": {
+      "value": "#93a1a1",
+      "type": "color"
+    },
+    "active": {
+      "value": "#93a1a1",
+      "type": "color"
+    },
+    "ok": {
+      "value": "#859900",
+      "type": "color"
+    },
+    "error": {
+      "value": "#dc322f",
+      "type": "color"
+    },
+    "warning": {
+      "value": "#b58900",
+      "type": "color"
+    },
+    "info": {
+      "value": "#268bd2",
+      "type": "color"
+    }
+  },
+  "editor": {
+    "background": {
+      "value": "#fdf6e3",
+      "type": "color"
+    },
+    "indent_guide": {
+      "value": "#93a1a1",
+      "type": "color"
+    },
+    "indent_guide_active": {
+      "value": "#eee8d5",
+      "type": "color"
+    },
+    "line": {
+      "active": {
+        "value": "#002b3612",
+        "type": "color"
+      },
+      "highlighted": {
+        "value": "#002b361f",
+        "type": "color"
+      },
+      "inserted": {
+        "value": "#859900",
+        "type": "color"
+      },
+      "deleted": {
+        "value": "#dc322f",
+        "type": "color"
+      },
+      "modified": {
+        "value": "#268bd2",
+        "type": "color"
+      }
+    },
+    "highlight": {
+      "selection": {
+        "value": "#268bd23d",
+        "type": "color"
+      },
+      "occurrence": {
+        "value": "#8394961f",
+        "type": "color"
+      },
+      "activeOccurrence": {
+        "value": "#83949629",
+        "type": "color"
+      },
+      "matchingBracket": {
+        "value": "#eee8d5",
+        "type": "color"
+      },
+      "match": {
+        "value": "#6c71c480",
+        "type": "color"
+      },
+      "activeMatch": {
+        "value": "#6c71c4b3",
+        "type": "color"
+      },
+      "related": {
+        "value": "#eee8d5",
+        "type": "color"
+      }
+    },
+    "gutter": {
+      "primary": {
+        "value": "#657b83",
+        "type": "color"
+      },
+      "active": {
+        "value": "#002b36",
+        "type": "color"
+      }
+    }
+  },
+  "syntax": {
+    "primary": {
+      "value": "#002b36",
+      "type": "color"
+    },
+    "comment": {
+      "value": "#073642",
+      "type": "color"
+    },
+    "keyword": {
+      "value": "#268bd2",
+      "type": "color"
+    },
+    "function": {
+      "value": "#b58900",
+      "type": "color"
+    },
+    "type": {
+      "value": "#2aa198",
+      "type": "color"
+    },
+    "variant": {
+      "value": "#268bd2",
+      "type": "color"
+    },
+    "property": {
+      "value": "#268bd2",
+      "type": "color"
+    },
+    "enum": {
+      "value": "#cb4b16",
+      "type": "color"
+    },
+    "operator": {
+      "value": "#cb4b16",
+      "type": "color"
+    },
+    "string": {
+      "value": "#cb4b16",
+      "type": "color"
+    },
+    "number": {
+      "value": "#859900",
+      "type": "color"
+    },
+    "boolean": {
+      "value": "#859900",
+      "type": "color"
+    }
+  },
+  "player": {
+    "1": {
+      "baseColor": {
+        "value": "#268bd2",
+        "type": "color"
+      },
+      "cursorColor": {
+        "value": "#268bd2",
+        "type": "color"
+      },
+      "selectionColor": {
+        "value": "#268bd23d",
+        "type": "color"
+      },
+      "borderColor": {
+        "value": "#268bd2cc",
+        "type": "color"
+      }
+    },
+    "2": {
+      "baseColor": {
+        "value": "#859900",
+        "type": "color"
+      },
+      "cursorColor": {
+        "value": "#859900",
+        "type": "color"
+      },
+      "selectionColor": {
+        "value": "#8599003d",
+        "type": "color"
+      },
+      "borderColor": {
+        "value": "#859900cc",
+        "type": "color"
+      }
+    },
+    "3": {
+      "baseColor": {
+        "value": "#d33682",
+        "type": "color"
+      },
+      "cursorColor": {
+        "value": "#d33682",
+        "type": "color"
+      },
+      "selectionColor": {
+        "value": "#d336823d",
+        "type": "color"
+      },
+      "borderColor": {
+        "value": "#d33682cc",
+        "type": "color"
+      }
+    },
+    "4": {
+      "baseColor": {
+        "value": "#cb4b16",
+        "type": "color"
+      },
+      "cursorColor": {
+        "value": "#cb4b16",
+        "type": "color"
+      },
+      "selectionColor": {
+        "value": "#cb4b163d",
+        "type": "color"
+      },
+      "borderColor": {
+        "value": "#cb4b16cc",
+        "type": "color"
+      }
+    },
+    "5": {
+      "baseColor": {
+        "value": "#6c71c4",
+        "type": "color"
+      },
+      "cursorColor": {
+        "value": "#6c71c4",
+        "type": "color"
+      },
+      "selectionColor": {
+        "value": "#6c71c43d",
+        "type": "color"
+      },
+      "borderColor": {
+        "value": "#6c71c4cc",
+        "type": "color"
+      }
+    },
+    "6": {
+      "baseColor": {
+        "value": "#2aa198",
+        "type": "color"
+      },
+      "cursorColor": {
+        "value": "#2aa198",
+        "type": "color"
+      },
+      "selectionColor": {
+        "value": "#2aa1983d",
+        "type": "color"
+      },
+      "borderColor": {
+        "value": "#2aa198cc",
+        "type": "color"
+      }
+    },
+    "7": {
+      "baseColor": {
+        "value": "#dc322f",
+        "type": "color"
+      },
+      "cursorColor": {
+        "value": "#dc322f",
+        "type": "color"
+      },
+      "selectionColor": {
+        "value": "#dc322f3d",
+        "type": "color"
+      },
+      "borderColor": {
+        "value": "#dc322fcc",
+        "type": "color"
+      }
+    },
+    "8": {
+      "baseColor": {
+        "value": "#b58900",
+        "type": "color"
+      },
+      "cursorColor": {
+        "value": "#b58900",
+        "type": "color"
+      },
+      "selectionColor": {
+        "value": "#b589003d",
+        "type": "color"
+      },
+      "borderColor": {
+        "value": "#b58900cc",
+        "type": "color"
+      }
+    }
+  },
+  "shadowAlpha": {
+    "value": 0.32,
+    "type": "number"
+  }
+}
\ No newline at end of file
diff --git a/styles/dist/tokens.json b/styles/dist/tokens.json
index be6cab708e..cb0c0744af 100644
--- a/styles/dist/tokens.json
+++ b/styles/dist/tokens.json
@@ -2522,15 +2522,15 @@
     },
     "text": {
       "primary": {
-        "value": "#fdf6e3",
-        "type": "color"
-      },
-      "secondary": {
         "value": "#eee8d5",
         "type": "color"
       },
+      "secondary": {
+        "value": "#93a1a1",
+        "type": "color"
+      },
       "muted": {
-        "value": "#839496",
+        "value": "#93a1a1",
         "type": "color"
       },
       "placeholder": {
@@ -2538,7 +2538,7 @@
         "type": "color"
       },
       "active": {
-        "value": "#002b36",
+        "value": "#fdf6e3",
         "type": "color"
       },
       "feature": {
@@ -2564,15 +2564,15 @@
     },
     "icon": {
       "primary": {
-        "value": "#fdf6e3",
-        "type": "color"
-      },
-      "secondary": {
         "value": "#eee8d5",
         "type": "color"
       },
+      "secondary": {
+        "value": "#93a1a1",
+        "type": "color"
+      },
       "muted": {
-        "value": "#839496",
+        "value": "#93a1a1",
         "type": "color"
       },
       "placeholder": {
@@ -2580,7 +2580,7 @@
         "type": "color"
       },
       "active": {
-        "value": "#002b36",
+        "value": "#fdf6e3",
         "type": "color"
       },
       "feature": {
@@ -2611,7 +2611,7 @@
           "type": "color"
         },
         "hovered": {
-          "value": "#002b36",
+          "value": "#586e75",
           "type": "color"
         },
         "active": {
@@ -2619,49 +2619,49 @@
           "type": "color"
         },
         "focused": {
-          "value": "#657b83",
+          "value": "#586e75",
           "type": "color"
         }
       },
       "300": {
         "base": {
-          "value": "#586e75",
-          "type": "color"
-        },
-        "hovered": {
           "value": "#073642",
           "type": "color"
         },
+        "hovered": {
+          "value": "#586e75",
+          "type": "color"
+        },
         "active": {
-          "value": "#657b83",
+          "value": "#586e75",
           "type": "color"
         },
         "focused": {
-          "value": "#839496",
+          "value": "#586e75",
           "type": "color"
         }
       },
       "500": {
         "base": {
-          "value": "#657b83",
+          "value": "#002b36",
           "type": "color"
         },
         "hovered": {
-          "value": "#586e75",
+          "value": "#073642",
           "type": "color"
         },
         "active": {
-          "value": "#839496",
+          "value": "#073642",
           "type": "color"
         },
         "focused": {
-          "value": "#839496",
+          "value": "#073642",
           "type": "color"
         }
       },
       "on300": {
         "base": {
-          "value": "#586e75",
+          "value": "#002b36",
           "type": "color"
         },
         "hovered": {
@@ -2669,29 +2669,29 @@
           "type": "color"
         },
         "active": {
-          "value": "#657b83",
+          "value": "#073642",
           "type": "color"
         },
         "focused": {
-          "value": "#839496",
+          "value": "#073642",
           "type": "color"
         }
       },
       "on500": {
         "base": {
-          "value": "#586e75",
-          "type": "color"
-        },
-        "hovered": {
           "value": "#073642",
           "type": "color"
         },
+        "hovered": {
+          "value": "#586e75",
+          "type": "color"
+        },
         "active": {
-          "value": "#657b83",
+          "value": "#586e75",
           "type": "color"
         },
         "focused": {
-          "value": "#839496",
+          "value": "#586e75",
           "type": "color"
         }
       },
@@ -2770,23 +2770,23 @@
     },
     "border": {
       "primary": {
-        "value": "#657b83",
-        "type": "color"
-      },
-      "secondary": {
-        "value": "#586e75",
-        "type": "color"
-      },
-      "muted": {
-        "value": "#073642",
-        "type": "color"
-      },
-      "focused": {
         "value": "#002b36",
         "type": "color"
       },
+      "secondary": {
+        "value": "#073642",
+        "type": "color"
+      },
+      "muted": {
+        "value": "#586e75",
+        "type": "color"
+      },
+      "focused": {
+        "value": "#586e75",
+        "type": "color"
+      },
       "active": {
-        "value": "#839496",
+        "value": "#586e75",
         "type": "color"
       },
       "ok": {
@@ -2808,24 +2808,24 @@
     },
     "editor": {
       "background": {
-        "value": "#657b83",
+        "value": "#002b36",
         "type": "color"
       },
       "indent_guide": {
-        "value": "#073642",
+        "value": "#586e75",
         "type": "color"
       },
       "indent_guide_active": {
-        "value": "#586e75",
+        "value": "#073642",
         "type": "color"
       },
       "line": {
         "active": {
-          "value": "#002b3612",
+          "value": "#fdf6e312",
           "type": "color"
         },
         "highlighted": {
-          "value": "#002b361f",
+          "value": "#fdf6e31f",
           "type": "color"
         },
         "inserted": {
@@ -2847,15 +2847,15 @@
           "type": "color"
         },
         "occurrence": {
-          "value": "#002b361f",
+          "value": "#657b831f",
           "type": "color"
         },
         "activeOccurrence": {
-          "value": "#002b3629",
+          "value": "#657b8329",
           "type": "color"
         },
         "matchingBracket": {
-          "value": "#839496",
+          "value": "#073642",
           "type": "color"
         },
         "match": {
@@ -2867,7 +2867,7 @@
           "type": "color"
         },
         "related": {
-          "value": "#839496",
+          "value": "#073642",
           "type": "color"
         }
       },
@@ -2877,7 +2877,7 @@
           "type": "color"
         },
         "active": {
-          "value": "#002b36",
+          "value": "#fdf6e3",
           "type": "color"
         }
       }
@@ -3082,5 +3082,572 @@
       "value": 0.32,
       "type": "number"
     }
+  },
+  "solarized-light": {
+    "meta": {
+      "themeName": "solarized-light"
+    },
+    "text": {
+      "primary": {
+        "value": "#073642",
+        "type": "color"
+      },
+      "secondary": {
+        "value": "#586e75",
+        "type": "color"
+      },
+      "muted": {
+        "value": "#586e75",
+        "type": "color"
+      },
+      "placeholder": {
+        "value": "#657b83",
+        "type": "color"
+      },
+      "active": {
+        "value": "#002b36",
+        "type": "color"
+      },
+      "feature": {
+        "value": "#268bd2",
+        "type": "color"
+      },
+      "ok": {
+        "value": "#859900",
+        "type": "color"
+      },
+      "error": {
+        "value": "#dc322f",
+        "type": "color"
+      },
+      "warning": {
+        "value": "#b58900",
+        "type": "color"
+      },
+      "info": {
+        "value": "#268bd2",
+        "type": "color"
+      }
+    },
+    "icon": {
+      "primary": {
+        "value": "#073642",
+        "type": "color"
+      },
+      "secondary": {
+        "value": "#586e75",
+        "type": "color"
+      },
+      "muted": {
+        "value": "#586e75",
+        "type": "color"
+      },
+      "placeholder": {
+        "value": "#657b83",
+        "type": "color"
+      },
+      "active": {
+        "value": "#002b36",
+        "type": "color"
+      },
+      "feature": {
+        "value": "#268bd2",
+        "type": "color"
+      },
+      "ok": {
+        "value": "#859900",
+        "type": "color"
+      },
+      "error": {
+        "value": "#dc322f",
+        "type": "color"
+      },
+      "warning": {
+        "value": "#b58900",
+        "type": "color"
+      },
+      "info": {
+        "value": "#268bd2",
+        "type": "color"
+      }
+    },
+    "background": {
+      "100": {
+        "base": {
+          "value": "#eee8d5",
+          "type": "color"
+        },
+        "hovered": {
+          "value": "#93a1a1",
+          "type": "color"
+        },
+        "active": {
+          "value": "#93a1a1",
+          "type": "color"
+        },
+        "focused": {
+          "value": "#93a1a1",
+          "type": "color"
+        }
+      },
+      "300": {
+        "base": {
+          "value": "#eee8d5",
+          "type": "color"
+        },
+        "hovered": {
+          "value": "#93a1a1",
+          "type": "color"
+        },
+        "active": {
+          "value": "#93a1a1",
+          "type": "color"
+        },
+        "focused": {
+          "value": "#93a1a1",
+          "type": "color"
+        }
+      },
+      "500": {
+        "base": {
+          "value": "#fdf6e3",
+          "type": "color"
+        },
+        "hovered": {
+          "value": "#eee8d5",
+          "type": "color"
+        },
+        "active": {
+          "value": "#eee8d5",
+          "type": "color"
+        },
+        "focused": {
+          "value": "#eee8d5",
+          "type": "color"
+        }
+      },
+      "on300": {
+        "base": {
+          "value": "#fdf6e3",
+          "type": "color"
+        },
+        "hovered": {
+          "value": "#eee8d5",
+          "type": "color"
+        },
+        "active": {
+          "value": "#eee8d5",
+          "type": "color"
+        },
+        "focused": {
+          "value": "#eee8d5",
+          "type": "color"
+        }
+      },
+      "on500": {
+        "base": {
+          "value": "#eee8d5",
+          "type": "color"
+        },
+        "hovered": {
+          "value": "#93a1a1",
+          "type": "color"
+        },
+        "active": {
+          "value": "#93a1a1",
+          "type": "color"
+        },
+        "focused": {
+          "value": "#93a1a1",
+          "type": "color"
+        }
+      },
+      "ok": {
+        "base": {
+          "value": "#859900",
+          "type": "color"
+        },
+        "hovered": {
+          "value": "#859900",
+          "type": "color"
+        },
+        "active": {
+          "value": "#859900",
+          "type": "color"
+        },
+        "focused": {
+          "value": "#859900",
+          "type": "color"
+        }
+      },
+      "error": {
+        "base": {
+          "value": "#dc322f",
+          "type": "color"
+        },
+        "hovered": {
+          "value": "#dc322f",
+          "type": "color"
+        },
+        "active": {
+          "value": "#dc322f",
+          "type": "color"
+        },
+        "focused": {
+          "value": "#dc322f",
+          "type": "color"
+        }
+      },
+      "warning": {
+        "base": {
+          "value": "#b58900",
+          "type": "color"
+        },
+        "hovered": {
+          "value": "#b58900",
+          "type": "color"
+        },
+        "active": {
+          "value": "#b58900",
+          "type": "color"
+        },
+        "focused": {
+          "value": "#b58900",
+          "type": "color"
+        }
+      },
+      "info": {
+        "base": {
+          "value": "#268bd2",
+          "type": "color"
+        },
+        "hovered": {
+          "value": "#268bd2",
+          "type": "color"
+        },
+        "active": {
+          "value": "#268bd2",
+          "type": "color"
+        },
+        "focused": {
+          "value": "#268bd2",
+          "type": "color"
+        }
+      }
+    },
+    "border": {
+      "primary": {
+        "value": "#fdf6e3",
+        "type": "color"
+      },
+      "secondary": {
+        "value": "#eee8d5",
+        "type": "color"
+      },
+      "muted": {
+        "value": "#93a1a1",
+        "type": "color"
+      },
+      "focused": {
+        "value": "#93a1a1",
+        "type": "color"
+      },
+      "active": {
+        "value": "#93a1a1",
+        "type": "color"
+      },
+      "ok": {
+        "value": "#859900",
+        "type": "color"
+      },
+      "error": {
+        "value": "#dc322f",
+        "type": "color"
+      },
+      "warning": {
+        "value": "#b58900",
+        "type": "color"
+      },
+      "info": {
+        "value": "#268bd2",
+        "type": "color"
+      }
+    },
+    "editor": {
+      "background": {
+        "value": "#fdf6e3",
+        "type": "color"
+      },
+      "indent_guide": {
+        "value": "#93a1a1",
+        "type": "color"
+      },
+      "indent_guide_active": {
+        "value": "#eee8d5",
+        "type": "color"
+      },
+      "line": {
+        "active": {
+          "value": "#002b3612",
+          "type": "color"
+        },
+        "highlighted": {
+          "value": "#002b361f",
+          "type": "color"
+        },
+        "inserted": {
+          "value": "#859900",
+          "type": "color"
+        },
+        "deleted": {
+          "value": "#dc322f",
+          "type": "color"
+        },
+        "modified": {
+          "value": "#268bd2",
+          "type": "color"
+        }
+      },
+      "highlight": {
+        "selection": {
+          "value": "#268bd23d",
+          "type": "color"
+        },
+        "occurrence": {
+          "value": "#8394961f",
+          "type": "color"
+        },
+        "activeOccurrence": {
+          "value": "#83949629",
+          "type": "color"
+        },
+        "matchingBracket": {
+          "value": "#eee8d5",
+          "type": "color"
+        },
+        "match": {
+          "value": "#6c71c480",
+          "type": "color"
+        },
+        "activeMatch": {
+          "value": "#6c71c4b3",
+          "type": "color"
+        },
+        "related": {
+          "value": "#eee8d5",
+          "type": "color"
+        }
+      },
+      "gutter": {
+        "primary": {
+          "value": "#657b83",
+          "type": "color"
+        },
+        "active": {
+          "value": "#002b36",
+          "type": "color"
+        }
+      }
+    },
+    "syntax": {
+      "primary": {
+        "value": "#002b36",
+        "type": "color"
+      },
+      "comment": {
+        "value": "#073642",
+        "type": "color"
+      },
+      "keyword": {
+        "value": "#268bd2",
+        "type": "color"
+      },
+      "function": {
+        "value": "#b58900",
+        "type": "color"
+      },
+      "type": {
+        "value": "#2aa198",
+        "type": "color"
+      },
+      "variant": {
+        "value": "#268bd2",
+        "type": "color"
+      },
+      "property": {
+        "value": "#268bd2",
+        "type": "color"
+      },
+      "enum": {
+        "value": "#cb4b16",
+        "type": "color"
+      },
+      "operator": {
+        "value": "#cb4b16",
+        "type": "color"
+      },
+      "string": {
+        "value": "#cb4b16",
+        "type": "color"
+      },
+      "number": {
+        "value": "#859900",
+        "type": "color"
+      },
+      "boolean": {
+        "value": "#859900",
+        "type": "color"
+      }
+    },
+    "player": {
+      "1": {
+        "baseColor": {
+          "value": "#268bd2",
+          "type": "color"
+        },
+        "cursorColor": {
+          "value": "#268bd2",
+          "type": "color"
+        },
+        "selectionColor": {
+          "value": "#268bd23d",
+          "type": "color"
+        },
+        "borderColor": {
+          "value": "#268bd2cc",
+          "type": "color"
+        }
+      },
+      "2": {
+        "baseColor": {
+          "value": "#859900",
+          "type": "color"
+        },
+        "cursorColor": {
+          "value": "#859900",
+          "type": "color"
+        },
+        "selectionColor": {
+          "value": "#8599003d",
+          "type": "color"
+        },
+        "borderColor": {
+          "value": "#859900cc",
+          "type": "color"
+        }
+      },
+      "3": {
+        "baseColor": {
+          "value": "#d33682",
+          "type": "color"
+        },
+        "cursorColor": {
+          "value": "#d33682",
+          "type": "color"
+        },
+        "selectionColor": {
+          "value": "#d336823d",
+          "type": "color"
+        },
+        "borderColor": {
+          "value": "#d33682cc",
+          "type": "color"
+        }
+      },
+      "4": {
+        "baseColor": {
+          "value": "#cb4b16",
+          "type": "color"
+        },
+        "cursorColor": {
+          "value": "#cb4b16",
+          "type": "color"
+        },
+        "selectionColor": {
+          "value": "#cb4b163d",
+          "type": "color"
+        },
+        "borderColor": {
+          "value": "#cb4b16cc",
+          "type": "color"
+        }
+      },
+      "5": {
+        "baseColor": {
+          "value": "#6c71c4",
+          "type": "color"
+        },
+        "cursorColor": {
+          "value": "#6c71c4",
+          "type": "color"
+        },
+        "selectionColor": {
+          "value": "#6c71c43d",
+          "type": "color"
+        },
+        "borderColor": {
+          "value": "#6c71c4cc",
+          "type": "color"
+        }
+      },
+      "6": {
+        "baseColor": {
+          "value": "#2aa198",
+          "type": "color"
+        },
+        "cursorColor": {
+          "value": "#2aa198",
+          "type": "color"
+        },
+        "selectionColor": {
+          "value": "#2aa1983d",
+          "type": "color"
+        },
+        "borderColor": {
+          "value": "#2aa198cc",
+          "type": "color"
+        }
+      },
+      "7": {
+        "baseColor": {
+          "value": "#dc322f",
+          "type": "color"
+        },
+        "cursorColor": {
+          "value": "#dc322f",
+          "type": "color"
+        },
+        "selectionColor": {
+          "value": "#dc322f3d",
+          "type": "color"
+        },
+        "borderColor": {
+          "value": "#dc322fcc",
+          "type": "color"
+        }
+      },
+      "8": {
+        "baseColor": {
+          "value": "#b58900",
+          "type": "color"
+        },
+        "cursorColor": {
+          "value": "#b58900",
+          "type": "color"
+        },
+        "selectionColor": {
+          "value": "#b589003d",
+          "type": "color"
+        },
+        "borderColor": {
+          "value": "#b58900cc",
+          "type": "color"
+        }
+      }
+    },
+    "shadowAlpha": {
+      "value": 0.32,
+      "type": "number"
+    }
   }
 }
\ No newline at end of file
diff --git a/styles/src/themes/solarized.ts b/styles/src/themes/solarized.ts
index 8c488b1d46..94c853c1a5 100644
--- a/styles/src/themes/solarized.ts
+++ b/styles/src/themes/solarized.ts
@@ -51,10 +51,10 @@ export function solarized(darkTheme: boolean): Theme {
       focused: bg[2],
     },
     on300: {
-      base: bg[2],
-      hovered: bg[1],
-      active: bg[1],
-      focused: bg[1],
+      base: bg[3],
+      hovered: bg[2],
+      active: bg[2],
+      focused: bg[2],
     },
     on500: {
       base: bg[2],