From 4c5087659be46fac666937d5b6f68e84d59f3da5 Mon Sep 17 00:00:00 2001
From: Gregory Schier <gschier1990@gmail.com>
Date: Tue, 21 May 2024 17:56:06 -0700
Subject: [PATCH] Theme system refactor (#31)

---
 package-lock.json                             |   2 +-
 package.json                                  |   2 +-
 src-tauri/tauri.conf.json                     |   4 +-
 src-web/components/BinaryFileEditor.tsx       |   6 +-
 src-web/components/CommandPalette.tsx         |   6 +-
 src-web/components/CookieDialog.tsx           |   2 +-
 src-web/components/DropMarker.tsx             |   2 +-
 src-web/components/EmptyStateText.tsx         |   4 +-
 .../components/EnvironmentActionsDropdown.tsx |   4 +-
 src-web/components/EnvironmentEditDialog.tsx  |   8 +-
 src-web/components/ExportDataDialog.tsx       |   4 +-
 src-web/components/GlobalHooks.tsx            |   5 +-
 src-web/components/GraphQLEditor.tsx          |   4 +-
 src-web/components/GrpcConnectionLayout.tsx   |   5 +-
 .../components/GrpcConnectionMessagesPane.tsx |  40 +-
 .../components/GrpcConnectionSetupPane.tsx    |  13 +-
 src-web/components/GrpcEditor.tsx             |   6 +-
 src-web/components/GrpcProtoSelection.tsx     |   4 +-
 src-web/components/ImportCurlButton.tsx       |   6 +-
 src-web/components/Overlay.tsx                |   4 +-
 .../components/RecentConnectionsDropdown.tsx  |  13 +-
 src-web/components/RecentRequestsDropdown.tsx |   4 +-
 .../components/RecentResponsesDropdown.tsx    |  23 +-
 src-web/components/RequestMethodDropdown.tsx  |   3 +-
 src-web/components/RequestPane.tsx            |  12 +-
 src-web/components/ResizeHandle.tsx           |   2 +-
 src-web/components/ResponsePane.tsx           |  75 ++--
 src-web/components/RouteError.tsx             |   2 +-
 src-web/components/SettingsDialog.tsx         |   2 +-
 src-web/components/Sidebar.tsx                | 164 +++++---
 src-web/components/UrlBar.tsx                 |   5 +-
 src-web/components/Workspace.tsx              |  17 +-
 .../components/WorkspaceActionsDropdown.tsx   |   6 +-
 src-web/components/WorkspaceHeader.tsx        |  12 +-
 src-web/components/core/Banner.tsx            |  11 +-
 src-web/components/core/Button.tsx            |  58 ++-
 src-web/components/core/Checkbox.tsx          |   6 +-
 src-web/components/core/CountBadge.tsx        |   2 +-
 src-web/components/core/Dialog.tsx            |   8 +-
 src-web/components/core/Dropdown.tsx          |  34 +-
 src-web/components/core/DurationTag.tsx       |   5 +-
 src-web/components/core/Editor/Editor.css     |  62 +--
 src-web/components/core/Editor/Editor.tsx     |  16 +-
 src-web/components/core/Editor/extensions.ts  |  19 +-
 .../core/Editor/twig/placeholder.ts           |   6 +-
 src-web/components/core/FormattedError.tsx    |   2 +-
 src-web/components/core/Heading.tsx           |   2 +-
 src-web/components/core/HotKey.tsx            |   2 +-
 src-web/components/core/HotKeyLabel.tsx       |   2 +-
 src-web/components/core/HotKeyList.tsx        |   2 +-
 src-web/components/core/HttpMethodTag.tsx     |   2 +-
 src-web/components/core/Icon.tsx              |   3 +-
 src-web/components/core/IconButton.tsx        |   3 +-
 src-web/components/core/InlineCode.tsx        |   4 +-
 src-web/components/core/Input.tsx             |  10 +-
 src-web/components/core/JsonAttributeTree.tsx |  22 +-
 src-web/components/core/KeyValueRow.tsx       |   2 +-
 src-web/components/core/PairEditor.tsx        |   2 +-
 src-web/components/core/Select.tsx            |   4 +-
 src-web/components/core/Separator.tsx         |  12 +-
 src-web/components/core/SizeTag.tsx           |   2 +-
 src-web/components/core/StatusTag.tsx         |  13 +-
 src-web/components/core/Tabs/Tabs.tsx         |   4 +-
 src-web/components/core/Toast.tsx             |  21 +-
 src-web/components/core/WindowDragRegion.tsx  |  17 -
 .../responseViewers/ImageViewer.tsx           |  11 +-
 .../components/responseViewers/TextViewer.tsx |   1 -
 .../responseViewers/WebPageViewer.tsx         |   2 +-
 src-web/hooks/Confirm.tsx                     |   4 +-
 src-web/hooks/Prompt.tsx                      |   4 +-
 src-web/hooks/useKeyValue.ts                  |   7 +-
 src-web/hooks/useNotificationToast.tsx        |   8 +-
 src-web/hooks/usePinnedGrpcConnection.ts      |  19 +
 src-web/hooks/usePinnedHttpResponse.ts        |  29 +-
 src-web/lib/fallbackRequestName.ts            |   7 +-
 src-web/lib/indent.ts                         |   6 +
 src-web/lib/theme/color.ts                    |  94 +++++
 src-web/lib/theme/theme.test.ts               |  25 --
 src-web/lib/theme/theme.ts                    | 172 ---------
 src-web/lib/theme/window.ts                   | 355 +++++++++++++++---
 src-web/main.css                              |   6 +-
 tailwind.config.cjs                           |  69 ++--
 82 files changed, 909 insertions(+), 739 deletions(-)
 delete mode 100644 src-web/components/core/WindowDragRegion.tsx
 create mode 100644 src-web/hooks/usePinnedGrpcConnection.ts
 create mode 100644 src-web/lib/indent.ts
 create mode 100644 src-web/lib/theme/color.ts
 delete mode 100644 src-web/lib/theme/theme.test.ts
 delete mode 100644 src-web/lib/theme/theme.ts

diff --git a/package-lock.json b/package-lock.json
index 6bd78da0..cfb94dde 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -81,7 +81,7 @@
         "prettier": "^2.8.4",
         "react-devtools": "^4.27.2",
         "tailwindcss": "^3.2.7",
-        "typescript": "^5.3.3",
+        "typescript": "^5.4.5",
         "vite": "^5.0.0",
         "vite-plugin-svgr": "^4.2.0",
         "vite-plugin-top-level-await": "^1.4.1",
diff --git a/package.json b/package.json
index 4d9fb439..96c56421 100644
--- a/package.json
+++ b/package.json
@@ -101,7 +101,7 @@
     "prettier": "^2.8.4",
     "react-devtools": "^4.27.2",
     "tailwindcss": "^3.2.7",
-    "typescript": "^5.3.3",
+    "typescript": "^5.4.5",
     "vite": "^5.0.0",
     "vite-plugin-svgr": "^4.2.0",
     "vite-plugin-top-level-await": "^1.4.1",
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 6300764d..94b5c0dc 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -42,13 +42,13 @@
       "icons/release/icon.icns",
       "icons/release/icon.ico"
     ],
-    "longDescription": "The best cross-platform visual API client",
+    "longDescription": "A cross-platform desktop app for interacting with REST, GraphQL, and gRPC",
     "resources": [
       "migrations/*",
       "plugins/*",
       "protoc-vendored/include/*"
     ],
-    "shortDescription": "The best API client",
+    "shortDescription": "Desktop API client",
     "targets": [
       "deb",
       "appimage",
diff --git a/src-web/components/BinaryFileEditor.tsx b/src-web/components/BinaryFileEditor.tsx
index f54a3dea..cec3cc77 100644
--- a/src-web/components/BinaryFileEditor.tsx
+++ b/src-web/components/BinaryFileEditor.tsx
@@ -46,10 +46,10 @@ export function BinaryFileEditor({
   return (
     <VStack space={2}>
       <HStack space={2} alignItems="center">
-        <Button variant="border" color="gray" size="sm" onClick={handleClick}>
+        <Button variant="border" color="secondary" size="sm" onClick={handleClick}>
           Choose File
         </Button>
-        <div className="text-xs font-mono truncate rtl pr-3 text-gray-800">
+        <div className="text-xs font-mono truncate rtl pr-3 text-fg">
           {/* Special character to insert ltr text in rtl element without making things wonky */}
           &#x200E;
           {filePath ?? 'Select File'}
@@ -64,7 +64,7 @@ export function BinaryFileEditor({
           <HStack space={1.5} justifyContent="center">
             <Button
               variant="solid"
-              color="gray"
+              color="secondary"
               size="xs"
               onClick={() => onChangeContentType(mimeType)}
             >
diff --git a/src-web/components/CommandPalette.tsx b/src-web/components/CommandPalette.tsx
index a781e1fa..92c2f5c6 100644
--- a/src-web/components/CommandPalette.tsx
+++ b/src-web/components/CommandPalette.tsx
@@ -1,6 +1,6 @@
 import classNames from 'classnames';
 import type { ReactNode } from 'react';
-import { useMemo, useCallback, useState } from 'react';
+import { useCallback, useMemo, useState } from 'react';
 import { useActiveEnvironmentId } from '../hooks/useActiveEnvironmentId';
 import { useAppRoutes } from '../hooks/useAppRoutes';
 import { getRecentEnvironments } from '../hooks/useRecentEnvironments';
@@ -117,8 +117,8 @@ function CommandPaletteItem({
     <button
       onClick={onClick}
       className={classNames(
-        'w-full h-xs flex items-center rounded px-1.5 text-gray-600',
-        active && 'bg-highlightSecondary text-gray-800',
+        'w-full h-xs flex items-center rounded px-1.5 text-fg-subtle',
+        active && 'bg-background-highlight-secondary text-fg',
       )}
     >
       {children}
diff --git a/src-web/components/CookieDialog.tsx b/src-web/components/CookieDialog.tsx
index 10c1f798..d14a22d5 100644
--- a/src-web/components/CookieDialog.tsx
+++ b/src-web/components/CookieDialog.tsx
@@ -42,7 +42,7 @@ export const CookieDialog = function ({ cookieJarId }: Props) {
               <td className="py-2 select-text cursor-text font-mono font-semibold max-w-0">
                 {cookieDomain(c)}
               </td>
-              <td className="py-2 pl-4 select-text cursor-text font-mono text-gray-700 whitespace-nowrap overflow-x-auto max-w-[200px] hide-scrollbars">
+              <td className="py-2 pl-4 select-text cursor-text font-mono text-fg-subtle whitespace-nowrap overflow-x-auto max-w-[200px] hide-scrollbars">
                 {c.raw_cookie}
               </td>
               <td className="max-w-0 w-10">
diff --git a/src-web/components/DropMarker.tsx b/src-web/components/DropMarker.tsx
index eab99577..a306a35d 100644
--- a/src-web/components/DropMarker.tsx
+++ b/src-web/components/DropMarker.tsx
@@ -14,7 +14,7 @@ export const DropMarker = memo(
           'relative w-full h-0 overflow-visible pointer-events-none',
         )}
       >
-        <div className="absolute z-50 left-2 right-2 -bottom-[0.1rem] h-[0.2rem] bg-blue-500/50 rounded-full" />
+        <div className="absolute z-50 left-2 right-2 -bottom-[0.1rem] h-[0.2rem] bg-fg-primary rounded-full" />
       </div>
     );
   },
diff --git a/src-web/components/EmptyStateText.tsx b/src-web/components/EmptyStateText.tsx
index 348dd9a3..dd4d5c79 100644
--- a/src-web/components/EmptyStateText.tsx
+++ b/src-web/components/EmptyStateText.tsx
@@ -1,5 +1,6 @@
 import classNames from 'classnames';
 import type { ReactNode } from 'react';
+import React from 'react';
 
 interface Props {
   children: ReactNode;
@@ -11,7 +12,8 @@ export function EmptyStateText({ children, className }: Props) {
     <div
       className={classNames(
         className,
-        'rounded-lg border border-dashed border-highlight h-full py-2 text-gray-400 flex items-center justify-center',
+        'rounded-lg border border-dashed border-background-highlight',
+        'h-full py-2 text-fg-subtler flex items-center justify-center italic',
       )}
     >
       {children}
diff --git a/src-web/components/EnvironmentActionsDropdown.tsx b/src-web/components/EnvironmentActionsDropdown.tsx
index 4ccf6551..b16ef2e0 100644
--- a/src-web/components/EnvironmentActionsDropdown.tsx
+++ b/src-web/components/EnvironmentActionsDropdown.tsx
@@ -71,8 +71,8 @@ export const EnvironmentActionsDropdown = memo(function EnvironmentActionsDropdo
         size="sm"
         className={classNames(
           className,
-          'text-gray-800 !px-2 truncate',
-          activeEnvironment == null && 'text-opacity-disabled italic',
+          'text-fg !px-2 truncate',
+          activeEnvironment == null && 'text-fg-subtler italic',
         )}
         {...buttonProps}
       >
diff --git a/src-web/components/EnvironmentEditDialog.tsx b/src-web/components/EnvironmentEditDialog.tsx
index 208cebbe..525e89b3 100644
--- a/src-web/components/EnvironmentEditDialog.tsx
+++ b/src-web/components/EnvironmentEditDialog.tsx
@@ -68,7 +68,7 @@ export const EnvironmentEditDialog = function ({ initialEnvironment }: Props) {
                   color="custom"
                   title="Add sub environment"
                   icon="plusCircle"
-                  iconClassName="text-gray-500 group-hover:text-gray-700"
+                  iconClassName="text-fg-subtler group-hover:text-fg-subtle"
                   className="group"
                   onClick={handleCreateEnvironment}
                 />
@@ -97,7 +97,7 @@ export const EnvironmentEditDialog = function ({ initialEnvironment }: Props) {
       secondSlot={() =>
         activeWorkspace != null && (
           <EnvironmentEditor
-            className="pt-2 border-l border-highlight"
+            className="pt-2 border-l border-background-highlight-secondary"
             environment={selectedEnvironment}
             workspace={activeWorkspace}
           />
@@ -175,7 +175,7 @@ const EnvironmentEditor = function ({
         <Heading className="w-full flex items-center gap-1">
           <div>{environment?.name ?? 'Global Variables'}</div>
           <IconButton
-            iconClassName="text-gray-600"
+            iconClassName="text-fg-subtler"
             size="sm"
             icon={valueVisibility.value ? 'eye' : 'eyeClosed'}
             title={valueVisibility.value ? 'Hide Values' : 'Reveal Values'}
@@ -244,7 +244,7 @@ function SidebarButton({
           size="xs"
           className={classNames(
             'w-full',
-            active ? 'text-gray-800 bg-highlightSecondary' : 'text-gray-600 hover:text-gray-700',
+            active ? 'text-fg bg-background-active' : 'text-fg-subtle hover:text-fg',
           )}
           justify="start"
           onClick={onClick}
diff --git a/src-web/components/ExportDataDialog.tsx b/src-web/components/ExportDataDialog.tsx
index ce851e5f..79ab529b 100644
--- a/src-web/components/ExportDataDialog.tsx
+++ b/src-web/components/ExportDataDialog.tsx
@@ -90,7 +90,7 @@ export function ExportDataDialog({
                 />
               </td>
               <td
-                className="py-1 pl-4 text-gray-700 whitespace-nowrap overflow-x-auto hide-scrollbars"
+                className="py-1 pl-4 text-fg whitespace-nowrap overflow-x-auto hide-scrollbars"
                 onClick={() => setSelectedWorkspaces((prev) => ({ ...prev, [w.id]: !prev[w.id] }))}
               >
                 {w.name} {w.id === activeWorkspace.id ? '(current workspace)' : ''}
@@ -100,7 +100,7 @@ export function ExportDataDialog({
         </tbody>
       </table>
       <HStack space={2} justifyContent="end">
-        <Button className="focus" color="gray" onClick={onHide}>
+        <Button className="focus" variant="border" onClick={onHide}>
           Cancel
         </Button>
         <Button
diff --git a/src-web/components/GlobalHooks.tsx b/src-web/components/GlobalHooks.tsx
index d6958316..35c3caa0 100644
--- a/src-web/components/GlobalHooks.tsx
+++ b/src-web/components/GlobalHooks.tsx
@@ -1,6 +1,6 @@
-import { useEffect } from 'react';
 import { useQueryClient } from '@tanstack/react-query';
 import { getCurrent } from '@tauri-apps/api/webviewWindow';
+import { useEffect } from 'react';
 import { useLocation } from 'react-router-dom';
 import { useCommandPalette } from '../hooks/useCommandPalette';
 import { cookieJarsQueryKey } from '../hooks/useCookieJars';
@@ -13,6 +13,7 @@ import { httpRequestsQueryKey } from '../hooks/useHttpRequests';
 import { httpResponsesQueryKey } from '../hooks/useHttpResponses';
 import { keyValueQueryKey } from '../hooks/useKeyValue';
 import { useListenToTauriEvent } from '../hooks/useListenToTauriEvent';
+import { useNotificationToast } from '../hooks/useNotificationToast';
 import { useRecentEnvironments } from '../hooks/useRecentEnvironments';
 import { useRecentRequests } from '../hooks/useRecentRequests';
 import { useRecentWorkspaces } from '../hooks/useRecentWorkspaces';
@@ -24,7 +25,6 @@ import { workspacesQueryKey } from '../hooks/useWorkspaces';
 import type { Model } from '../lib/models';
 import { modelsEq } from '../lib/models';
 import { setPathname } from '../lib/persistPathname';
-import { useNotificationToast } from '../hooks/useNotificationToast';
 
 const DEFAULT_FONT_SIZE = 16;
 
@@ -34,6 +34,7 @@ export function GlobalHooks() {
   useRecentEnvironments();
   useRecentRequests();
 
+  // Other useful things
   useSyncAppearance();
   useSyncWindowTitle();
   useGlobalCommands();
diff --git a/src-web/components/GraphQLEditor.tsx b/src-web/components/GraphQLEditor.tsx
index a330a2b4..c2b3358a 100644
--- a/src-web/components/GraphQLEditor.tsx
+++ b/src-web/components/GraphQLEditor.tsx
@@ -88,7 +88,7 @@ export function GraphQLEditor({ defaultValue, onChange, baseRequest, ...extraEdi
                   <Button
                     key="introspection"
                     size="xs"
-                    color={error ? 'danger' : 'gray'}
+                    color={error ? 'danger' : 'secondary'}
                     isLoading={isLoading}
                     onClick={() => {
                       dialog.show({
@@ -105,7 +105,7 @@ export function GraphQLEditor({ defaultValue, onChange, baseRequest, ...extraEdi
                                   refetch();
                                 }}
                                 className="ml-auto"
-                                color="secondary"
+                                color="primary"
                                 size="sm"
                               >
                                 Try Again
diff --git a/src-web/components/GrpcConnectionLayout.tsx b/src-web/components/GrpcConnectionLayout.tsx
index a4b563ea..34f10f1e 100644
--- a/src-web/components/GrpcConnectionLayout.tsx
+++ b/src-web/components/GrpcConnectionLayout.tsx
@@ -98,9 +98,10 @@ export function GrpcConnectionLayout({ style }: Props) {
           <div
             style={style}
             className={classNames(
+              'x-theme-responsePane',
               'max-h-full h-full grid grid-rows-[minmax(0,1fr)] grid-cols-1',
-              'bg-gray-50 dark:bg-gray-100 rounded-md border border-highlight',
-              'shadow shadow-gray-100 dark:shadow-gray-0 relative',
+              'bg-background rounded-md border border-background-highlight',
+              'shadow relative',
             )}
           >
             {grpc.go.error ? (
diff --git a/src-web/components/GrpcConnectionMessagesPane.tsx b/src-web/components/GrpcConnectionMessagesPane.tsx
index 2ea307bc..b293acec 100644
--- a/src-web/components/GrpcConnectionMessagesPane.tsx
+++ b/src-web/components/GrpcConnectionMessagesPane.tsx
@@ -2,9 +2,11 @@ import classNames from 'classnames';
 import { format } from 'date-fns';
 import type { CSSProperties } from 'react';
 import React, { useEffect, useMemo, useState } from 'react';
-import { useGrpcConnections } from '../hooks/useGrpcConnections';
 import { useGrpcEvents } from '../hooks/useGrpcEvents';
+import { usePinnedGrpcConnection } from '../hooks/usePinnedGrpcConnection';
+import { useStateWithDeps } from '../hooks/useStateWithDeps';
 import type { GrpcEvent, GrpcRequest } from '../lib/models';
+import { Button } from './core/Button';
 import { Icon } from './core/Icon';
 import { JsonAttributeTree } from './core/JsonAttributeTree';
 import { KeyValueRow, KeyValueRows } from './core/KeyValueRow';
@@ -13,8 +15,6 @@ import { SplitLayout } from './core/SplitLayout';
 import { HStack, VStack } from './core/Stacks';
 import { EmptyStateText } from './EmptyStateText';
 import { RecentConnectionsDropdown } from './RecentConnectionsDropdown';
-import { Button } from './core/Button';
-import { useStateWithDeps } from '../hooks/useStateWithDeps';
 
 interface Props {
   style?: CSSProperties;
@@ -31,11 +31,11 @@ interface Props {
 
 export function GrpcConnectionMessagesPane({ style, methodType, activeRequest }: Props) {
   const [activeEventId, setActiveEventId] = useState<string | null>(null);
-  const connections = useGrpcConnections(activeRequest.id ?? null);
-  const activeConnection = connections[0] ?? null;
-  const events = useGrpcEvents(activeConnection?.id ?? null);
   const [showLarge, setShowLarge] = useStateWithDeps<boolean>(false, [activeRequest.id]);
   const [showingLarge, setShowingLarge] = useState<boolean>(false);
+  const { activeConnection, connections, setPinnedConnectionId } =
+    usePinnedGrpcConnection(activeRequest);
+  const events = useGrpcEvents(activeConnection?.id ?? null);
 
   const activeEvent = useMemo(
     () => events.find((m) => m.id === activeEventId) ?? null,
@@ -65,15 +65,13 @@ export function GrpcConnectionMessagesPane({ style, methodType, activeRequest }:
               <HStack alignItems="center" space={2}>
                 <span>{events.length} messages</span>
                 {activeConnection.elapsed === 0 && (
-                  <Icon icon="refresh" size="sm" spin className="text-gray-600" />
+                  <Icon icon="refresh" size="sm" spin className="text-fg-subtler" />
                 )}
               </HStack>
               <RecentConnectionsDropdown
                 connections={connections}
                 activeConnection={activeConnection}
-                onPinned={() => {
-                  // todo
-                }}
+                onPinnedConnectionId={setPinnedConnectionId}
               />
             </HStack>
             <div className="overflow-y-auto h-full">
@@ -107,7 +105,7 @@ export function GrpcConnectionMessagesPane({ style, methodType, activeRequest }:
                     Message {activeEvent.eventType === 'client_message' ? 'Sent' : 'Received'}
                   </div>
                   {!showLarge && activeEvent.content.length > 1000 * 1000 ? (
-                    <VStack space={2} className="text-sm italic text-gray-500">
+                    <VStack space={2} className="text-sm italic text-fg-subtler">
                       Message previews larger than 1MB are hidden
                       <div>
                         <Button
@@ -119,7 +117,7 @@ export function GrpcConnectionMessagesPane({ style, methodType, activeRequest }:
                             }, 500);
                           }}
                           isLoading={showingLarge}
-                          color="gray"
+                          color="secondary"
                           variant="border"
                           size="xs"
                         >
@@ -138,7 +136,7 @@ export function GrpcConnectionMessagesPane({ style, methodType, activeRequest }:
                       {activeEvent.content}
                     </div>
                     {activeEvent.error && (
-                      <div className="select-text cursor-text text-xs font-mono py-1 text-orange-700">
+                      <div className="select-text cursor-text text-xs font-mono py-1 text-fg-warning">
                         {activeEvent.error}
                       </div>
                     )}
@@ -183,21 +181,21 @@ function EventRow({
         className={classNames(
           'w-full grid grid-cols-[auto_minmax(0,3fr)_auto] gap-2 items-center text-left',
           'px-1.5 py-1 font-mono cursor-default group focus:outline-none rounded',
-          isActive && '!bg-highlight text-gray-900',
-          'text-gray-800 hover:text-gray-900',
+          isActive && '!bg-background-highlight-secondary !text-fg',
+          'text-fg-subtle hover:text-fg',
         )}
       >
         <Icon
           className={
             eventType === 'server_message'
-              ? 'text-blue-600'
+              ? 'text-fg-info'
               : eventType === 'client_message'
-              ? 'text-violet-600'
+              ? 'text-fg-primary'
               : eventType === 'error' || (status != null && status > 0)
-              ? 'text-orange-600'
+              ? 'text-fg-danger'
               : eventType === 'connection_end'
-              ? 'text-green-600'
-              : 'text-gray-700'
+              ? 'text-fg-success'
+              : 'text-fg-subtle'
           }
           title={
             eventType === 'server_message'
@@ -224,7 +222,7 @@ function EventRow({
         />
         <div className={classNames('w-full truncate text-2xs')}>
           {content.slice(0, 1000)}
-          {error && <span className="text-orange-600"> ({error})</span>}
+          {error && <span className="text-fg-warning"> ({error})</span>}
         </div>
         <div className={classNames('opacity-50 text-2xs')}>
           {format(createdAt + 'Z', 'HH:mm:ss.SSS')}
diff --git a/src-web/components/GrpcConnectionSetupPane.tsx b/src-web/components/GrpcConnectionSetupPane.tsx
index ff28dd88..c1b95da5 100644
--- a/src-web/components/GrpcConnectionSetupPane.tsx
+++ b/src-web/components/GrpcConnectionSetupPane.tsx
@@ -199,14 +199,14 @@ export function GrpcConnectionSetupPane({
                 label: 'Refresh',
                 type: 'default',
                 key: 'custom',
-                leftSlot: <Icon className="text-gray-600" size="sm" icon="refresh" />,
+                leftSlot: <Icon className="text-fg-subtler" size="sm" icon="refresh" />,
               },
             ]}
           >
             <Button
               size="sm"
               variant="border"
-              rightSlot={<Icon className="text-gray-600" size="sm" icon="chevronDown" />}
+              rightSlot={<Icon className="text-fg-subtler" size="sm" icon="chevronDown" />}
               disabled={isStreaming || services == null}
               className={classNames(
                 'font-mono text-xs min-w-[5rem] !ring-0',
@@ -221,14 +221,14 @@ export function GrpcConnectionSetupPane({
               {isStreaming && (
                 <>
                   <IconButton
-                    className="border border-highlight"
+                    className="border border-background-highlight-secondary"
                     size="sm"
                     title="Cancel"
                     onClick={onCancel}
                     icon="x"
                   />
                   <IconButton
-                    className="border border-highlight"
+                    className="border border-background-highlight-secondary"
                     size="sm"
                     title="Commit"
                     onClick={onCommit}
@@ -237,7 +237,7 @@ export function GrpcConnectionSetupPane({
                 </>
               )}
               <IconButton
-                className="border border-highlight"
+                className="border border-background-highlight-secondary"
                 size="sm"
                 title={isStreaming ? 'Connect' : 'Send'}
                 hotkeyAction="grpc_request.send"
@@ -247,7 +247,7 @@ export function GrpcConnectionSetupPane({
             </>
           ) : (
             <IconButton
-              className="border border-highlight"
+              className="border border-background-highlight-secondary"
               size="sm"
               title={methodType === 'unary' ? 'Send' : 'Connect'}
               hotkeyAction="grpc_request.send"
@@ -275,7 +275,6 @@ export function GrpcConnectionSetupPane({
           <GrpcEditor
             onChange={handleChangeMessage}
             services={services}
-            className="bg-gray-50"
             reflectionError={reflectionError}
             reflectionLoading={reflectionLoading}
             request={activeRequest}
diff --git a/src-web/components/GrpcEditor.tsx b/src-web/components/GrpcEditor.tsx
index b404d5f8..97a0c419 100644
--- a/src-web/components/GrpcEditor.tsx
+++ b/src-web/components/GrpcEditor.tsx
@@ -133,12 +133,12 @@ export function GrpcEditor({
           size="xs"
           color={
             reflectionLoading
-              ? 'gray'
-              : reflectionUnavailable
               ? 'secondary'
+              : reflectionUnavailable
+              ? 'info'
               : reflectionError
               ? 'danger'
-              : 'gray'
+              : 'secondary'
           }
           isLoading={reflectionLoading}
           onClick={() => {
diff --git a/src-web/components/GrpcProtoSelection.tsx b/src-web/components/GrpcProtoSelection.tsx
index 846a8782..2c729fec 100644
--- a/src-web/components/GrpcProtoSelection.tsx
+++ b/src-web/components/GrpcProtoSelection.tsx
@@ -60,7 +60,7 @@ export function GrpcProtoSelection({ requestId }: Props) {
         <Button
           isLoading={grpc.reflect.isFetching}
           disabled={grpc.reflect.isFetching}
-          color="gray"
+          color="secondary"
           size="sm"
           onClick={() => grpc.reflect.refetch()}
         >
@@ -106,7 +106,7 @@ export function GrpcProtoSelection({ requestId }: Props) {
           <table className="w-full divide-y">
             <thead>
               <tr>
-                <th className="text-gray-600">
+                <th className="text-fg-subtler">
                   <span className="font-mono text-sm">*.proto</span> Files
                 </th>
                 <th></th>
diff --git a/src-web/components/ImportCurlButton.tsx b/src-web/components/ImportCurlButton.tsx
index 34a62d4b..0ad3979a 100644
--- a/src-web/components/ImportCurlButton.tsx
+++ b/src-web/components/ImportCurlButton.tsx
@@ -1,9 +1,9 @@
+import { motion } from 'framer-motion';
 import React, { useState } from 'react';
-import { Button } from './core/Button';
 import { useClipboardText } from '../hooks/useClipboardText';
 import { useImportCurl } from '../hooks/useImportCurl';
+import { Button } from './core/Button';
 import { Icon } from './core/Icon';
-import { motion } from 'framer-motion';
 
 export function ImportCurlButton() {
   const [clipboardText] = useClipboardText();
@@ -23,7 +23,7 @@ export function ImportCurlButton() {
       <Button
         size="xs"
         variant="border"
-        color="secondary"
+        color="primary"
         leftSlot={<Icon icon="paste" size="sm" />}
         isLoading={isLoading}
         onClick={() => {
diff --git a/src-web/components/Overlay.tsx b/src-web/components/Overlay.tsx
index 8b904858..38728da1 100644
--- a/src-web/components/Overlay.tsx
+++ b/src-web/components/Overlay.tsx
@@ -43,10 +43,10 @@ export function Overlay({
               onClick={onClose}
               className={classNames(
                 'absolute inset-0',
-                variant === 'default' && 'bg-gray-600/30 dark:bg-black/30 backdrop-blur-sm',
+                variant === 'default' && 'bg-background-backdrop backdrop-blur-sm',
               )}
             />
-            <div className="bg-red-100">{children}</div>
+            {children}
           </motion.div>
         </FocusTrap>
       )}
diff --git a/src-web/components/RecentConnectionsDropdown.tsx b/src-web/components/RecentConnectionsDropdown.tsx
index cb71d468..f2d55e35 100644
--- a/src-web/components/RecentConnectionsDropdown.tsx
+++ b/src-web/components/RecentConnectionsDropdown.tsx
@@ -11,12 +11,17 @@ import { HStack } from './core/Stacks';
 interface Props {
   connections: GrpcConnection[];
   activeConnection: GrpcConnection;
-  onPinned: (r: GrpcConnection) => void;
+  onPinnedConnectionId: (id: string) => void;
 }
 
-export function RecentConnectionsDropdown({ activeConnection, connections, onPinned }: Props) {
+export function RecentConnectionsDropdown({
+  activeConnection,
+  connections,
+  onPinnedConnectionId,
+}: Props) {
   const deleteConnection = useDeleteGrpcConnection(activeConnection?.id ?? null);
   const deleteAllConnections = useDeleteGrpcConnections(activeConnection?.requestId);
+  const latestConnectionId = connections[0]?.id ?? 'n/a';
 
   return (
     <Dropdown
@@ -44,13 +49,13 @@ export function RecentConnectionsDropdown({ activeConnection, connections, onPin
             </HStack>
           ),
           leftSlot: activeConnection?.id === c.id ? <Icon icon="check" /> : <Icon icon="empty" />,
-          onSelect: () => onPinned(c),
+          onSelect: () => onPinnedConnectionId(c.id),
         })),
       ]}
     >
       <IconButton
         title="Show connection history"
-        icon="chevronDown"
+        icon={activeConnection?.id === latestConnectionId ? 'chevronDown' : 'pin'}
         className="ml-auto"
         size="sm"
         iconSize="md"
diff --git a/src-web/components/RecentRequestsDropdown.tsx b/src-web/components/RecentRequestsDropdown.tsx
index 4446a037..4bc1693c 100644
--- a/src-web/components/RecentRequestsDropdown.tsx
+++ b/src-web/components/RecentRequestsDropdown.tsx
@@ -86,8 +86,8 @@ export function RecentRequestsDropdown({ className }: Pick<ButtonProps, 'classNa
         hotkeyAction="request_switcher.toggle"
         className={classNames(
           className,
-          'text-gray-800 text-sm truncate pointer-events-auto',
-          activeRequest === null && 'text-opacity-disabled italic',
+          'text-fg text-sm truncate pointer-events-auto',
+          activeRequest === null && 'text-fg-subtler italic',
         )}
       >
         {fallbackRequestName(activeRequest)}
diff --git a/src-web/components/RecentResponsesDropdown.tsx b/src-web/components/RecentResponsesDropdown.tsx
index f28340b8..d9f8cf69 100644
--- a/src-web/components/RecentResponsesDropdown.tsx
+++ b/src-web/components/RecentResponsesDropdown.tsx
@@ -1,26 +1,30 @@
+import classNames from 'classnames';
 import { useDeleteHttpResponse } from '../hooks/useDeleteHttpResponse';
 import { useDeleteHttpResponses } from '../hooks/useDeleteHttpResponses';
 import type { HttpResponse } from '../lib/models';
-import { Dropdown } from './core/Dropdown';
 import { pluralize } from '../lib/pluralize';
-import { HStack } from './core/Stacks';
-import { StatusTag } from './core/StatusTag';
+import { Dropdown } from './core/Dropdown';
 import { Icon } from './core/Icon';
 import { IconButton } from './core/IconButton';
+import { HStack } from './core/Stacks';
+import { StatusTag } from './core/StatusTag';
 
 interface Props {
   responses: HttpResponse[];
   activeResponse: HttpResponse;
-  onPinnedResponse: (r: HttpResponse) => void;
+  onPinnedResponseId: (id: string) => void;
+  className?: string;
 }
 
 export const RecentResponsesDropdown = function ResponsePane({
   activeResponse,
   responses,
-  onPinnedResponse,
+  onPinnedResponseId,
+  className,
 }: Props) {
   const deleteResponse = useDeleteHttpResponse(activeResponse?.id ?? null);
   const deleteAllResponses = useDeleteHttpResponses(activeResponse?.requestId);
+  const latestResponseId = responses[0]?.id ?? 'n/a';
 
   return (
     <Dropdown
@@ -44,18 +48,19 @@ export const RecentResponsesDropdown = function ResponsePane({
           label: (
             <HStack space={2} alignItems="center">
               <StatusTag className="text-xs" response={r} />
-              <span>&bull;</span> <span className="font-mono text-xs">{r.elapsed}ms</span>
+              <span>&rarr;</span>{' '}
+              <span className="font-mono text-xs">{r.elapsed >= 0 ? `${r.elapsed}ms` : 'n/a'}</span>
             </HStack>
           ),
           leftSlot: activeResponse?.id === r.id ? <Icon icon="check" /> : <Icon icon="empty" />,
-          onSelect: () => onPinnedResponse(r),
+          onSelect: () => onPinnedResponseId(r.id),
         })),
       ]}
     >
       <IconButton
         title="Show response history"
-        icon="chevronDown"
-        className="ml-auto"
+        icon={activeResponse?.id === latestResponseId ? 'chevronDown' : 'pin'}
+        className={classNames(className, 'm-0.5')}
         size="sm"
         iconSize="md"
       />
diff --git a/src-web/components/RequestMethodDropdown.tsx b/src-web/components/RequestMethodDropdown.tsx
index b0b88b0f..65ae9cfa 100644
--- a/src-web/components/RequestMethodDropdown.tsx
+++ b/src-web/components/RequestMethodDropdown.tsx
@@ -1,3 +1,4 @@
+import classNames from 'classnames';
 import { memo, useMemo } from 'react';
 import { usePrompt } from '../hooks/usePrompt';
 import { Button } from './core/Button';
@@ -57,7 +58,7 @@ export const RequestMethodDropdown = memo(function RequestMethodDropdown({
 
   return (
     <RadioDropdown value={method} items={radioItems} extraItems={extraItems} onChange={onChange}>
-      <Button size="xs" className={className}>
+      <Button size="xs" className={classNames(className, 'text-fg-subtle hover:text-fg')}>
         {method.toUpperCase()}
       </Button>
     </RadioDropdown>
diff --git a/src-web/components/RequestPane.tsx b/src-web/components/RequestPane.tsx
index cd9829ec..b35b6a68 100644
--- a/src-web/components/RequestPane.tsx
+++ b/src-web/components/RequestPane.tsx
@@ -3,10 +3,12 @@ import type { CSSProperties } from 'react';
 import React, { memo, useCallback, useMemo, useState } from 'react';
 import { createGlobalState } from 'react-use';
 import { useCancelHttpResponse } from '../hooks/useCancelHttpResponse';
+import { useContentTypeFromHeaders } from '../hooks/useContentTypeFromHeaders';
+import { useImportCurl } from '../hooks/useImportCurl';
 import { useIsResponseLoading } from '../hooks/useIsResponseLoading';
 import { usePinnedHttpResponse } from '../hooks/usePinnedHttpResponse';
+import { useRequests } from '../hooks/useRequests';
 import { useRequestUpdateKey } from '../hooks/useRequestUpdateKey';
-import { useContentTypeFromHeaders } from '../hooks/useContentTypeFromHeaders';
 import { useSendRequest } from '../hooks/useSendRequest';
 import { useUpdateHttpRequest } from '../hooks/useUpdateHttpRequest';
 import { tryFormatJson } from '../lib/formatters';
@@ -29,6 +31,7 @@ import { BearerAuth } from './BearerAuth';
 import { BinaryFileEditor } from './BinaryFileEditor';
 import { CountBadge } from './core/CountBadge';
 import { Editor } from './core/Editor';
+import type { GenericCompletionOption } from './core/Editor/genericCompletion';
 import type { TabItem } from './core/Tabs/Tabs';
 import { TabContent, Tabs } from './core/Tabs/Tabs';
 import { EmptyStateText } from './EmptyStateText';
@@ -38,9 +41,6 @@ import { GraphQLEditor } from './GraphQLEditor';
 import { HeadersEditor } from './HeadersEditor';
 import { UrlBar } from './UrlBar';
 import { UrlParametersEditor } from './UrlParameterEditor';
-import { useImportCurl } from '../hooks/useImportCurl';
-import { useRequests } from '../hooks/useRequests';
-import type { GenericCompletionOption } from './core/Editor/genericCompletion';
 
 interface Props {
   style: CSSProperties;
@@ -317,7 +317,6 @@ export const RequestPane = memo(function RequestPane({
                   useTemplating
                   autocompleteVariables
                   placeholder="..."
-                  className="!bg-gray-50"
                   heightMode={fullHeight ? 'full' : 'auto'}
                   defaultValue={`${activeRequest.body?.text ?? ''}`}
                   contentType="application/json"
@@ -330,7 +329,6 @@ export const RequestPane = memo(function RequestPane({
                   useTemplating
                   autocompleteVariables
                   placeholder="..."
-                  className="!bg-gray-50"
                   heightMode={fullHeight ? 'full' : 'auto'}
                   defaultValue={`${activeRequest.body?.text ?? ''}`}
                   contentType="text/xml"
@@ -340,7 +338,6 @@ export const RequestPane = memo(function RequestPane({
                 <GraphQLEditor
                   forceUpdateKey={forceUpdateKey}
                   baseRequest={activeRequest}
-                  className="!bg-gray-50"
                   defaultValue={`${activeRequest.body?.text ?? ''}`}
                   onChange={handleBodyTextChange}
                 />
@@ -370,7 +367,6 @@ export const RequestPane = memo(function RequestPane({
                   useTemplating
                   autocompleteVariables
                   placeholder="..."
-                  className="!bg-gray-50"
                   heightMode={fullHeight ? 'full' : 'auto'}
                   defaultValue={`${activeRequest.body?.text ?? ''}`}
                   onChange={handleBodyTextChange}
diff --git a/src-web/components/ResizeHandle.tsx b/src-web/components/ResizeHandle.tsx
index 28456451..3e86009a 100644
--- a/src-web/components/ResizeHandle.tsx
+++ b/src-web/components/ResizeHandle.tsx
@@ -32,7 +32,7 @@ export function ResizeHandle({
       className={classNames(
         className,
         'group z-10 flex',
-        // 'bg-blue-100/10', // For debugging
+        // 'bg-fg-info', // For debugging
         vertical ? 'w-full h-3 cursor-row-resize' : 'h-full w-3 cursor-col-resize',
         justify === 'center' && 'justify-center',
         justify === 'end' && 'justify-end',
diff --git a/src-web/components/ResponsePane.tsx b/src-web/components/ResponsePane.tsx
index 26628196..660ecf3d 100644
--- a/src-web/components/ResponsePane.tsx
+++ b/src-web/components/ResponsePane.tsx
@@ -2,8 +2,8 @@ import classNames from 'classnames';
 import type { CSSProperties } from 'react';
 import { memo, useMemo } from 'react';
 import { createGlobalState } from 'react-use';
-import { usePinnedHttpResponse } from '../hooks/usePinnedHttpResponse';
 import { useContentTypeFromHeaders } from '../hooks/useContentTypeFromHeaders';
+import { usePinnedHttpResponse } from '../hooks/usePinnedHttpResponse';
 import { useResponseViewMode } from '../hooks/useResponseViewMode';
 import type { HttpRequest } from '../lib/models';
 import { isResponseLoading } from '../lib/models';
@@ -34,7 +34,7 @@ interface Props {
 const useActiveTab = createGlobalState<string>('body');
 
 export const ResponsePane = memo(function ResponsePane({ style, className, activeRequest }: Props) {
-  const { activeResponse, setPinnedResponse, responses } = usePinnedHttpResponse(activeRequest);
+  const { activeResponse, setPinnedResponseId, responses } = usePinnedHttpResponse(activeRequest);
   const [viewMode, setViewMode] = useResponseViewMode(activeResponse?.requestId);
   const [activeTab, setActiveTab] = useActiveTab();
   const contentType = useContentTypeFromHeaders(activeResponse?.headers ?? null);
@@ -73,9 +73,10 @@ export const ResponsePane = memo(function ResponsePane({ style, className, activ
       style={style}
       className={classNames(
         className,
+        'x-theme-responsePane',
         'max-h-full h-full',
-        'bg-gray-50 dark:bg-gray-100 rounded-md border border-highlight',
-        'shadow shadow-gray-100 dark:shadow-gray-0 relative',
+        'bg-background rounded-md border border-background-highlight',
+        'shadow relative',
       )}
     >
       {activeResponse == null ? (
@@ -91,39 +92,41 @@ export const ResponsePane = memo(function ResponsePane({ style, className, activ
           <HStack
             alignItems="center"
             className={classNames(
-              'text-gray-700 text-sm w-full flex-shrink-0',
+              'text-fg-subtle text-sm w-full flex-shrink-0',
               // Remove a bit of space because the tabs have lots too
               '-mb-1.5',
             )}
           >
             {activeResponse && (
-              <HStack alignItems="center" className="w-full">
-                <div className="whitespace-nowrap px-3">
-                  <HStack space={2}>
-                    <StatusTag showReason response={activeResponse} />
-                    {activeResponse.elapsed > 0 && (
-                      <>
-                        <span>&bull;</span>
-                        <DurationTag
-                          headers={activeResponse.elapsedHeaders}
-                          total={activeResponse.elapsed}
-                        />
-                      </>
-                    )}
-                    {!!activeResponse.contentLength && (
-                      <>
-                        <span>&bull;</span>
-                        <SizeTag contentLength={activeResponse.contentLength} />
-                      </>
-                    )}
-                  </HStack>
-                </div>
+              <HStack
+                space={2}
+                alignItems="center"
+                className="whitespace-nowrap w-full pl-3 overflow-x-auto font-mono text-sm"
+              >
+                <StatusTag showReason response={activeResponse} />
+                {activeResponse.elapsed > 0 && (
+                  <>
+                    <span>&bull;</span>
+                    <DurationTag
+                      headers={activeResponse.elapsedHeaders}
+                      total={activeResponse.elapsed}
+                    />
+                  </>
+                )}
+                {!!activeResponse.contentLength && (
+                  <>
+                    <span>&bull;</span>
+                    <SizeTag contentLength={activeResponse.contentLength} />
+                  </>
+                )}
 
-                <RecentResponsesDropdown
-                  responses={responses}
-                  activeResponse={activeResponse}
-                  onPinnedResponse={setPinnedResponse}
-                />
+                <div className="ml-auto">
+                  <RecentResponsesDropdown
+                    responses={responses}
+                    activeResponse={activeResponse}
+                    onPinnedResponseId={setPinnedResponseId}
+                  />
+                </div>
               </HStack>
             )}
           </HStack>
@@ -138,7 +141,7 @@ export const ResponsePane = memo(function ResponsePane({ style, className, activ
               onChangeValue={setActiveTab}
               label="Response"
               tabs={tabs}
-              className="ml-3 mr-1"
+              className="ml-3 mr-3 mb-3"
               tabListClassName="mt-1.5"
             >
               <TabContent value="headers">
@@ -146,13 +149,13 @@ export const ResponsePane = memo(function ResponsePane({ style, className, activ
               </TabContent>
               <TabContent value="body">
                 {!activeResponse.contentLength ? (
-                  <EmptyStateText>Empty Body</EmptyStateText>
+                  <div className="pb-2 h-full">
+                    <EmptyStateText>Empty Body</EmptyStateText>
+                  </div>
                 ) : contentType?.startsWith('image') ? (
                   <ImageViewer className="pb-2" response={activeResponse} />
                 ) : activeResponse.contentLength > 2 * 1000 * 1000 ? (
-                  <div className="text-sm italic text-gray-500">
-                    Cannot preview text responses larger than 2MB
-                  </div>
+                  <EmptyStateText>Cannot preview text responses larger than 2MB</EmptyStateText>
                 ) : viewMode === 'pretty' && contentType?.includes('html') ? (
                   <WebPageViewer response={activeResponse} />
                 ) : contentType?.match(/csv|tab-separated/) ? (
diff --git a/src-web/components/RouteError.tsx b/src-web/components/RouteError.tsx
index 0cd338e1..432478f5 100644
--- a/src-web/components/RouteError.tsx
+++ b/src-web/components/RouteError.tsx
@@ -26,7 +26,7 @@ export default function RouteError() {
           >
             Go Home
           </Button>
-          <Button color="secondary" onClick={() => window.location.reload()}>
+          <Button color="info" onClick={() => window.location.reload()}>
             Refresh
           </Button>
         </VStack>
diff --git a/src-web/components/SettingsDialog.tsx b/src-web/components/SettingsDialog.tsx
index 81c84c63..e19d6e2a 100644
--- a/src-web/components/SettingsDialog.tsx
+++ b/src-web/components/SettingsDialog.tsx
@@ -90,7 +90,7 @@ export const SettingsDialog = () => {
 
       <Heading size={2}>
         Workspace{' '}
-        <div className="inline-block ml-1 bg-gray-500 dark:bg-gray-300 px-2 py-0.5 text-sm rounded text-white dark:text-gray-900">
+        <div className="inline-block ml-1 bg-background-highlight px-2 py-0.5 text-sm rounded text-fg">
           {workspace.name}
         </div>
       </Heading>
diff --git a/src-web/components/Sidebar.tsx b/src-web/components/Sidebar.tsx
index d586aed9..8b0a4816 100644
--- a/src-web/components/Sidebar.tsx
+++ b/src-web/components/Sidebar.tsx
@@ -9,6 +9,7 @@ import { useActiveEnvironmentId } from '../hooks/useActiveEnvironmentId';
 import { useActiveRequest } from '../hooks/useActiveRequest';
 import { useActiveWorkspace } from '../hooks/useActiveWorkspace';
 import { useAppRoutes } from '../hooks/useAppRoutes';
+import { useCopyAsCurl } from '../hooks/useCopyAsCurl';
 import { useCreateDropdownItems } from '../hooks/useCreateDropdownItems';
 import { useDeleteFolder } from '../hooks/useDeleteFolder';
 import { useDeleteRequest } from '../hooks/useDeleteRequest';
@@ -40,7 +41,6 @@ import { InlineCode } from './core/InlineCode';
 import { VStack } from './core/Stacks';
 import { StatusTag } from './core/StatusTag';
 import { DropMarker } from './DropMarker';
-import { useCopyAsCurl } from '../hooks/useCopyAsCurl';
 
 interface Props {
   className?: string;
@@ -468,6 +468,47 @@ export function Sidebar({ className }: Props) {
         handleEnd={handleEnd}
         handleDragStart={handleDragStart}
       />
+      {/*<div className="p-2 flex flex-col gap-1">*/}
+      {/*  <div className="flex flex-wrap gap-1">*/}
+      {/*    <Button color="primary">Primary</Button>*/}
+      {/*    <Button color="secondary">Secondary</Button>*/}
+      {/*    <Button color="info">Info</Button>*/}
+      {/*    <Button color="success">Success</Button>*/}
+      {/*    <Button color="warning">Warning</Button>*/}
+      {/*    <Button color="danger">Danger</Button>*/}
+      {/*    <Button color="default">Default</Button>*/}
+      {/*  </div>*/}
+      {/*  <div className="flex flex-wrap gap-1">*/}
+      {/*    <Button variant="border" color="primary">*/}
+      {/*      Primary*/}
+      {/*    </Button>*/}
+      {/*    <Button variant="border" color="secondary">*/}
+      {/*      Secondary*/}
+      {/*    </Button>*/}
+      {/*    <Button variant="border" color="info">*/}
+      {/*      Info*/}
+      {/*    </Button>*/}
+      {/*    <Button variant="border" color="success">*/}
+      {/*      Success*/}
+      {/*    </Button>*/}
+      {/*    <Button variant="border" color="warning">*/}
+      {/*      Warning*/}
+      {/*    </Button>*/}
+      {/*    <Button variant="border" color="danger">*/}
+      {/*      Danger*/}
+      {/*    </Button>*/}
+      {/*    <Button variant="border" color="default">*/}
+      {/*      Default*/}
+      {/*    </Button>*/}
+      {/*  </div>*/}
+      {/*  <div className="flex flex-col gap-1">*/}
+      {/*    <Banner color="primary">Primary banner</Banner>*/}
+      {/*    <Banner color="secondary">Secondary banner</Banner>*/}
+      {/*    <Banner color="danger">Danger banner</Banner>*/}
+      {/*    <Banner color="warning">Warning banner</Banner>*/}
+      {/*    <Banner color="success">Success banner</Banner>*/}
+      {/*  </div>*/}
+      {/*</div>*/}
     </aside>
   );
 }
@@ -510,60 +551,66 @@ function SidebarItems({
       aria-orientation="vertical"
       dir="ltr"
       className={classNames(
-        tree.depth > 0 && 'border-l border-highlight',
+        tree.depth > 0 && 'border-l border-background-highlight-secondary',
         tree.depth === 0 && 'ml-0',
         tree.depth >= 1 && 'ml-[1.2em]',
       )}
     >
-      {tree.children.map((child, i) => (
-        <Fragment key={child.item.id}>
-          {hoveredIndex === i && hoveredTree?.item.id === tree.item.id && <DropMarker />}
-          <DraggableSidebarItem
-            draggable
-            selected={selectedId === child.item.id}
-            itemId={child.item.id}
-            itemName={child.item.name}
-            itemFallbackName={
-              child.item.model === 'http_request' || child.item.model === 'grpc_request'
-                ? fallbackRequestName(child.item)
-                : 'New Folder'
-            }
-            itemModel={child.item.model}
-            itemPrefix={
-              (child.item.model === 'http_request' || child.item.model === 'grpc_request') && (
-                <HttpMethodTag request={child.item} />
-              )
-            }
-            onMove={handleMove}
-            onEnd={handleEnd}
-            onSelect={onSelect}
-            onDragStart={handleDragStart}
-            useProminentStyles={focused}
-            isCollapsed={isCollapsed}
-            child={child}
-          >
-            {child.item.model === 'folder' &&
-              !isCollapsed(child.item.id) &&
-              draggingId !== child.item.id && (
-                <SidebarItems
-                  treeParentMap={treeParentMap}
-                  tree={child}
-                  isCollapsed={isCollapsed}
-                  draggingId={draggingId}
-                  hoveredTree={hoveredTree}
-                  hoveredIndex={hoveredIndex}
-                  focused={focused}
-                  selectedId={selectedId}
-                  selectedTree={selectedTree}
-                  onSelect={onSelect}
-                  handleMove={handleMove}
-                  handleEnd={handleEnd}
-                  handleDragStart={handleDragStart}
-                />
-              )}
-          </DraggableSidebarItem>
-        </Fragment>
-      ))}
+      {tree.children.map((child, i) => {
+        const selected = selectedId === child.item.id;
+        return (
+          <Fragment key={child.item.id}>
+            {hoveredIndex === i && hoveredTree?.item.id === tree.item.id && <DropMarker />}
+            <DraggableSidebarItem
+              draggable
+              selected={selected}
+              itemId={child.item.id}
+              itemName={child.item.name}
+              itemFallbackName={
+                child.item.model === 'http_request' || child.item.model === 'grpc_request'
+                  ? fallbackRequestName(child.item)
+                  : 'New Folder'
+              }
+              itemModel={child.item.model}
+              itemPrefix={
+                (child.item.model === 'http_request' || child.item.model === 'grpc_request') && (
+                  <HttpMethodTag
+                    request={child.item}
+                    className={classNames(!selected && 'text-fg-subtler')}
+                  />
+                )
+              }
+              onMove={handleMove}
+              onEnd={handleEnd}
+              onSelect={onSelect}
+              onDragStart={handleDragStart}
+              useProminentStyles={focused}
+              isCollapsed={isCollapsed}
+              child={child}
+            >
+              {child.item.model === 'folder' &&
+                !isCollapsed(child.item.id) &&
+                draggingId !== child.item.id && (
+                  <SidebarItems
+                    treeParentMap={treeParentMap}
+                    tree={child}
+                    isCollapsed={isCollapsed}
+                    draggingId={draggingId}
+                    hoveredTree={hoveredTree}
+                    hoveredIndex={hoveredIndex}
+                    focused={focused}
+                    selectedId={selectedId}
+                    selectedTree={selectedTree}
+                    onSelect={onSelect}
+                    handleMove={handleMove}
+                    handleEnd={handleEnd}
+                    handleDragStart={handleDragStart}
+                  />
+                )}
+            </DraggableSidebarItem>
+          </Fragment>
+        );
+      })}
       {hoveredIndex === tree.children.length && hoveredTree?.item.id === tree.item.id && (
         <DropMarker />
       )}
@@ -802,12 +849,12 @@ const SidebarItem = forwardRef(function SidebarItem(
           data-active={isActive}
           data-selected={selected}
           className={classNames(
-            'w-full flex gap-1.5 items-center text-sm h-xs px-1.5 rounded-md transition-colors',
+            'w-full flex gap-1.5 items-center text-sm h-xs px-1.5 rounded-md',
             editing && 'ring-1 focus-within:ring-focus',
-            isActive && 'bg-highlightSecondary text-gray-800',
+            isActive && 'bg-background-highlight-secondary text-fg',
             !isActive &&
-              'text-gray-600 group-hover/item:text-gray-800 active:bg-highlightSecondary',
-            selected && useProminentStyles && '!bg-violet-400/20',
+              'text-fg-subtle group-hover/item:text-fg active:bg-background-highlight-secondary',
+            selected && useProminentStyles && '!bg-background-active',
           )}
         >
           {itemModel === 'folder' && (
@@ -815,7 +862,8 @@ const SidebarItem = forwardRef(function SidebarItem(
               size="sm"
               icon="chevronRight"
               className={classNames(
-                'transition-transform opacity-50',
+                'text-fg-subtler',
+                'transition-transform',
                 !isCollapsed(itemId) && 'transform rotate-90',
               )}
             />
@@ -837,13 +885,13 @@ const SidebarItem = forwardRef(function SidebarItem(
           {latestGrpcConnection ? (
             <div className="ml-auto">
               {latestGrpcConnection.elapsed === 0 && (
-                <Icon spin size="sm" icon="update" className="text-gray-400" />
+                <Icon spin size="sm" icon="update" className="text-fg-subtler" />
               )}
             </div>
           ) : latestHttpResponse ? (
             <div className="ml-auto">
               {isResponseLoading(latestHttpResponse) ? (
-                <Icon spin size="sm" icon="update" className="text-gray-400" />
+                <Icon spin size="sm" icon="refresh" className="text-fg-subtler" />
               ) : (
                 <StatusTag className="text-2xs dark:opacity-80" response={latestHttpResponse} />
               )}
diff --git a/src-web/components/UrlBar.tsx b/src-web/components/UrlBar.tsx
index 52f04ec1..40738977 100644
--- a/src-web/components/UrlBar.tsx
+++ b/src-web/components/UrlBar.tsx
@@ -1,3 +1,4 @@
+import classNames from 'classnames';
 import type { EditorView } from 'codemirror';
 import type { FormEvent, ReactNode } from 'react';
 import { memo, useRef, useState } from 'react';
@@ -58,7 +59,7 @@ export const UrlBar = memo(function UrlBar({
   };
 
   return (
-    <form onSubmit={handleSubmit} className={className}>
+    <form onSubmit={handleSubmit} className={classNames(className)}>
       <Input
         autocompleteVariables
         ref={inputRef}
@@ -75,7 +76,7 @@ export const UrlBar = memo(function UrlBar({
         onFocus={() => setIsFocused(true)}
         onBlur={() => setIsFocused(false)}
         onPaste={onPaste}
-        containerClassName="shadow shadow-gray-100 dark:shadow-gray-50"
+        containerClassName="shadow bg-background border"
         onChange={onUrlChange}
         defaultValue={url}
         placeholder={placeholder}
diff --git a/src-web/components/Workspace.tsx b/src-web/components/Workspace.tsx
index 7780bf84..58a94de1 100644
--- a/src-web/components/Workspace.tsx
+++ b/src-web/components/Workspace.tsx
@@ -143,7 +143,8 @@ export default function Workspace() {
             initial={{ opacity: 0, x: -20 }}
             animate={{ opacity: 1, x: 0 }}
             className={classNames(
-              'absolute top-0 left-0 bottom-0 bg-gray-100 border-r border-highlight w-[14rem]',
+              'x-theme-sidebar',
+              'absolute top-0 left-0 bottom-0 bg-background border-r border-background-highlight w-[14rem]',
               'grid grid-rows-[auto_1fr]',
             )}
           >
@@ -155,8 +156,11 @@ export default function Workspace() {
         </Overlay>
       ) : (
         <>
-          <div style={side} className={classNames('overflow-hidden bg-gray-100')}>
-            <Sidebar className="border-r border-highlight" />
+          <div
+            style={side}
+            className={classNames('x-theme-sidebar', 'overflow-hidden bg-background')}
+          >
+            <Sidebar className="border-r border-background-highlight" />
           </div>
           <ResizeHandle
             className="-translate-x-3"
@@ -168,14 +172,14 @@ export default function Workspace() {
           />
         </>
       )}
-      <HeaderSize data-tauri-drag-region style={head}>
+      <HeaderSize data-tauri-drag-region className="x-theme-appHeader bg-background" style={head}>
         <WorkspaceHeader className="pointer-events-none" />
       </HeaderSize>
       {activeWorkspace == null ? (
         <div className="m-auto">
           <Banner color="warning" className="max-w-[30rem]">
             The active workspace{' '}
-            <InlineCode className="text-orange-800">{activeWorkspaceId}</InlineCode> was not found.
+            <InlineCode className="text-fg-warning">{activeWorkspaceId}</InlineCode> was not found.
             Select a workspace from the header menu or report this bug to <FeedbackLink />
           </Banner>
         </div>
@@ -214,10 +218,11 @@ function HeaderSize({ className, style, ...props }: HeaderSizeProps) {
   const stoplightsVisible = platform?.osType === 'macos' && !fullscreen;
   return (
     <div
+      data-tauri-drag-region
       style={style}
       className={classNames(
         className,
-        'h-md pt-[1px] w-full border-b min-w-0',
+        'h-md pt-[1px] w-full border-b border-background-highlight min-w-0',
         stoplightsVisible ? 'pl-20 pr-1' : 'pl-1',
       )}
     >
diff --git a/src-web/components/WorkspaceActionsDropdown.tsx b/src-web/components/WorkspaceActionsDropdown.tsx
index bcc1ca8b..a7dba3b2 100644
--- a/src-web/components/WorkspaceActionsDropdown.tsx
+++ b/src-web/components/WorkspaceActionsDropdown.tsx
@@ -60,7 +60,7 @@ export const WorkspaceActionsDropdown = memo(function WorkspaceActionsDropdown({
               >
                 <Button
                   className="focus"
-                  color="gray"
+                  color="primary"
                   onClick={async () => {
                     hide();
                     const environmentId = (await getRecentEnvironments(w.id))[0];
@@ -76,7 +76,7 @@ export const WorkspaceActionsDropdown = memo(function WorkspaceActionsDropdown({
                 </Button>
                 <Button
                   className="focus"
-                  color="gray"
+                  color="secondary"
                   rightSlot={<Icon icon="externalLink" />}
                   onClick={async () => {
                     hide();
@@ -169,7 +169,7 @@ export const WorkspaceActionsDropdown = memo(function WorkspaceActionsDropdown({
         size="sm"
         className={classNames(
           className,
-          'text-gray-800 !px-2 truncate',
+          'text-fg !px-2 truncate',
           activeWorkspace === null && 'italic opacity-disabled',
         )}
         {...buttonProps}
diff --git a/src-web/components/WorkspaceHeader.tsx b/src-web/components/WorkspaceHeader.tsx
index 672dcccb..9882f3fa 100644
--- a/src-web/components/WorkspaceHeader.tsx
+++ b/src-web/components/WorkspaceHeader.tsx
@@ -7,11 +7,11 @@ import { Button } from './core/Button';
 import { Icon } from './core/Icon';
 import { HStack } from './core/Stacks';
 import { EnvironmentActionsDropdown } from './EnvironmentActionsDropdown';
+import { ImportCurlButton } from './ImportCurlButton';
 import { RecentRequestsDropdown } from './RecentRequestsDropdown';
 import { SettingsDropdown } from './SettingsDropdown';
 import { SidebarActions } from './SidebarActions';
 import { WorkspaceActionsDropdown } from './WorkspaceActionsDropdown';
-import { ImportCurlButton } from './ImportCurlButton';
 
 interface Props {
   className?: string;
@@ -33,7 +33,7 @@ export const WorkspaceHeader = memo(function WorkspaceHeader({ className }: Prop
         <CookieDropdown />
         <HStack alignItems="center">
           <WorkspaceActionsDropdown />
-          <Icon icon="chevronRight" className="text-gray-900 text-opacity-disabled" />
+          <Icon icon="chevronRight" className="text-fg-subtle" />
           <EnvironmentActionsDropdown className="w-auto pointer-events-auto" />
         </HStack>
       </HStack>
@@ -46,7 +46,8 @@ export const WorkspaceHeader = memo(function WorkspaceHeader({ className }: Prop
         {(osInfo?.osType === 'linux' || osInfo?.osType === 'windows') && (
           <HStack className="ml-4" alignItems="center">
             <Button
-              className="px-4 !text-gray-600 rounded-none"
+              className="px-4 text-fg-subtle hocus:text-fg hocus:bg-background-highlight-secondary rounded-none"
+              color="custom"
               onClick={() => getCurrent().minimize()}
             >
               <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
@@ -54,7 +55,8 @@ export const WorkspaceHeader = memo(function WorkspaceHeader({ className }: Prop
               </svg>
             </Button>
             <Button
-              className="px-4 !text-gray-600 rounded-none"
+              className="px-4 text-fg-subtle hocus:text-fg hocus:bg-background-highlight rounded-none"
+              color="custom"
               onClick={async () => {
                 const w = getCurrent();
                 await w.toggleMaximize();
@@ -76,7 +78,7 @@ export const WorkspaceHeader = memo(function WorkspaceHeader({ className }: Prop
             </Button>
             <Button
               color="custom"
-              className="px-4 text-gray-600 rounded-none hocus:bg-red-200 hocus:text-gray-800"
+              className="px-4 text-fg-subtle rounded-none hocus:bg-fg-danger hocus:text-fg"
               onClick={() => getCurrent().close()}
             >
               <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
diff --git a/src-web/components/core/Banner.tsx b/src-web/components/core/Banner.tsx
index d947111a..c94991eb 100644
--- a/src-web/components/core/Banner.tsx
+++ b/src-web/components/core/Banner.tsx
@@ -4,19 +4,18 @@ import type { ReactNode } from 'react';
 interface Props {
   children: ReactNode;
   className?: string;
-  color?: 'danger' | 'warning' | 'success' | 'gray';
+  color?: 'primary' | 'secondary' | 'success' | 'warning' | 'danger';
 }
-export function Banner({ children, className, color = 'gray' }: Props) {
+
+export function Banner({ children, className, color = 'secondary' }: Props) {
   return (
     <div>
       <div
         className={classNames(
           className,
+          `x-theme-banner--${color}`,
           'border border-dashed italic px-3 py-2 rounded select-auto cursor-text',
-          color === 'gray' && 'border-gray-500/60 bg-gray-300/10 text-gray-800',
-          color === 'warning' && 'border-orange-500/60 bg-orange-300/10 text-orange-800',
-          color === 'danger' && 'border-red-500/60 bg-red-300/10 text-red-800',
-          color === 'success' && 'border-violet-500/60 bg-violet-300/10 text-violet-800',
+          'border-background-highlight bg-background-highlight-secondary text-fg',
         )}
       >
         {children}
diff --git a/src-web/components/core/Button.tsx b/src-web/components/core/Button.tsx
index 376df5ac..cbe79153 100644
--- a/src-web/components/core/Button.tsx
+++ b/src-web/components/core/Button.tsx
@@ -7,7 +7,15 @@ import { Icon } from './Icon';
 
 export type ButtonProps = Omit<HTMLAttributes<HTMLButtonElement>, 'color'> & {
   innerClassName?: string;
-  color?: 'custom' | 'default' | 'gray' | 'primary' | 'secondary' | 'warning' | 'danger';
+  color?:
+    | 'custom'
+    | 'default'
+    | 'secondary'
+    | 'primary'
+    | 'info'
+    | 'success'
+    | 'warning'
+    | 'danger';
   variant?: 'border' | 'solid';
   isLoading?: boolean;
   size?: 'xs' | 'sm' | 'md';
@@ -48,6 +56,10 @@ export const Button = forwardRef<HTMLButtonElement, ButtonProps>(function Button
 
   const classes = classNames(
     className,
+    'x-theme-button',
+    `x-theme-button--${variant}`,
+    `x-theme-button--${variant}--${color}`,
+    'text-fg',
     'max-w-full min-w-0', // Help with truncation
     'hocus:opacity-100', // Force opacity for certain hover effects
     'whitespace-nowrap outline-none',
@@ -59,46 +71,26 @@ export const Button = forwardRef<HTMLButtonElement, ButtonProps>(function Button
     size === 'md' && 'h-md px-3',
     size === 'sm' && 'h-sm px-2.5 text-sm',
     size === 'xs' && 'h-xs px-2 text-sm',
+
     // Solids
+    variant === 'solid' &&
+      color !== 'custom' &&
+      color !== 'default' &&
+      'bg-background enabled:hocus:bg-background-highlight ring-background-highlight-secondary',
     variant === 'solid' && color === 'custom' && 'ring-blue-400',
     variant === 'solid' &&
       color === 'default' &&
-      'text-gray-700 enabled:hocus:bg-gray-700/10 enabled:hocus:text-gray-800 ring-blue-400',
-    variant === 'solid' &&
-      color === 'gray' &&
-      'text-gray-800 bg-gray-200/70 enabled:hocus:bg-gray-200 ring-blue-400',
-    variant === 'solid' &&
-      color === 'primary' &&
-      'bg-blue-400 text-white ring-blue-700 enabled:hocus:bg-blue-500',
-    variant === 'solid' &&
-      color === 'secondary' &&
-      'bg-violet-400 text-white ring-violet-700 enabled:hocus:bg-violet-500',
-    variant === 'solid' &&
-      color === 'warning' &&
-      'bg-orange-400 text-white ring-orange-700 enabled:hocus:bg-orange-500',
-    variant === 'solid' &&
-      color === 'danger' &&
-      'bg-red-400 text-white ring-red-700 enabled:hocus:bg-red-500',
+      'enabled:hocus:bg-background-highlight ring-fg-info',
+
     // Borders
     variant === 'border' && 'border',
+    variant === 'border' &&
+      color !== 'custom' &&
+      color !== 'default' &&
+      'border-fg-subtler text-fg-subtle enabled:hocus:border-fg-subtle enabled:hocus:bg-background-highlight enabled:hocus:text-fg ring-fg-subtler',
     variant === 'border' &&
       color === 'default' &&
-      'border-highlight text-gray-700 enabled:hocus:border-focus enabled:hocus:text-gray-800 ring-blue-500/50',
-    variant === 'border' &&
-      color === 'gray' &&
-      'border-gray-500/70 text-gray-700 enabled:hocus:bg-gray-500/20 enabled:hocus:text-gray-800 ring-blue-500/50',
-    variant === 'border' &&
-      color === 'primary' &&
-      'border-blue-500/70 text-blue-700 enabled:hocus:border-blue-500 ring-blue-500/50',
-    variant === 'border' &&
-      color === 'secondary' &&
-      'border-violet-500/70 text-violet-700 enabled:hocus:border-violet-500 ring-violet-500/50',
-    variant === 'border' &&
-      color === 'warning' &&
-      'border-orange-500/70 text-orange-700 enabled:hocus:border-orange-500 ring-orange-500/50',
-    variant === 'border' &&
-      color === 'danger' &&
-      'border-red-500/70 text-red-700 enabled:hocus:border-red-500 ring-red-500/50',
+      'border-background-highlight enabled:hocus:border-fg-subtler enabled:hocus:bg-background-highlight-secondary',
   );
 
   const buttonRef = useRef<HTMLButtonElement>(null);
diff --git a/src-web/components/core/Checkbox.tsx b/src-web/components/core/Checkbox.tsx
index faa3f74d..d16d3365 100644
--- a/src-web/components/core/Checkbox.tsx
+++ b/src-web/components/core/Checkbox.tsx
@@ -28,14 +28,14 @@ export function Checkbox({
       as="label"
       space={2}
       alignItems="center"
-      className={classNames(className, 'text-gray-900 text-sm', disabled && 'opacity-disabled')}
+      className={classNames(className, 'text-fg text-sm', disabled && 'opacity-disabled')}
     >
       <div className={classNames(inputWrapperClassName, 'relative flex')}>
         <input
           aria-hidden
           className={classNames(
-            'appearance-none w-4 h-4 flex-shrink-0 border border-highlight',
-            'rounded hocus:border-focus hocus:bg-focus/[5%] outline-none ring-0',
+            'appearance-none w-4 h-4 flex-shrink-0 border border-background-highlight',
+            'rounded hocus:border-border-focus hocus:bg-focus/[5%] outline-none ring-0',
           )}
           type="checkbox"
           disabled={disabled}
diff --git a/src-web/components/core/CountBadge.tsx b/src-web/components/core/CountBadge.tsx
index ea6dfac8..5d222561 100644
--- a/src-web/components/core/CountBadge.tsx
+++ b/src-web/components/core/CountBadge.tsx
@@ -12,7 +12,7 @@ export function CountBadge({ count, className }: Props) {
       aria-hidden
       className={classNames(
         className,
-        'opacity-70 border border-highlight text-4xs rounded mb-0.5 px-1 ml-1 h-4 font-mono',
+        'opacity-70 border border-background-highlight-secondary text-4xs rounded mb-0.5 px-1 ml-1 h-4 font-mono',
       )}
     >
       {count}
diff --git a/src-web/components/core/Dialog.tsx b/src-web/components/core/Dialog.tsx
index 7b505358..da637da3 100644
--- a/src-web/components/core/Dialog.tsx
+++ b/src-web/components/core/Dialog.tsx
@@ -50,7 +50,7 @@ export function Dialog({
 
   return (
     <Overlay open={open} onClose={onClose} portalName="dialog">
-      <div className="absolute inset-0 flex items-center justify-center pointer-events-none">
+      <div className="x-theme-dialog absolute inset-0 flex items-center justify-center pointer-events-none">
         <div
           role="dialog"
           aria-labelledby={titleId}
@@ -63,9 +63,9 @@ export function Dialog({
             className={classNames(
               className,
               'grid grid-rows-[auto_auto_minmax(0,1fr)]',
-              'relative bg-gray-50 pointer-events-auto',
+              'relative bg-background pointer-events-auto',
               'rounded-lg',
-              'dark:border border-highlight shadow shadow-black/10',
+              'border border-background-highlight shadow-lg shadow-[rgba(0,0,0,0.1)]',
               'max-w-[calc(100vw-5rem)] max-h-[calc(100vh-6rem)]',
               size === 'sm' && 'w-[25rem] max-h-[80vh]',
               size === 'md' && 'w-[45rem] max-h-[80vh]',
@@ -83,7 +83,7 @@ export function Dialog({
             )}
 
             {description ? (
-              <p className="px-6 text-gray-700" id={descriptionId}>
+              <p className="px-6 text-fg-subtle" id={descriptionId}>
                 {description}
               </p>
             ) : (
diff --git a/src-web/components/core/Dropdown.tsx b/src-web/components/core/Dropdown.tsx
index 97a2eefb..7239d185 100644
--- a/src-web/components/core/Dropdown.tsx
+++ b/src-web/components/core/Dropdown.tsx
@@ -23,14 +23,14 @@ import React, {
 import { useKey, useWindowSize } from 'react-use';
 import type { HotkeyAction } from '../../hooks/useHotKey';
 import { useHotKey } from '../../hooks/useHotKey';
+import { useStateWithDeps } from '../../hooks/useStateWithDeps';
 import { getNodeText } from '../../lib/getNodeText';
 import { Overlay } from '../Overlay';
 import { Button } from './Button';
 import { HotKey } from './HotKey';
+import { Icon } from './Icon';
 import { Separator } from './Separator';
 import { HStack, VStack } from './Stacks';
-import { Icon } from './Icon';
-import { useStateWithDeps } from '../../hooks/useStateWithDeps';
 
 export type DropdownItemSeparator = {
   type: 'separator';
@@ -413,7 +413,7 @@ const Menu = forwardRef<Omit<DropdownRef, 'open' | 'isOpen' | 'toggle'>, MenuPro
       )}
       {isOpen && (
         <Overlay open variant="transparent" portalName="dropdown" zIndex={50}>
-          <div>
+          <div className="x-theme-dialog">
             <div tabIndex={-1} aria-hidden className="fixed inset-0 z-30" onClick={handleClose} />
             <motion.div
               tabIndex={0}
@@ -431,7 +431,7 @@ const Menu = forwardRef<Omit<DropdownRef, 'open' | 'isOpen' | 'toggle'>, MenuPro
                 <span
                   aria-hidden
                   style={triangleStyles}
-                  className="bg-gray-50 absolute rotate-45 border-gray-200 border-t border-l"
+                  className="bg-background absolute rotate-45 border-background-highlight border-t border-l"
                 />
               )}
               {containerStyles && (
@@ -440,22 +440,24 @@ const Menu = forwardRef<Omit<DropdownRef, 'open' | 'isOpen' | 'toggle'>, MenuPro
                   style={menuStyles}
                   className={classNames(
                     className,
-                    'h-auto bg-gray-50 rounded-md shadow-lg dark:shadow-gray-0 py-1.5 border',
-                    'border-gray-200 overflow-auto mb-1 mx-0.5',
+                    'h-auto bg-background rounded-md shadow-lg py-1.5 border',
+                    'border-background-highlight overflow-auto mb-1 mx-0.5',
                   )}
                 >
                   {filter && (
                     <HStack
                       space={2}
                       alignItems="center"
-                      className="pb-0.5 px-1.5 mb-2 text-xs border border-highlight mx-2 rounded font-mono h-2xs"
+                      className="pb-0.5 px-1.5 mb-2 text-xs border border-background-highlight-secondary mx-2 rounded font-mono h-2xs"
                     >
-                      <Icon icon="search" size="xs" className="text-gray-700" />
-                      <div className="text-gray-800">{filter}</div>
+                      <Icon icon="search" size="xs" className="text-fg-subtle" />
+                      <div className="text-fg">{filter}</div>
                     </HStack>
                   )}
                   {filteredItems.length === 0 && (
-                    <span className="text-gray-500 text-sm text-center px-2 py-1">No matches</span>
+                    <span className="text-fg-subtler text-sm text-center px-2 py-1">
+                      No matches
+                    </span>
                   )}
                   {filteredItems.map((item, i) => {
                     if (item.type === 'separator') {
@@ -531,15 +533,17 @@ function MenuItem({ className, focused, onFocus, item, onSelect, ...props }: Men
       justify="start"
       leftSlot={item.leftSlot && <div className="pr-2 flex justify-start">{item.leftSlot}</div>}
       rightSlot={rightSlot && <div className="ml-auto pl-3">{rightSlot}</div>}
+      innerClassName="!text-left"
+      color="custom"
       className={classNames(
         className,
         'h-xs', // More compact
-        'min-w-[8rem] outline-none px-2 mx-1.5 flex text-sm text-gray-700 whitespace-nowrap',
-        'focus:bg-highlight focus:text-gray-800 rounded',
-        item.variant === 'danger' && 'text-red-600',
-        item.variant === 'notify' && 'text-pink-600',
+        'min-w-[8rem] outline-none px-2 mx-1.5 flex text-sm whitespace-nowrap',
+        'focus:bg-background-highlight focus:text-fg rounded',
+        item.variant === 'default' && 'text-fg-subtle',
+        item.variant === 'danger' && 'text-fg-danger',
+        item.variant === 'notify' && 'text-fg-primary',
       )}
-      innerClassName="!text-left"
       {...props}
     >
       <div
diff --git a/src-web/components/core/DurationTag.tsx b/src-web/components/core/DurationTag.tsx
index 6079c4a8..863039aa 100644
--- a/src-web/components/core/DurationTag.tsx
+++ b/src-web/components/core/DurationTag.tsx
@@ -5,7 +5,10 @@ interface Props {
 
 export function DurationTag({ total, headers }: Props) {
   return (
-    <span title={`HEADER: ${formatMillis(headers)}\nTOTAL: ${formatMillis(total)}`}>
+    <span
+      className="font-mono"
+      title={`HEADER: ${formatMillis(headers)}\nTOTAL: ${formatMillis(total)}`}
+    >
       {formatMillis(total)}
     </span>
   );
diff --git a/src-web/components/core/Editor/Editor.css b/src-web/components/core/Editor/Editor.css
index 23069c6c..784794c2 100644
--- a/src-web/components/core/Editor/Editor.css
+++ b/src-web/components/core/Editor/Editor.css
@@ -5,7 +5,9 @@
     @apply w-full block text-base;
 
     .cm-cursor {
-      @apply border-gray-800 !important;
+      @apply border-fg !important;
+      /* Widen the cursor */
+      @apply border-l-2;
     }
 
     &.cm-focused {
@@ -17,7 +19,7 @@
     }
 
     .cm-line {
-      @apply text-gray-800 pl-1 pr-1.5;
+      @apply text-fg pl-1 pr-1.5;
     }
 
     .cm-placeholder {
@@ -47,7 +49,7 @@
     /* Style gutters */
 
     .cm-gutters {
-      @apply border-0 text-gray-500/50;
+      @apply border-0 text-fg-subtler bg-transparent;
 
       .cm-gutterElement {
         @apply cursor-default;
@@ -55,19 +57,13 @@
     }
 
     .placeholder-widget {
-      @apply text-xs text-violet-700 dark:text-violet-700 px-1 mx-[0.5px] rounded cursor-default dark:shadow;
+      /* Colors */
+      @apply bg-background text-fg-subtle border-background-highlight-secondary;
+      @apply hover:border-background-highlight hover:text-fg hover:bg-background-highlight-secondary;
 
-      /* NOTE: Background and border are translucent so we can see text selection through it */
-      @apply bg-violet-500/20 border border-violet-500/20 border-opacity-40;
-
-      /* Bring above on hover */
-      @apply hover:z-10 relative;
+      @apply border px-1 mx-[0.5px] rounded cursor-default dark:shadow;
 
       -webkit-text-security: none;
-
-      &.placeholder-widget-error {
-        @apply text-red-700 dark:text-red-800 bg-red-300/30 border-red-300/80 border-opacity-40 hover:border-red-300 hover:bg-red-300/40;
-      }
     }
 
     .hyperlink-widget {
@@ -137,7 +133,7 @@
 
 .cm-editor .fold-gutter-icon::after {
   @apply block w-1.5 h-1.5 border-transparent -rotate-45
-    border-l border-b border-l-[currentColor] border-b-[currentColor] content-[''];
+  border-l border-b border-l-[currentColor] border-b-[currentColor] content-[''];
 }
 
 .cm-editor .fold-gutter-icon[data-open] {
@@ -149,12 +145,12 @@
 }
 
 .cm-editor .fold-gutter-icon:hover {
-  @apply text-gray-900 bg-gray-300/50;
+  @apply text-fg bg-background-highlight;
 }
 
 .cm-editor .cm-foldPlaceholder {
-  @apply px-2 border border-gray-400/50 bg-gray-300/50;
-  @apply hover:text-gray-800 hover:border-gray-400;
+  @apply px-2 border border-fg-subtler bg-background-highlight;
+  @apply hover:text-fg hover:border-fg-subtle;
   @apply cursor-default !important;
 }
 
@@ -164,11 +160,13 @@
 
 .cm-wrapper:not(.cm-readonly) .cm-editor {
   &.cm-focused .cm-activeLineGutter {
-    @apply text-gray-600;
+    @apply text-fg-subtle;
   }
+}
 
+.cm-wrapper.cm-readonly .cm-editor {
   .cm-cursor {
-    @apply border-l-2 border-gray-800;
+    @apply border-fg-danger !important;
   }
 }
 
@@ -187,18 +185,18 @@
 }
 
 .cm-tooltip.cm-tooltip-hover {
-  @apply shadow-lg bg-gray-100 rounded text-gray-700 border border-gray-500 z-50 pointer-events-auto text-xs;
+  @apply shadow-lg bg-background rounded text-fg-subtle border border-fg-subtler z-50 pointer-events-auto text-xs;
   @apply px-2 py-1;
 
   a {
-    @apply text-gray-800;
+    @apply text-fg;
 
     &:hover {
       @apply underline;
     }
 
     &::after {
-      @apply text-gray-800 bg-gray-800 h-3 w-3 ml-1;
+      @apply text-fg bg-fg-secondary h-3 w-3 ml-1;
       content: '';
       -webkit-mask: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='100' height='100' fill='black' viewBox='0 0 16 16'%3E%3Cpath fill-rule='evenodd' d='M8.636 3.5a.5.5 0 0 0-.5-.5H1.5A1.5 1.5 0 0 0 0 4.5v10A1.5 1.5 0 0 0 1.5 16h10a1.5 1.5 0 0 0 1.5-1.5V7.864a.5.5 0 0 0-1 0V14.5a.5.5 0 0 1-.5.5h-10a.5.5 0 0 1-.5-.5v-10a.5.5 0 0 1 .5-.5h6.636a.5.5 0 0 0 .5-.5z'/%3E%3Cpath fill-rule='evenodd' d='M16 .5a.5.5 0 0 0-.5-.5h-5a.5.5 0 0 0 0 1h3.793L6.146 9.146a.5.5 0 1 0 .708.708L15 1.707V5.5a.5.5 0 0 0 1 0v-5z'/%3E%3C/svg%3E");
       -webkit-mask-size: contain;
@@ -210,7 +208,7 @@
 /* NOTE: Extra selector required to override default styles */
 .cm-tooltip.cm-tooltip-autocomplete,
 .cm-tooltip.cm-completionInfo {
-  @apply shadow-lg bg-gray-100 rounded text-gray-700 border border-gray-300 z-50 pointer-events-auto text-xs;
+  @apply shadow-lg bg-background rounded text-fg-subtle border border-background-highlight z-50 pointer-events-auto text-xs;
 
   .cm-completionIcon {
     @apply italic font-mono;
@@ -286,11 +284,11 @@
     }
 
     & > ul > li {
-      @apply cursor-default px-2 rounded-sm text-gray-600 h-7 flex items-center;
+      @apply cursor-default px-2 rounded-sm text-fg-subtle h-7 flex items-center;
     }
 
     & > ul > li[aria-selected] {
-      @apply bg-highlight text-gray-900;
+      @apply bg-background-highlight-secondary text-fg;
     }
 
     .cm-completionIcon {
@@ -298,7 +296,7 @@
     }
 
     .cm-completionLabel {
-      @apply text-gray-700;
+      @apply text-fg-subtle;
     }
 
     .cm-completionDetail {
@@ -308,7 +306,7 @@
 }
 
 .cm-editor .cm-panels {
-  @apply bg-gray-100 backdrop-blur-sm p-1 mb-1 text-gray-800 z-20 rounded-md;
+  @apply bg-background-highlight-secondary backdrop-blur-sm p-1 mb-1 text-fg z-20 rounded-md;
 
   input,
   button {
@@ -316,19 +314,21 @@
   }
 
   button {
-    @apply appearance-none bg-none bg-gray-200 hocus:bg-gray-300 hocus:text-gray-950 border-0 text-gray-800 cursor-default;
+    @apply border-fg-subtler bg-background-highlight text-fg hover:border-fg-info;
+    @apply appearance-none bg-none cursor-default;
   }
 
   button[name='close'] {
-    @apply text-gray-600 hocus:text-gray-900 px-2 -mr-1.5 !important;
+    @apply text-fg-subtle hocus:text-fg px-2 -mr-1.5 !important;
   }
 
   input {
-    @apply bg-gray-50 border border-gray-500/50 focus:border-focus outline-none;
+    @apply bg-background border-background-highlight focus:border-border-focus;
+    @apply border outline-none cursor-text;
   }
 
   label {
-    @apply focus-within:text-gray-950;
+    @apply focus-within:text-fg;
   }
 
   /* Hide the "All" button */
diff --git a/src-web/components/core/Editor/Editor.tsx b/src-web/components/core/Editor/Editor.tsx
index 0574e924..906ab980 100644
--- a/src-web/components/core/Editor/Editor.tsx
+++ b/src-web/components/core/Editor/Editor.tsx
@@ -206,7 +206,6 @@ export const Editor = forwardRef<EditorView | undefined, EditorProps>(function E
 
         view = new EditorView({ state, parent: container });
         cm.current = { view, languageCompartment };
-        syncGutterBg({ parent: container, bgClassList });
         if (autoFocus) {
           view.focus();
         }
@@ -270,7 +269,7 @@ export const Editor = forwardRef<EditorView | undefined, EditorProps>(function E
       ref={initEditorRef}
       className={classNames(
         className,
-        'cm-wrapper text-base bg-gray-50',
+        'cm-wrapper text-base',
         type === 'password' && 'cm-obscure-text',
         heightMode === 'auto' ? 'cm-auto-height' : 'cm-full-height',
         singleLine ? 'cm-singleline' : 'cm-multiline',
@@ -361,19 +360,6 @@ function getExtensions({
   ];
 }
 
-const syncGutterBg = ({
-  parent,
-  bgClassList,
-}: {
-  parent: HTMLDivElement;
-  bgClassList: string[];
-}) => {
-  const gutterEl = parent.querySelector<HTMLDivElement>('.cm-gutters');
-  if (gutterEl) {
-    gutterEl?.classList.add(...bgClassList);
-  }
-};
-
 const placeholderElFromText = (text: string) => {
   const el = document.createElement('div');
   el.innerHTML = text.replace('\n', '<br/>');
diff --git a/src-web/components/core/Editor/extensions.ts b/src-web/components/core/Editor/extensions.ts
index 191be7ed..caacc37d 100644
--- a/src-web/components/core/Editor/extensions.ts
+++ b/src-web/components/core/Editor/extensions.ts
@@ -42,23 +42,23 @@ import { url } from './url/extension';
 export const myHighlightStyle = HighlightStyle.define([
   {
     tag: [t.documentMeta, t.blockComment, t.lineComment, t.docComment, t.comment],
-    color: 'hsl(var(--color-gray-600))',
+    color: 'var(--fg-subtler)',
     fontStyle: 'italic',
   },
   {
     tag: [t.paren],
-    color: 'hsl(var(--color-gray-900))',
+    color: 'var(--fg)',
   },
   {
     tag: [t.name, t.tagName, t.angleBracket, t.docString, t.number],
-    color: 'hsl(var(--color-blue-600))',
+    color: 'var(--fg-info)',
   },
-  { tag: [t.variableName], color: 'hsl(var(--color-green-600))' },
-  { tag: [t.bool], color: 'hsl(var(--color-pink-600))' },
-  { tag: [t.attributeName, t.propertyName], color: 'hsl(var(--color-violet-600))' },
-  { tag: [t.attributeValue], color: 'hsl(var(--color-orange-600))' },
-  { tag: [t.string], color: 'hsl(var(--color-yellow-600))' },
-  { tag: [t.keyword, t.meta, t.operator], color: 'hsl(var(--color-red-600))' },
+  { tag: [t.variableName], color: 'var(--fg-success)' },
+  { tag: [t.bool], color: 'var(--fg-info)' }, // TODO: Should be pink
+  { tag: [t.attributeName, t.propertyName], color: 'var(--fg-primary)' },
+  { tag: [t.attributeValue], color: 'var(--fg-warning)' },
+  { tag: [t.string], color: 'var(--fg-warning)' }, // TODO: Should be yellow
+  { tag: [t.keyword, t.meta, t.operator], color: 'var(--fg-danger)' },
 ]);
 
 const myTheme = EditorView.theme({}, { dark: true });
@@ -123,6 +123,7 @@ export const baseExtensions = [
   dropCursor(),
   drawSelection(),
   autocompletion({
+    tooltipClass: () => 'x-theme-dialog',
     closeOnBlur: true, // Set to `false` for debugging in devtools without closing it
     compareCompletions: (a, b) => {
       // Don't sort completions at all, only on boost
diff --git a/src-web/components/core/Editor/twig/placeholder.ts b/src-web/components/core/Editor/twig/placeholder.ts
index 728eaa1f..c4cb6f66 100644
--- a/src-web/components/core/Editor/twig/placeholder.ts
+++ b/src-web/components/core/Editor/twig/placeholder.ts
@@ -11,8 +11,10 @@ class PlaceholderWidget extends WidgetType {
   }
   toDOM() {
     const elt = document.createElement('span');
-    elt.className = `placeholder-widget ${
-      !this.isExistingVariable ? 'placeholder-widget-error' : ''
+    elt.className = `x-theme-placeholder-widget placeholder-widget ${
+      this.isExistingVariable
+        ? 'x-theme-placeholder-widget--primary'
+        : 'x-theme-placeholder-widget--danger'
     }`;
     elt.title = !this.isExistingVariable ? 'Variable not found in active environment' : '';
     elt.textContent = this.name;
diff --git a/src-web/components/core/FormattedError.tsx b/src-web/components/core/FormattedError.tsx
index 27b2da83..3b70f8ca 100644
--- a/src-web/components/core/FormattedError.tsx
+++ b/src-web/components/core/FormattedError.tsx
@@ -10,7 +10,7 @@ export function FormattedError({ children }: Props) {
     <pre
       className={classNames(
         'w-full text-sm select-auto cursor-text bg-gray-100 p-3 rounded',
-        'whitespace-pre-wrap border border-red-500 border-dashed overflow-x-auto',
+        'whitespace-pre-wrap border border-fg-danger border-dashed overflow-x-auto',
       )}
     >
       {children}
diff --git a/src-web/components/core/Heading.tsx b/src-web/components/core/Heading.tsx
index 49e4c76d..7039ad56 100644
--- a/src-web/components/core/Heading.tsx
+++ b/src-web/components/core/Heading.tsx
@@ -11,7 +11,7 @@ export function Heading({ className, size = 1, ...props }: Props) {
     <Component
       className={classNames(
         className,
-        'font-semibold text-gray-900',
+        'font-semibold text-fg',
         size === 1 && 'text-2xl',
         size === 2 && 'text-xl',
         size === 3 && 'text-lg',
diff --git a/src-web/components/core/HotKey.tsx b/src-web/components/core/HotKey.tsx
index 1d4538ab..a30ff6b2 100644
--- a/src-web/components/core/HotKey.tsx
+++ b/src-web/components/core/HotKey.tsx
@@ -22,7 +22,7 @@ export function HotKey({ action, className, variant }: Props) {
       className={classNames(
         className,
         variant === 'with-bg' && 'rounded border',
-        'text-gray-1000 text-opacity-disabled',
+        'text-fg-subtler',
       )}
     >
       {labelParts.map((char, index) => (
diff --git a/src-web/components/core/HotKeyLabel.tsx b/src-web/components/core/HotKeyLabel.tsx
index a6e291f0..dbcceb1f 100644
--- a/src-web/components/core/HotKeyLabel.tsx
+++ b/src-web/components/core/HotKeyLabel.tsx
@@ -7,5 +7,5 @@ interface Props {
 
 export function HotKeyLabel({ action }: Props) {
   const label = useHotKeyLabel(action);
-  return <span>{label}</span>;
+  return <span className="text-fg-subtle">{label}</span>;
 }
diff --git a/src-web/components/core/HotKeyList.tsx b/src-web/components/core/HotKeyList.tsx
index 3f525d6d..2388bb0e 100644
--- a/src-web/components/core/HotKeyList.tsx
+++ b/src-web/components/core/HotKeyList.tsx
@@ -11,7 +11,7 @@ interface Props {
 
 export const HotKeyList = ({ hotkeys, bottomSlot }: Props) => {
   return (
-    <div className="h-full flex items-center justify-center text-gray-700 text-sm">
+    <div className="h-full flex items-center justify-center text-sm">
       <VStack space={2}>
         {hotkeys.map((hotkey) => (
           <HStack key={hotkey} className="grid grid-cols-2">
diff --git a/src-web/components/core/HttpMethodTag.tsx b/src-web/components/core/HttpMethodTag.tsx
index 6cfd52a7..69051b18 100644
--- a/src-web/components/core/HttpMethodTag.tsx
+++ b/src-web/components/core/HttpMethodTag.tsx
@@ -27,7 +27,7 @@ export function HttpMethodTag({ request, className }: Props) {
 
   const m = method.toLowerCase();
   return (
-    <span className={classNames(className, 'text-2xs font-mono opacity-50')}>
+    <span className={classNames(className, 'text-2xs font-mono text-fg-subtle')}>
       {methodMap[m] ?? m.slice(0, 3).toUpperCase()}
     </span>
   );
diff --git a/src-web/components/core/Icon.tsx b/src-web/components/core/Icon.tsx
index 5ac1e827..2bdaa2df 100644
--- a/src-web/components/core/Icon.tsx
+++ b/src-web/components/core/Icon.tsx
@@ -1,5 +1,5 @@
-import * as lucide from 'lucide-react';
 import classNames from 'classnames';
+import * as lucide from 'lucide-react';
 import type { HTMLAttributes } from 'react';
 import { memo } from 'react';
 
@@ -44,6 +44,7 @@ const icons = {
   moreVertical: lucide.MoreVerticalIcon,
   paste: lucide.ClipboardPasteIcon,
   pencil: lucide.PencilIcon,
+  pin: lucide.PinIcon,
   plug: lucide.Plug,
   plus: lucide.PlusIcon,
   plusCircle: lucide.PlusCircleIcon,
diff --git a/src-web/components/core/IconButton.tsx b/src-web/components/core/IconButton.tsx
index 7c5b7b2c..e8904620 100644
--- a/src-web/components/core/IconButton.tsx
+++ b/src-web/components/core/IconButton.tsx
@@ -52,7 +52,7 @@ export const IconButton = forwardRef<HTMLButtonElement, Props>(function IconButt
       size={size}
       className={classNames(
         className,
-        'relative flex-shrink-0 text-gray-700 hover:text-gray-1000',
+        'group/button relative flex-shrink-0 text-fg-subtle',
         '!px-0',
         size === 'md' && 'w-9',
         size === 'sm' && 'w-8',
@@ -71,6 +71,7 @@ export const IconButton = forwardRef<HTMLButtonElement, Props>(function IconButt
         spin={spin}
         className={classNames(
           iconClassName,
+          'group-hover/button:text-fg',
           props.disabled && 'opacity-70',
           confirmed && 'text-green-600',
         )}
diff --git a/src-web/components/core/InlineCode.tsx b/src-web/components/core/InlineCode.tsx
index e8de7953..788681a3 100644
--- a/src-web/components/core/InlineCode.tsx
+++ b/src-web/components/core/InlineCode.tsx
@@ -6,8 +6,8 @@ export function InlineCode({ className, ...props }: HTMLAttributes<HTMLSpanEleme
     <code
       className={classNames(
         className,
-        'font-mono text-xs bg-highlight border-0 border-gray-200/30',
-        'px-1.5 py-0.5 rounded text-gray-800 shadow-inner',
+        'font-mono text-xs bg-background-highlight-secondary',
+        'px-1.5 py-0.5 rounded text-fg shadow-inner',
       )}
       {...props}
     />
diff --git a/src-web/components/core/Input.tsx b/src-web/components/core/Input.tsx
index bd2e0184..83efec5b 100644
--- a/src-web/components/core/Input.tsx
+++ b/src-web/components/core/Input.tsx
@@ -135,7 +135,7 @@ export const Input = forwardRef<EditorView | undefined, InputProps>(function Inp
         htmlFor={id}
         className={classNames(
           labelClassName,
-          'text-sm text-gray-900 whitespace-nowrap',
+          'text-sm text-fg whitespace-nowrap',
           hideLabel && 'sr-only',
         )}
       >
@@ -145,10 +145,10 @@ export const Input = forwardRef<EditorView | undefined, InputProps>(function Inp
         alignItems="stretch"
         className={classNames(
           containerClassName,
-          'relative w-full rounded-md text-gray-900',
+          'relative w-full rounded-md text-fg',
           'border',
-          focused ? 'border-focus' : 'border-highlight',
-          !isValid && '!border-invalid',
+          focused ? 'border-border-focus' : 'border-background-highlight',
+          !isValid && '!border-fg-danger',
           size === 'md' && 'min-h-md',
           size === 'sm' && 'min-h-sm',
           size === 'xs' && 'min-h-xs',
@@ -186,7 +186,7 @@ export const Input = forwardRef<EditorView | undefined, InputProps>(function Inp
             title={obscured ? `Show ${label}` : `Obscure ${label}`}
             size="xs"
             className="mr-0.5 group/obscure !h-auto my-0.5"
-            iconClassName="text-gray-500 group-hover/obscure:text-gray-800"
+            iconClassName="text-fg-subtle group-hover/obscure:text-fg"
             iconSize="sm"
             icon={obscured ? 'eye' : 'eyeClosed'}
             onClick={() => setObscured((o) => !o)}
diff --git a/src-web/components/core/JsonAttributeTree.tsx b/src-web/components/core/JsonAttributeTree.tsx
index 37563c4a..e11139ba 100644
--- a/src-web/components/core/JsonAttributeTree.tsx
+++ b/src-web/components/core/JsonAttributeTree.tsx
@@ -41,7 +41,7 @@ export const JsonAttributeTree = ({ depth = 0, attrKey, attrValue, attrKeyJsonPa
           : null,
         isExpandable: Object.keys(attrValue).length > 0,
         label: isExpanded ? `{${Object.keys(attrValue).length || ' '}}` : `{⋯}`,
-        labelClassName: 'text-gray-600',
+        labelClassName: 'text-fg-subtler',
       };
     } else if (jsonType === '[object Array]') {
       return {
@@ -59,7 +59,7 @@ export const JsonAttributeTree = ({ depth = 0, attrKey, attrValue, attrKeyJsonPa
           : null,
         isExpandable: attrValue.length > 0,
         label: isExpanded ? `[${attrValue.length || ' '}]` : `[⋯]`,
-        labelClassName: 'text-gray-600',
+        labelClassName: 'text-subtler',
       };
     } else {
       return {
@@ -67,19 +67,17 @@ export const JsonAttributeTree = ({ depth = 0, attrKey, attrValue, attrKeyJsonPa
         isExpandable: false,
         label: jsonType === '[object String]' ? `"${attrValue}"` : `${attrValue}`,
         labelClassName: classNames(
-          jsonType === '[object Boolean]' && 'text-pink-600',
-          jsonType === '[object Number]' && 'text-blue-600',
-          jsonType === '[object String]' && 'text-yellow-600',
-          jsonType === '[object Null]' && 'text-red-600',
+          jsonType === '[object Boolean]' && 'text-fg-primary',
+          jsonType === '[object Number]' && 'text-fg-info',
+          jsonType === '[object String]' && 'text-fg-notice',
+          jsonType === '[object Null]' && 'text-fg-danger',
         ),
       };
     }
   }, [attrValue, attrKeyJsonPath, isExpanded, depth]);
 
   const labelEl = (
-    <span className={classNames(labelClassName, 'select-text group-hover:text-gray-800')}>
-      {label}
-    </span>
+    <span className={classNames(labelClassName, 'select-text group-hover:text-fg')}>{label}</span>
   );
   return (
     <div className={classNames(/*depth === 0 && '-ml-4',*/ 'font-mono text-2xs')}>
@@ -91,18 +89,18 @@ export const JsonAttributeTree = ({ depth = 0, attrKey, attrValue, attrKeyJsonPa
               icon="chevronRight"
               className={classNames(
                 'left-0 absolute transition-transform flex items-center',
-                'text-gray-600 group-hover:text-gray-900',
+                'text-fg-subtler group-hover:text-fg-subtle',
                 isExpanded ? 'rotate-90' : '',
               )}
             />
-            <span className="text-violet-600 group-hover:text-violet-700 mr-1.5 whitespace-nowrap">
+            <span className="text-fg-primary group-hover:text-fg-primary mr-1.5 whitespace-nowrap">
               {attrKey === undefined ? '$' : attrKey}:
             </span>
             {labelEl}
           </button>
         ) : (
           <>
-            <span className="text-violet-600 mr-1.5 pl-4 whitespace-nowrap select-text">
+            <span className="text-fg-primary mr-1.5 pl-4 whitespace-nowrap select-text">
               {attrKey}:
             </span>
             {labelEl}
diff --git a/src-web/components/core/KeyValueRow.tsx b/src-web/components/core/KeyValueRow.tsx
index 7c7a8176..af2fb626 100644
--- a/src-web/components/core/KeyValueRow.tsx
+++ b/src-web/components/core/KeyValueRow.tsx
@@ -30,7 +30,7 @@ export function KeyValueRow({ label, value, labelClassName }: Props) {
   return (
     <>
       <td
-        className={classNames('py-0.5 pr-2 text-gray-700 select-text cursor-text', labelClassName)}
+        className={classNames('py-0.5 pr-2 text-fg-subtle select-text cursor-text', labelClassName)}
       >
         {label}
       </td>
diff --git a/src-web/components/core/PairEditor.tsx b/src-web/components/core/PairEditor.tsx
index db0b116e..e8e28fb4 100644
--- a/src-web/components/core/PairEditor.tsx
+++ b/src-web/components/core/PairEditor.tsx
@@ -388,7 +388,7 @@ function PairEditorRow({
           {pairContainer.pair.isFile ? (
             <Button
               size="xs"
-              color="gray"
+              color="secondary"
               className="font-mono text-xs"
               onClick={async (e) => {
                 e.preventDefault();
diff --git a/src-web/components/core/Select.tsx b/src-web/components/core/Select.tsx
index 8c733063..299cdcdb 100644
--- a/src-web/components/core/Select.tsx
+++ b/src-web/components/core/Select.tsx
@@ -40,7 +40,7 @@ export function Select<T extends string>({
         htmlFor={id}
         className={classNames(
           labelClassName,
-          'text-sm text-gray-900 whitespace-nowrap',
+          'text-sm text-fg whitespace-nowrap',
           hideLabel && 'sr-only',
         )}
       >
@@ -52,7 +52,7 @@ export function Select<T extends string>({
         onChange={(e) => onChange(e.target.value as T)}
         className={classNames(
           'font-mono text-xs border w-full outline-none bg-transparent pl-2 pr-7',
-          'border-highlight focus:border-focus',
+          'bg-background-highlight-secondary border-background-highlight focus:border-border-focus',
           size === 'xs' && 'h-xs',
           size === 'sm' && 'h-sm',
           size === 'md' && 'h-md',
diff --git a/src-web/components/core/Separator.tsx b/src-web/components/core/Separator.tsx
index 0a36d05e..c1e3d940 100644
--- a/src-web/components/core/Separator.tsx
+++ b/src-web/components/core/Separator.tsx
@@ -8,19 +8,13 @@ interface Props {
   children?: ReactNode;
 }
 
-export function Separator({
-  className,
-  variant = 'primary',
-  orientation = 'horizontal',
-  children,
-}: Props) {
+export function Separator({ className, orientation = 'horizontal', children }: Props) {
   return (
     <div role="separator" className={classNames(className, 'flex items-center')}>
-      {children && <div className="text-xs text-gray-500 mr-2 whitespace-nowrap">{children}</div>}
+      {children && <div className="text-xs text-fg-subtler mr-2 whitespace-nowrap">{children}</div>}
       <div
         className={classNames(
-          variant === 'primary' && 'bg-highlight',
-          variant === 'secondary' && 'bg-highlightSecondary',
+          'bg-background-highlight',
           orientation === 'horizontal' && 'w-full h-[1px]',
           orientation === 'vertical' && 'h-full w-[1px]',
         )}
diff --git a/src-web/components/core/SizeTag.tsx b/src-web/components/core/SizeTag.tsx
index 50c26279..b11a5e56 100644
--- a/src-web/components/core/SizeTag.tsx
+++ b/src-web/components/core/SizeTag.tsx
@@ -21,7 +21,7 @@ export function SizeTag({ contentLength }: Props) {
   }
 
   return (
-    <span title={`${contentLength} bytes`}>
+    <span className="font-mono" title={`${contentLength} bytes`}>
       {Math.round(num * 10) / 10} {unit}
     </span>
   );
diff --git a/src-web/components/core/StatusTag.tsx b/src-web/components/core/StatusTag.tsx
index 64cdb241..f2bee082 100644
--- a/src-web/components/core/StatusTag.tsx
+++ b/src-web/components/core/StatusTag.tsx
@@ -10,17 +10,18 @@ interface Props {
 export function StatusTag({ response, className, showReason }: Props) {
   const { status } = response;
   const label = status < 100 ? 'ERR' : status;
+  const category = `${status}`[0];
   return (
     <span
       className={classNames(
         className,
         'font-mono',
-        status >= 0 && status < 100 && 'text-red-600',
-        status >= 100 && status < 200 && 'text-green-600',
-        status >= 200 && status < 300 && 'text-green-600',
-        status >= 300 && status < 400 && 'text-pink-600',
-        status >= 400 && status < 500 && 'text-orange-600',
-        status >= 500 && 'text-red-600',
+        category === '0' && 'text-fg-danger',
+        category === '1' && 'text-fg-info',
+        category === '2' && 'text-fg-success',
+        category === '3' && 'text-fg-primary',
+        category === '4' && 'text-fg-warning',
+        category === '5' && 'text-fg-danger',
       )}
     >
       {label} {showReason && response.statusReason && response.statusReason}
diff --git a/src-web/components/core/Tabs/Tabs.tsx b/src-web/components/core/Tabs/Tabs.tsx
index a834b759..202df425 100644
--- a/src-web/components/core/Tabs/Tabs.tsx
+++ b/src-web/components/core/Tabs/Tabs.tsx
@@ -82,7 +82,7 @@ export function Tabs({
           {tabs.map((t) => {
             const isActive = t.value === value;
             const btnClassName = classNames(
-              isActive ? 'text-gray-800' : 'text-gray-600 hover:text-gray-700',
+              isActive ? 'text-fg' : 'text-fg-subtler hover:text-fg-subtle',
               '!px-2 ml-[1px]',
             );
 
@@ -108,7 +108,7 @@ export function Tabs({
                         icon="chevronDown"
                         className={classNames(
                           '-mr-1.5 mt-0.5',
-                          isActive ? 'opacity-100' : 'opacity-20',
+                          isActive ? 'text-fg-subtle' : 'opacity-50',
                         )}
                       />
                     }
diff --git a/src-web/components/core/Toast.tsx b/src-web/components/core/Toast.tsx
index 72a6ab07..fe0bbc94 100644
--- a/src-web/components/core/Toast.tsx
+++ b/src-web/components/core/Toast.tsx
@@ -3,9 +3,9 @@ import { motion } from 'framer-motion';
 import type { ReactNode } from 'react';
 import React from 'react';
 import { useKey } from 'react-use';
-import { IconButton } from './IconButton';
 import type { IconProps } from './Icon';
 import { Icon } from './Icon';
+import { IconButton } from './IconButton';
 
 export interface ToastProps {
   children: ReactNode;
@@ -52,14 +52,15 @@ export function Toast({
       transition={{ duration: 0.2 }}
       className={classNames(
         className,
+        'x-theme-dialog',
         'pointer-events-auto',
-        'relative bg-gray-50 dark:bg-gray-100 pointer-events-auto',
+        'relative bg-background pointer-events-auto',
         'rounded-lg',
-        'border border-highlightSecondary dark:border-highlight shadow-xl',
+        'border border-background-highlight dark:border-background-highlight-secondary shadow-xl',
         'max-w-[calc(100vw-5rem)] max-h-[calc(100vh-6rem)]',
         'w-[22rem] max-h-[80vh]',
         'm-2 grid grid-cols-[1fr_auto]',
-        'text-gray-700',
+        'text-fg',
       )}
     >
       <div className="px-3 py-2 flex items-center gap-2">
@@ -67,10 +68,10 @@ export function Toast({
           <Icon
             icon={ICONS[variant]}
             className={classNames(
-              variant === 'success' && 'text-green-500',
-              variant === 'warning' && 'text-orange-500',
-              variant === 'error' && 'text-red-500',
-              variant === 'copied' && 'text-violet-500',
+              variant === 'success' && 'text-fg-success',
+              variant === 'warning' && 'text-fg-warning',
+              variant === 'error' && 'text-fg-danger',
+              variant === 'copied' && 'text-fg-primary',
             )}
           />
         )}
@@ -82,7 +83,7 @@ export function Toast({
 
       <IconButton
         color="custom"
-        className="opacity-50"
+        className="opacity-60"
         title="Dismiss"
         icon="x"
         onClick={onClose}
@@ -91,7 +92,7 @@ export function Toast({
       {timeout != null && (
         <div className="w-full absolute bottom-0 left-0 right-0">
           <motion.div
-            className="bg-highlight h-0.5"
+            className="bg-background-highlight h-0.5"
             initial={{ width: '100%' }}
             animate={{ width: '0%', opacity: 0.2 }}
             transition={{ duration: timeout / 1000, ease: 'linear' }}
diff --git a/src-web/components/core/WindowDragRegion.tsx b/src-web/components/core/WindowDragRegion.tsx
deleted file mode 100644
index 23a56617..00000000
--- a/src-web/components/core/WindowDragRegion.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import classNames from 'classnames';
-import type { ReactNode } from 'react';
-
-interface Props {
-  className?: string;
-  children?: ReactNode;
-}
-
-export function WindowDragRegion({ className, ...props }: Props) {
-  return (
-    <div
-      data-tauri-drag-region
-      className={classNames(className, 'w-full flex-shrink-0')}
-      {...props}
-    />
-  );
-}
diff --git a/src-web/components/responseViewers/ImageViewer.tsx b/src-web/components/responseViewers/ImageViewer.tsx
index e62cfc53..a1983d52 100644
--- a/src-web/components/responseViewers/ImageViewer.tsx
+++ b/src-web/components/responseViewers/ImageViewer.tsx
@@ -2,6 +2,7 @@ import { convertFileSrc } from '@tauri-apps/api/core';
 import classNames from 'classnames';
 import { useState } from 'react';
 import type { HttpResponse } from '../../lib/models';
+import { Button } from '../core/Button';
 
 interface Props {
   response: HttpResponse;
@@ -20,15 +21,15 @@ export function ImageViewer({ response, className }: Props) {
   if (!show) {
     return (
       <>
-        <div className="text-sm italic text-gray-500">
+        <div className="text-sm italic text-fg-subtler">
           Response body is too large to preview.{' '}
-          <button
-            className="cursor-pointer underline hover:text-gray-800"
-            color="gray"
+          <Button
+            className="cursor-pointer underline hover:text-fg"
+            color="secondary"
             onClick={() => setShow(true)}
           >
             Show anyway
-          </button>
+          </Button>
         </div>
       </>
     );
diff --git a/src-web/components/responseViewers/TextViewer.tsx b/src-web/components/responseViewers/TextViewer.tsx
index b9da6ae2..6becee36 100644
--- a/src-web/components/responseViewers/TextViewer.tsx
+++ b/src-web/components/responseViewers/TextViewer.tsx
@@ -85,7 +85,6 @@ export function TextViewer({ response, pretty }: Props) {
   return (
     <Editor
       readOnly
-      className="bg-gray-50 dark:!bg-gray-100"
       forceUpdateKey={body}
       defaultValue={body}
       contentType={contentType}
diff --git a/src-web/components/responseViewers/WebPageViewer.tsx b/src-web/components/responseViewers/WebPageViewer.tsx
index e5bc20ac..cb675c72 100644
--- a/src-web/components/responseViewers/WebPageViewer.tsx
+++ b/src-web/components/responseViewers/WebPageViewer.tsx
@@ -24,7 +24,7 @@ export function WebPageViewer({ response }: Props) {
         title="Response preview"
         srcDoc={contentForIframe}
         sandbox="allow-scripts allow-same-origin"
-        className="h-full w-full rounded border border-highlightSecondary"
+        className="h-full w-full rounded border border-background-highlight-secondary"
       />
     </div>
   );
diff --git a/src-web/hooks/Confirm.tsx b/src-web/hooks/Confirm.tsx
index 4b7a36e3..5e36c99a 100644
--- a/src-web/hooks/Confirm.tsx
+++ b/src-web/hooks/Confirm.tsx
@@ -32,10 +32,10 @@ export function Confirm({ onHide, onResult, confirmText, variant = 'confirm' }:
 
   return (
     <HStack space={2} justifyContent="start" className="mt-2 mb-4 flex-row-reverse">
-      <Button className="focus" color={colors[variant]} onClick={handleSuccess}>
+      <Button color={colors[variant]} onClick={handleSuccess}>
         {confirmText ?? confirmButtonTexts[variant]}
       </Button>
-      <Button className="focus" color="gray" onClick={handleHide}>
+      <Button onClick={handleHide} variant="border">
         Cancel
       </Button>
     </HStack>
diff --git a/src-web/hooks/Prompt.tsx b/src-web/hooks/Prompt.tsx
index 35b49cf4..9cc9e42b 100644
--- a/src-web/hooks/Prompt.tsx
+++ b/src-web/hooks/Prompt.tsx
@@ -52,10 +52,10 @@ export function Prompt({
         onChange={setValue}
       />
       <HStack space={2} justifyContent="end">
-        <Button className="focus" color="gray" onClick={onHide}>
+        <Button onClick={onHide} variant="border">
           Cancel
         </Button>
-        <Button type="submit" className="focus" color="primary">
+        <Button type="submit" color="primary">
           {confirmLabel}
         </Button>
       </HStack>
diff --git a/src-web/hooks/useKeyValue.ts b/src-web/hooks/useKeyValue.ts
index 35d05aaa..7f21d3c9 100644
--- a/src-web/hooks/useKeyValue.ts
+++ b/src-web/hooks/useKeyValue.ts
@@ -2,7 +2,7 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 import { useCallback, useMemo } from 'react';
 import { buildKeyValueKey, getKeyValue, setKeyValue } from '../lib/keyValueStore';
 
-const DEFAULT_NAMESPACE = 'app';
+const DEFAULT_NAMESPACE = 'global';
 
 export function keyValueQueryKey({
   namespace = DEFAULT_NAMESPACE,
@@ -20,7 +20,7 @@ export function useKeyValue<T extends Object | null>({
   key,
   fallback,
 }: {
-  namespace?: 'app' | 'no_sync' | 'global';
+  namespace?: 'global' | 'no_sync';
   key: string | string[];
   fallback: T;
 }) {
@@ -51,7 +51,8 @@ export function useKeyValue<T extends Object | null>({
         await mutate.mutateAsync(value);
       }
     },
-    [fallback, key, mutate, namespace],
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [fallback, key, namespace],
   );
 
   const reset = useCallback(async () => mutate.mutateAsync(fallback), [mutate, fallback]);
diff --git a/src-web/hooks/useNotificationToast.tsx b/src-web/hooks/useNotificationToast.tsx
index bf553806..e3a3d755 100644
--- a/src-web/hooks/useNotificationToast.tsx
+++ b/src-web/hooks/useNotificationToast.tsx
@@ -1,8 +1,8 @@
+import { invoke } from '@tauri-apps/api/core';
+import { open } from '@tauri-apps/plugin-shell';
+import { Button } from '../components/core/Button';
 import { useToast } from '../components/ToastContext';
 import { useListenToTauriEvent } from './useListenToTauriEvent';
-import { Button } from '../components/core/Button';
-import { open } from '@tauri-apps/plugin-shell';
-import { invoke } from '@tauri-apps/api/core';
 
 export function useNotificationToast() {
   const toast = useToast();
@@ -31,7 +31,7 @@ export function useNotificationToast() {
         actionLabel && actionUrl ? (
           <Button
             size="xs"
-            color="gray"
+            color="secondary"
             className="mr-auto min-w-[5rem]"
             onClick={() => {
               toast.hide(payload.id);
diff --git a/src-web/hooks/usePinnedGrpcConnection.ts b/src-web/hooks/usePinnedGrpcConnection.ts
new file mode 100644
index 00000000..9be6efd1
--- /dev/null
+++ b/src-web/hooks/usePinnedGrpcConnection.ts
@@ -0,0 +1,19 @@
+import type { GrpcConnection, GrpcRequest } from '../lib/models';
+import { useGrpcConnections } from './useGrpcConnections';
+import { useKeyValue } from './useKeyValue';
+import { useLatestGrpcConnection } from './useLatestGrpcConnection';
+
+export function usePinnedGrpcConnection(activeRequest: GrpcRequest) {
+  const latestConnection = useLatestGrpcConnection(activeRequest.id);
+  const { set: setPinnedConnectionId, value: pinnedConnectionId } = useKeyValue<string | null>({
+    // Key on latest connection instead of activeRequest because connections change out of band of active request
+    key: ['pinned_grpc_connection_id', latestConnection?.id ?? 'n/a'],
+    fallback: null,
+    namespace: 'global',
+  });
+  const connections = useGrpcConnections(activeRequest.id);
+  const activeConnection: GrpcConnection | null =
+    connections.find((r) => r.id === pinnedConnectionId) ?? latestConnection;
+
+  return { activeConnection, setPinnedConnectionId, pinnedConnectionId, connections } as const;
+}
diff --git a/src-web/hooks/usePinnedHttpResponse.ts b/src-web/hooks/usePinnedHttpResponse.ts
index 88cfbdc7..2d2e74fb 100644
--- a/src-web/hooks/usePinnedHttpResponse.ts
+++ b/src-web/hooks/usePinnedHttpResponse.ts
@@ -1,28 +1,19 @@
-import { useCallback, useEffect } from 'react';
-import { createGlobalState } from 'react-use';
 import type { HttpRequest, HttpResponse } from '../lib/models';
 import { useHttpResponses } from './useHttpResponses';
+import { useKeyValue } from './useKeyValue';
 import { useLatestHttpResponse } from './useLatestHttpResponse';
 
-const usePinnedResponseIdState = createGlobalState<string | null>(null);
-
 export function usePinnedHttpResponse(activeRequest: HttpRequest) {
-  const [pinnedResponseId, setPinnedResponseId] = usePinnedResponseIdState();
   const latestResponse = useLatestHttpResponse(activeRequest.id);
+  const { set: setPinnedResponseId, value: pinnedResponseId } = useKeyValue<string | null>({
+    // Key on latest response instead of activeRequest because responses change out of band of active request
+    key: ['pinned_http_response_id', latestResponse?.id ?? 'n/a'],
+    fallback: null,
+    namespace: 'global',
+  });
   const responses = useHttpResponses(activeRequest.id);
-  const activeResponse: HttpResponse | null = pinnedResponseId
-    ? responses.find((r) => r.id === pinnedResponseId) ?? null
-    : latestResponse ?? null;
+  const activeResponse: HttpResponse | null =
+    responses.find((r) => r.id === pinnedResponseId) ?? latestResponse;
 
-  // Unset pinned response when a new one comes in
-  useEffect(() => setPinnedResponseId(null), [responses.length, setPinnedResponseId]);
-
-  const setPinnedResponse = useCallback(
-    (r: HttpResponse) => {
-      setPinnedResponseId(r.id);
-    },
-    [setPinnedResponseId],
-  );
-
-  return { activeResponse, setPinnedResponse, pinnedResponseId, responses } as const;
+  return { activeResponse, setPinnedResponseId, pinnedResponseId, responses } as const;
 }
diff --git a/src-web/lib/fallbackRequestName.ts b/src-web/lib/fallbackRequestName.ts
index 712df566..4a10c854 100644
--- a/src-web/lib/fallbackRequestName.ts
+++ b/src-web/lib/fallbackRequestName.ts
@@ -7,12 +7,14 @@ export function fallbackRequestName(r: HttpRequest | GrpcRequest | null): string
     return r.name;
   }
 
-  const withoutVariables = r.url.replace(/\$\{\[[^\]]+]}/g, '');
+  const withoutVariables = r.url.replace(/\$\{\[\s*([^\]]+)\s*]}/g, '$1');
   if (withoutVariables.trim() === '') {
     return r.model === 'http_request' ? 'New HTTP Request' : 'new gRPC Request';
   }
 
-  const fixedUrl = r.url.match(/^https?:\/\//) ? r.url : 'http://' + r.url;
+  const fixedUrl = withoutVariables.match(/^https?:\/\//)
+    ? withoutVariables
+    : 'http://' + withoutVariables;
 
   if (r.model === 'grpc_request' && r.service != null && r.method != null) {
     const shortService = r.service.split('.').pop();
@@ -21,6 +23,7 @@ export function fallbackRequestName(r: HttpRequest | GrpcRequest | null): string
     try {
       const url = new URL(fixedUrl);
       const pathname = url.pathname === '/' ? '' : url.pathname;
+      console.log('hello', fixedUrl);
       return `${url.host}${pathname}`;
     } catch (_) {
       // Nothing
diff --git a/src-web/lib/indent.ts b/src-web/lib/indent.ts
new file mode 100644
index 00000000..51f5b4fd
--- /dev/null
+++ b/src-web/lib/indent.ts
@@ -0,0 +1,6 @@
+export function indent(text: string, space = '    '): string {
+  return text
+    .split('\n')
+    .map((line) => space + line)
+    .join('\n');
+}
diff --git a/src-web/lib/theme/color.ts b/src-web/lib/theme/color.ts
new file mode 100644
index 00000000..9d375011
--- /dev/null
+++ b/src-web/lib/theme/color.ts
@@ -0,0 +1,94 @@
+import parseColor from 'parse-color';
+
+export class Color {
+  private theme: 'dark' | 'light' = 'light';
+
+  private hue: number = 0;
+  private saturation: number = 0;
+  private lightness: number = 0;
+  private alpha: number = 1;
+
+  constructor(cssColor: string, theme: 'dark' | 'light') {
+    try {
+      const { hsla } = parseColor(cssColor || '');
+      this.hue = hsla[0];
+      this.saturation = hsla[1];
+      this.lightness = hsla[2];
+      this.alpha = hsla[3] ?? 1;
+      this.theme = theme;
+    } catch (err) {
+      console.log('Failed to parse CSS color', cssColor, err);
+    }
+  }
+
+  static transparent(): Color {
+    return new Color('rgba(0, 0, 0, 0.1)', 'light');
+  }
+
+  private clone(): Color {
+    return new Color(this.css(), this.theme);
+  }
+
+  lower(mod: number): Color {
+    return this.theme === 'dark' ? this._darken(mod) : this._lighten(mod);
+  }
+
+  lowerTo(value: number): Color {
+    return this.theme === 'dark'
+      ? this._darken(1)._lighten(value)
+      : this._lighten(1)._darken(1 - value);
+  }
+
+  lift(mod: number): Color {
+    return this.theme === 'dark' ? this._lighten(mod) : this._darken(mod);
+  }
+
+  liftTo(value: number): Color {
+    return this.theme === 'dark'
+      ? this._lighten(1)._darken(1 - value)
+      : this._darken(1)._lighten(value);
+  }
+
+  translucify(mod: number): Color {
+    const c = this.clone();
+    c.alpha = c.alpha - c.alpha * mod;
+    return c;
+  }
+
+  desaturate(mod: number): Color {
+    const c = this.clone();
+    c.saturation = c.saturation - c.saturation * mod;
+    return c;
+  }
+
+  saturate(mod: number): Color {
+    const c = this.clone();
+    c.saturation = this.saturation + (100 - this.saturation) * mod;
+    return c;
+  }
+
+  lighterThan(c: Color): boolean {
+    return this.lightness > c.lightness;
+  }
+
+  css(): string {
+    // If opacity is 1, allow for Tailwind modification
+    const h = Math.round(this.hue);
+    const s = Math.round(this.saturation);
+    const l = Math.round(this.lightness);
+    const a = Math.round(this.alpha * 100) / 100;
+    return `hsla(${h}, ${s}%, ${l}%, ${a})`;
+  }
+
+  private _lighten(mod: number): Color {
+    const c = this.clone();
+    c.lightness = this.lightness + (100 - this.lightness) * mod;
+    return c;
+  }
+
+  private _darken(mod: number): Color {
+    const c = this.clone();
+    c.lightness = this.lightness - this.lightness * mod;
+    return c;
+  }
+}
diff --git a/src-web/lib/theme/theme.test.ts b/src-web/lib/theme/theme.test.ts
deleted file mode 100644
index 5b77d21a..00000000
--- a/src-web/lib/theme/theme.test.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { describe, expect, it } from 'vitest';
-import { generateColorVariant, toTailwindVariable } from './theme';
-
-describe('Generate colors', () => {
-  it('Generates dark colors', () => {
-    expect(generateColorVariant('hsl(0,0%,50%)', 50, 'dark', 0.2, 0.8)).toBe('hsl(0,0%,14.0%)');
-    expect(generateColorVariant('hsl(0,0%,50%)', 950, 'dark', 0.2, 0.8)).toBe('hsl(0,0%,77.0%)');
-    expect(generateColorVariant('hsl(0,0%,50%)', 50, 'dark', 0.4, 0.6)).toBe('hsl(0,0%,23.0%)');
-    expect(generateColorVariant('hsl(0,0%,50%)', 950, 'dark', 0.4, 0.6)).toBe('hsl(0,0%,59.0%)');
-  });
-  it('Generates light colors', () => {
-    expect(generateColorVariant('hsl(0,0%,50%)', 50, 'light', 0.2, 0.8)).toBe('hsl(0,0%,80.0%)');
-    expect(generateColorVariant('hsl(0,0%,50%)', 950, 'light', 0.2, 0.8)).toBe('hsl(0,0%,14.0%)');
-    expect(generateColorVariant('hsl(0,0%,50%)', 50, 'light', 0.4, 0.6)).toBe('hsl(0,0%,60.0%)');
-    expect(generateColorVariant('hsl(0,0%,50%)', 950, 'light', 0.4, 0.6)).toBe('hsl(0,0%,23.0%)');
-  });
-});
-
-describe('Generates Tailwind color', () => {
-  it('Does it', () => {
-    expect(
-      toTailwindVariable({ name: 'blue', cssColor: 'hsl(10, 20%, 30%)', variant: 100 }),
-    ).toEqual('--color-blue-100: 10 20% 30%;');
-  });
-});
diff --git a/src-web/lib/theme/theme.ts b/src-web/lib/theme/theme.ts
deleted file mode 100644
index 12025935..00000000
--- a/src-web/lib/theme/theme.ts
+++ /dev/null
@@ -1,172 +0,0 @@
-import parseColor from 'parse-color';
-import type { Appearance } from './window';
-
-export type AppThemeColor =
-  | 'gray'
-  | 'red'
-  | 'orange'
-  | 'yellow'
-  | 'green'
-  | 'blue'
-  | 'pink'
-  | 'violet';
-const colorNames: AppThemeColor[] = [
-  'gray',
-  'red',
-  'orange',
-  'yellow',
-  'green',
-  'blue',
-  'pink',
-  'violet',
-];
-export type AppThemeColorVariant =
-  | 0
-  | 50
-  | 100
-  | 200
-  | 300
-  | 400
-  | 500
-  | 600
-  | 700
-  | 800
-  | 900
-  | 950
-  | 1000;
-
-export const appThemeVariants: AppThemeColorVariant[] = [
-  0, 50, 100, 200, 300, 400, 500, 600, 700, 800, 900, 950, 1000,
-];
-
-export type AppThemeLayer = 'root' | 'sidebar' | 'titlebar' | 'content' | 'above';
-export type AppThemeColors = Record<AppThemeColor, string>;
-
-export interface AppThemeLayerStyle {
-  colors: AppThemeColors;
-  blackPoint?: number;
-  whitePoint?: number;
-}
-
-interface ThemeColorObj {
-  name: AppThemeColor;
-  variant: AppThemeColorVariant;
-  cssColor: string;
-}
-
-export interface AppTheme {
-  name: string;
-  appearance: Appearance;
-  layers: Partial<Record<AppThemeLayer, AppThemeLayerStyle>>;
-}
-
-export function generateCSS(t: AppTheme): ThemeColorObj[] {
-  const rootColors = t.layers.root?.colors;
-  if (rootColors === undefined) return [];
-
-  const colors: ThemeColorObj[] = [];
-  for (const color of colorNames) {
-    const rawValue = rootColors[color];
-    if (!rawValue) continue;
-    colors.push(
-      ...generateColors(
-        color,
-        rawValue,
-        t.appearance,
-        t.layers.root?.blackPoint,
-        t.layers.root?.whitePoint,
-      ),
-    );
-  }
-
-  return colors;
-}
-
-export function generateColors(
-  name: AppThemeColor,
-  color: string,
-  appearance: Appearance,
-  blackPoint = 0,
-  whitePoint = 1,
-): ThemeColorObj[] {
-  const colors = [];
-  for (const variant of appThemeVariants) {
-    colors.push({
-      name,
-      variant,
-      cssColor: generateColorVariant(color, variant, appearance, blackPoint, whitePoint),
-    });
-  }
-  return colors;
-}
-
-const lightnessMap: Record<Appearance, Record<AppThemeColorVariant, number>> = {
-  system: {
-    // Not actually used
-    0: 1,
-    50: 1,
-    100: 0.9,
-    200: 0.7,
-    300: 0.4,
-    400: 0.2,
-    500: 0,
-    600: -0.2,
-    700: -0.4,
-    800: -0.6,
-    900: -0.8,
-    950: -0.9,
-    1000: -1,
-  },
-  light: {
-    0: 1,
-    50: 1,
-    100: 0.9,
-    200: 0.7,
-    300: 0.4,
-    400: 0.2,
-    500: 0,
-    600: -0.2,
-    700: -0.4,
-    800: -0.6,
-    900: -0.8,
-    950: -0.9,
-    1000: -1,
-  },
-  dark: {
-    0: -1,
-    50: -0.9,
-    100: -0.8,
-    200: -0.6,
-    300: -0.4,
-    400: -0.2,
-    500: 0,
-    600: 0.2,
-    700: 0.4,
-    800: 0.6,
-    900: 0.8,
-    950: 0.9,
-    1000: 1,
-  },
-};
-
-export function generateColorVariant(
-  color: string,
-  variant: AppThemeColorVariant,
-  appearance: Appearance,
-  blackPoint = 0,
-  whitePoint = 1,
-): string {
-  const { hsl } = parseColor(color || '');
-  const lightnessMod = lightnessMap[appearance][variant];
-  // const lightnessMod = (appearance === 'dark' ? 1 : -1) * ((variant / 1000) * 2 - 1);
-  const newL =
-    lightnessMod > 0
-      ? hsl[2] + (100 * whitePoint - hsl[2]) * lightnessMod
-      : hsl[2] + hsl[2] * (1 - blackPoint) * lightnessMod;
-  return `hsl(${hsl[0]},${hsl[1]}%,${newL.toFixed(1)}%)`;
-}
-
-export function toTailwindVariable({ name, variant, cssColor }: ThemeColorObj): string {
-  const { hsl } = parseColor(cssColor || '');
-  return `--color-${name}-${variant}: ${hsl[0]} ${hsl[1]}% ${hsl[2]}%;`;
-}
diff --git a/src-web/lib/theme/window.ts b/src-web/lib/theme/window.ts
index d055d710..d06c6440 100644
--- a/src-web/lib/theme/window.ts
+++ b/src-web/lib/theme/window.ts
@@ -1,76 +1,313 @@
-import type { AppTheme, AppThemeColors } from './theme';
-import { generateCSS, toTailwindVariable } from './theme';
+import { indent } from '../indent';
+import { Color } from './color';
 
 export type Appearance = 'dark' | 'light' | 'system';
 
 const DEFAULT_APPEARANCE: Appearance = 'system';
 
-enum Theme {
-  yaak = 'yaak',
-  catppuccin = 'catppuccin',
+interface ThemeComponent {
+  background?: Color;
+  backgroundHighlight?: Color;
+  backgroundHighlightSecondary?: Color;
+  backgroundActive?: Color;
+  foreground?: Color;
+  foregroundSubtle?: Color;
+  foregroundSubtler?: Color;
+  colors?: Partial<RootColors>;
 }
 
-const themes: Record<Theme, AppThemeColors> = {
-  yaak: {
-    gray: 'hsl(245, 23%, 45%)',
-    red: 'hsl(342,100%, 63%)',
-    orange: 'hsl(32, 98%, 54%)',
-    yellow: 'hsl(52, 79%, 58%)',
-    green: 'hsl(136, 62%, 54%)',
-    blue: 'hsl(206, 100%, 56%)',
-    pink: 'hsl(300, 100%, 71%)',
-    violet: 'hsl(266, 100%, 73%)',
-  },
-  catppuccin: {
-    gray: 'hsl(240, 23%, 47%)',
-    red: 'hsl(343, 91%, 74%)',
-    orange: 'hsl(23, 92%, 74%)',
-    yellow: 'hsl(41, 86%, 72%)',
-    green: 'hsl(115, 54%, 65%)',
-    blue: 'hsl(217, 92%, 65%)',
-    pink: 'hsl(316, 72%, 75%)',
-    violet: 'hsl(267, 84%, 70%)',
-  },
-};
+interface YaakTheme extends ThemeComponent {
+  name: string;
+  components?: {
+    dialog?: ThemeComponent;
+    sidebar?: ThemeComponent;
+    responsePane?: ThemeComponent;
+    appHeader?: ThemeComponent;
+    button?: ThemeComponent;
+    banner?: ThemeComponent;
+    placeholder?: ThemeComponent;
+  };
+}
 
-const darkTheme: AppTheme = {
-  name: 'Default Dark',
-  appearance: 'dark',
-  layers: {
-    root: {
-      blackPoint: 0.2,
-      colors: themes.yaak,
+interface RootColors {
+  primary: Color;
+  secondary: Color;
+  info: Color;
+  success: Color;
+  notice: Color;
+  warning: Color;
+  danger: Color;
+}
+
+type ColorName = keyof RootColors;
+type ComponentName = keyof NonNullable<YaakTheme['components']>;
+
+const yaakThemes: Record<string, YaakTheme> = {
+  yaakLight: {
+    name: 'Yaak (Light)',
+    background: new Color('#f2f4f7', 'light').lower(1),
+    foreground: new Color('hsl(219,23%,15%)', 'light'),
+    colors: {
+      primary: new Color('hsl(266,100%,70%)', 'light'),
+      secondary: new Color('hsl(220,24%,59%)', 'light'),
+      info: new Color('hsl(206,100%,48%)', 'light'),
+      success: new Color('hsl(155,95%,33%)', 'light'),
+      notice: new Color('hsl(45,100%,41%)', 'light'),
+      warning: new Color('hsl(30,100%,43%)', 'light'),
+      danger: new Color('hsl(335,75%,57%)', 'light'),
+    },
+    components: {
+      sidebar: {
+        background: new Color('#f2f4f7', 'light'),
+      },
+    },
+  } as YaakTheme,
+
+  yaakDark: {
+    name: 'Yaak Dark',
+    background: new Color('hsl(244,23%,12%)', 'dark'),
+    foreground: new Color('#bcbad4', 'dark'),
+
+    colors: {
+      primary: new Color('hsl(266,100%,79%)', 'dark'),
+      secondary: new Color('hsl(245,23%,60%)', 'dark'),
+      info: new Color('hsl(206,100%,63%)', 'dark'),
+      success: new Color('hsl(150,100%,37%)', 'dark'),
+      notice: new Color('hsl(48,80%,63%)', 'dark'),
+      warning: new Color('hsl(28,100%,61%)', 'dark'),
+      danger: new Color('hsl(342,90%,68%)', 'dark'),
+    },
+
+    components: {
+      sidebar: {
+        background: new Color('hsl(243,23%,15%)', 'dark'),
+      },
+      responsePane: {
+        background: new Color('hsl(243,23%,15%)', 'dark'),
+      },
     },
   },
-};
-
-const lightTheme: AppTheme = {
-  name: 'Default Light',
-  appearance: 'light',
-  layers: {
-    root: {
-      colors: {
-        gray: '#7f8fb0',
-        red: '#ec3f87',
-        orange: '#ff8000',
-        yellow: '#e7cf24',
-        green: '#00d365',
-        blue: '#0090ff',
-        pink: '#ea6cea',
-        violet: '#ac6cff',
+  catppuccin: {
+    name: 'Catppuccin',
+    background: new Color('#181825', 'dark'),
+    foreground: new Color('#cdd6f4', 'dark'),
+    foregroundSubtle: new Color('#cdd6f4', 'dark').lower(0.1).translucify(0.3),
+    foregroundSubtler: new Color('#cdd6f4', 'dark').lower(0.1).translucify(0.55),
+    colors: {
+      primary: new Color('#cba6f7', 'dark'),
+      secondary: new Color('#bac2de', 'dark'),
+      info: new Color('#89b4fa', 'dark'),
+      success: new Color('#a6e3a1', 'dark'),
+      notice: new Color('#f9e2af', 'dark'),
+      warning: new Color('#fab387', 'dark'),
+      danger: new Color('#f38ba8', 'dark'),
+    },
+    components: {
+      dialog: {
+        background: new Color('#181825', 'dark'),
+      },
+      sidebar: {
+        background: new Color('#1e1e2e', 'dark'),
+      },
+      appHeader: {
+        background: new Color('#11111b', 'dark'),
+      },
+      responsePane: {
+        background: new Color('#1e1e2e', 'dark'),
+      },
+      button: {
+        colors: {
+          primary: new Color('#cba6f7', 'dark').lower(0.2),
+          secondary: new Color('#bac2de', 'dark').lower(0.2),
+          info: new Color('#89b4fa', 'dark').lower(0.2),
+          success: new Color('#a6e3a1', 'dark').lower(0.2),
+          notice: new Color('#f9e2af', 'dark').lower(0.2),
+          warning: new Color('#fab387', 'dark').lower(0.2),
+          danger: new Color('#f38ba8', 'dark').lower(0.2),
+        },
       },
     },
   },
 };
 
+type CSSVariables = Record<string, string | undefined>;
+
+function themeVariables(theme?: ThemeComponent, base?: CSSVariables): CSSVariables | null {
+  const vars: CSSVariables = {
+    '--background': theme?.background?.css(),
+    '--background-highlight':
+      theme?.backgroundHighlight?.css() ?? theme?.background?.lift(0.11).css(),
+    '--background-highlight-secondary':
+      theme?.backgroundHighlightSecondary?.css() ?? theme?.background?.lift(0.06).css(),
+    '--background-active':
+      theme?.backgroundActive?.css() ?? theme?.colors?.primary?.lower(0.2).translucify(0.8).css(),
+    '--background-backdrop': theme?.background?.lower(0.2).translucify(0.2).css(),
+    '--background-selection': theme?.colors?.primary?.lower(0.1).translucify(0.7).css(),
+    '--fg': theme?.foreground?.css(),
+    '--fg-subtle': theme?.foregroundSubtle?.css() ?? theme?.foreground?.lower(0.2).css(),
+    '--fg-subtler': theme?.foregroundSubtler?.css() ?? theme?.foreground?.lower(0.3).css(),
+    '--border-focus': theme?.colors?.info?.css(),
+  };
+
+  for (const [color, value] of Object.entries(theme?.colors ?? {})) {
+    vars[`--fg-${color}`] = (value as Color).css();
+  }
+
+  // Extend with base
+  for (const [k, v] of Object.entries(vars)) {
+    if (!v && base?.[k]) {
+      vars[k] = base[k];
+    }
+  }
+
+  return vars;
+}
+
+function placeholderColorVariables(color: Color): CSSVariables {
+  return {
+    '--fg': color.lift(0.6).css(),
+    '--fg-subtle': color.lift(0.4).css(),
+    '--fg-subtler': color.css(),
+    '--background': color.lower(0.2).translucify(0.8).css(),
+    '--background-highlight': color.lower(0.2).translucify(0.2).css(),
+    '--background-highlight-secondary': color.lower(0.1).translucify(0.7).css(),
+  };
+}
+
+function bannerColorVariables(color: Color): CSSVariables {
+  return {
+    '--fg': color.lift(0.8).css(),
+    '--fg-subtle': color.translucify(0.3).css(),
+    '--fg-subtler': color.css(),
+    '--background': color.css(),
+    '--background-highlight': color.lift(0.3).translucify(0.4).css(),
+    '--background-highlight-secondary': color.translucify(0.9).css(),
+  };
+}
+
+function buttonSolidColorVariables(color: Color): CSSVariables {
+  return {
+    '--fg': new Color('white', 'dark').css(),
+    '--background': color.lower(0.15).css(),
+    '--background-highlight': color.css(),
+    '--background-highlight-secondary': color.lower(0.3).css(),
+  };
+}
+
+function buttonBorderColorVariables(color: Color): CSSVariables {
+  return {
+    '--fg': color.lift(0.6).css(),
+    '--fg-subtle': color.lift(0.4).css(),
+    '--fg-subtler': color.lift(0.4).translucify(0.6).css(),
+    '--background': Color.transparent().css(),
+    '--background-highlight': color.translucify(0.8).css(),
+  };
+}
+
+function variablesToCSS(selector: string | null, vars: CSSVariables | null): string | null {
+  if (vars == null) {
+    return null;
+  }
+
+  const css = Object.entries(vars ?? {})
+    .filter(([, value]) => value)
+    .map(([name, value]) => `${name}: ${value};`)
+    .join('\n');
+
+  return selector == null ? css : `${selector} {\n${indent(css)}\n}`;
+}
+
+function componentCSS(
+  component: ComponentName,
+  components?: YaakTheme['components'],
+): string | null {
+  if (components == null) {
+    return null;
+  }
+
+  const themeVars = themeVariables(components[component]);
+  return variablesToCSS(`.x-theme-${component}`, themeVars);
+}
+
+function buttonCSS(color: ColorName, colors?: Partial<RootColors>): string | null {
+  const cssColor = colors?.[color];
+  if (cssColor == null) {
+    return null;
+  }
+
+  return [
+    variablesToCSS(`.x-theme-button--solid--${color}`, buttonSolidColorVariables(cssColor)),
+    variablesToCSS(`.x-theme-button--border--${color}`, buttonBorderColorVariables(cssColor)),
+  ].join('\n\n');
+}
+
+function bannerCSS(color: ColorName, colors?: Partial<RootColors>): string | null {
+  const cssColor = colors?.[color];
+  if (cssColor == null) {
+    return null;
+  }
+
+  return [variablesToCSS(`.x-theme-banner--${color}`, bannerColorVariables(cssColor))].join('\n\n');
+}
+
+function placeholderCSS(color: ColorName, colors?: Partial<RootColors>): string | null {
+  const cssColor = colors?.[color];
+  if (cssColor == null) {
+    return null;
+  }
+
+  return [
+    variablesToCSS(`.x-theme-placeholder-widget--${color}`, placeholderColorVariables(cssColor)),
+  ].join('\n\n');
+}
+
+function isThemeDark(theme: YaakTheme): boolean {
+  if (theme.background && theme.foreground) {
+    return theme.foreground.lighterThan(theme.background);
+  }
+
+  return false;
+}
+
+setThemeOnDocument(yaakThemes.yaakLight!);
+setThemeOnDocument(yaakThemes.yaakDark!);
+
+export function getThemeCSS(theme: YaakTheme): string {
+  let themeCSS = '';
+  try {
+    const baseCss = variablesToCSS(null, themeVariables(theme));
+    const { components, colors } = theme;
+    themeCSS = [
+      baseCss,
+      ...Object.keys(components ?? {}).map((key) =>
+        componentCSS(key as ComponentName, theme.components),
+      ),
+      ...Object.keys(colors ?? {}).map((key) =>
+        buttonCSS(key as ColorName, theme.components?.button?.colors ?? colors),
+      ),
+      ...Object.keys(colors ?? {}).map((key) =>
+        bannerCSS(key as ColorName, theme.components?.banner?.colors ?? colors),
+      ),
+      ...Object.keys(colors ?? {}).map((key) =>
+        placeholderCSS(key as ColorName, theme.components?.placeholder?.colors ?? colors),
+      ),
+    ].join('\n\n');
+  } catch (err) {
+    console.error(err);
+  }
+  return themeCSS;
+}
+
 export function setAppearanceOnDocument(appearance: Appearance = DEFAULT_APPEARANCE) {
   const resolvedAppearance = appearance === 'system' ? getPreferredAppearance() : appearance;
-  const theme = resolvedAppearance === 'dark' ? darkTheme : lightTheme;
-
   document.documentElement.setAttribute('data-resolved-appearance', resolvedAppearance);
+}
+
+export function setThemeOnDocument(theme: YaakTheme) {
   document.documentElement.setAttribute('data-theme', theme.name);
 
-  let existingStyleEl = document.head.querySelector(`style[data-theme-definition]`);
+  const darkOrLight = isThemeDark(theme) ? 'dark' : 'light';
+  let existingStyleEl = document.head.querySelector(`style[data-theme-definition=${darkOrLight}]`);
   if (!existingStyleEl) {
     const styleEl = document.createElement('style');
     document.head.appendChild(styleEl);
@@ -78,16 +315,12 @@ export function setAppearanceOnDocument(appearance: Appearance = DEFAULT_APPEARA
   }
 
   existingStyleEl.textContent = [
-    `/* ${darkTheme.name} */`,
-    `[data-resolved-appearance="dark"] {`,
-    ...generateCSS(darkTheme).map(toTailwindVariable),
-    '}',
-    `/* ${lightTheme.name} */`,
-    `[data-resolved-appearance="light"] {`,
-    ...generateCSS(lightTheme).map(toTailwindVariable),
+    `/* ${theme.name} */`,
+    `[data-resolved-appearance="${isThemeDark(theme) ? 'dark' : 'light'}"] {`,
+    getThemeCSS(theme),
     '}',
   ].join('\n');
-  existingStyleEl.setAttribute('data-theme-definition', '');
+  existingStyleEl.setAttribute('data-theme-definition', darkOrLight);
 }
 
 export function getPreferredAppearance(): Appearance {
diff --git a/src-web/main.css b/src-web/main.css
index 8014a0c8..832acee7 100644
--- a/src-web/main.css
+++ b/src-web/main.css
@@ -6,7 +6,7 @@
   html,
   body,
   #root {
-    @apply w-full h-full overflow-hidden text-gray-900 bg-gray-50;
+    @apply w-full h-full overflow-hidden text-fg bg-background;
   }
 
   * {
@@ -58,7 +58,7 @@
     &:hover {
       &.scrollbar-thumb,
       &::-webkit-scrollbar-thumb {
-        @apply bg-gray-500/30 hover:bg-gray-500/50 rounded-full;
+        @apply bg-background-highlight-secondary hover:bg-fg-subtler rounded-full;
       }
     }
   }
@@ -70,7 +70,7 @@
   iframe {
     &::-webkit-scrollbar-corner,
     &::-webkit-scrollbar {
-      @apply bg-gray-100;
+      @apply bg-background-highlight-secondary !important;
     }
   }
 
diff --git a/tailwind.config.cjs b/tailwind.config.cjs
index 0a35369e..f2e05f32 100644
--- a/tailwind.config.cjs
+++ b/tailwind.config.cjs
@@ -50,58 +50,45 @@ module.exports = {
       '4xs': '0.6rem',
       '3xs': '0.675rem',
       '2xs': '0.75rem',
-      xs: '0.8rem',
-      sm: '0.9rem',
-      base: '1rem',
-      xl: '1.25rem',
+      'xs': '0.8rem',
+      'sm': '0.9rem',
+      'base': '1rem',
+      'xl': '1.25rem',
       '2xl': '1.5rem',
       '3xl': '2rem',
       '4xl': '2.5rem',
       '5xl': '3rem',
     },
     colors: {
-      selection: 'hsl(var(--color-violet-500) / 0.3)',
-      focus: 'hsl(var(--color-blue-500) / 0.7)',
-      invalid: 'hsl(var(--color-red-500))',
-      highlight: 'hsl(var(--color-gray-500) / 0.3)',
-      highlightSecondary: 'hsl(var(--color-gray-500) / 0.15)',
-      transparent: 'transparent',
-      white: 'hsl(0 100% 100% / <alpha-value>)',
-      black: 'hsl(0 100% 0% / <alpha-value>)',
-      placeholder: 'hsl(var(--color-gray-400) / <alpha-value>)',
-      red: color('red'),
-      orange: color('orange'),
-      yellow: color('yellow'),
-      blue: color('blue'),
-      green: color('green'),
-      pink: color('pink'),
-      violet: color('violet'),
-      gray: color('gray'),
+      'transparent': 'transparent',
+      'placeholder': 'var(--fg-subtler)',
+      'selection': 'var(--background-selection)',
+
+      // New theme values
+
+      'border-focus': 'var(--border-focus)',
+      'fg': 'var(--fg)',
+      'fg-danger': 'var(--fg-danger)',
+      'fg-subtle': 'var(--fg-subtle)',
+      'fg-subtler': 'var(--fg-subtler)',
+      'fg-primary': 'var(--fg-primary)',
+      'fg-secondary': 'var(--fg-secondary)',
+      'fg-success': 'var(--fg-success)',
+      'fg-info': 'var(--fg-info)',
+      'fg-notice': 'var(--fg-notice)',
+      'fg-warning': 'var(--fg-warning)',
+      'background': 'var(--background)',
+      'background-active': 'var(--background-active)',
+      'background-highlight': 'var(--background-highlight)',
+      'background-highlight-secondary': 'var(--background-highlight-secondary)',
+      'background-backdrop': 'var(--background-backdrop)',
     },
   },
   plugins: [
     require('@tailwindcss/container-queries'),
-    plugin(function ({ addVariant }) {
+    plugin(function ({addVariant}) {
       addVariant('hocus', ['&:hover', '&:focus-visible', '&.focus:focus']);
-      addVariant('focus-visible-or-class', ['&:focus-visible', '&.focus:focus']);
+      addVariant('focus-visible-or-class', ['&:focus-visible']);
     }),
   ],
 };
-
-function color(name) {
-  return {
-    0: `hsl(var(--color-${name}-0) / <alpha-value>)`,
-    50: `hsl(var(--color-${name}-50) / <alpha-value>)`,
-    100: `hsl(var(--color-${name}-100) / <alpha-value>)`,
-    200: `hsl(var(--color-${name}-200) / <alpha-value>)`,
-    300: `hsl(var(--color-${name}-300) / <alpha-value>)`,
-    400: `hsl(var(--color-${name}-400) / <alpha-value>)`,
-    500: `hsl(var(--color-${name}-500) / <alpha-value>)`,
-    600: `hsl(var(--color-${name}-600) / <alpha-value>)`,
-    700: `hsl(var(--color-${name}-700) / <alpha-value>)`,
-    800: `hsl(var(--color-${name}-800) / <alpha-value>)`,
-    900: `hsl(var(--color-${name}-900) / <alpha-value>)`,
-    950: `hsl(var(--color-${name}-950) / <alpha-value>)`,
-    1000: `hsl(var(--color-${name}-1000) / <alpha-value>)`,
-  };
-}