diff --git a/package-lock.json b/package-lock.json
index a37878f9..0714f905 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,7 +18,7 @@
         "@malloydata/db-trino": "0.0.203",
         "@malloydata/malloy": "0.0.203",
         "@malloydata/malloy-sql": "0.0.203",
-        "@malloydata/query-composer": "0.0.201-dev11",
+        "@malloydata/query-composer": "0.0.203-dev0",
         "@malloydata/render": "0.0.203",
         "@malloydata/syntax-highlight": "0.0.203",
         "@vscode/webview-ui-toolkit": "^1.2.1",
@@ -4280,17 +4280,17 @@
       }
     },
     "node_modules/@malloydata/query-composer": {
-      "version": "0.0.201-dev11",
-      "resolved": "https://registry.npmjs.org/@malloydata/query-composer/-/query-composer-0.0.201-dev11.tgz",
-      "integrity": "sha512-irhzeL6zaiuBVc5dGAeR02Pr3977Lx3U7ruvNQDyx8gm1MZATuq/Ncr/V2CGJ4pISYrT2mtg+ypVj18fL/zJzg==",
+      "version": "0.0.203-dev0",
+      "resolved": "https://registry.npmjs.org/@malloydata/query-composer/-/query-composer-0.0.203-dev0.tgz",
+      "integrity": "sha512-coUItXmwL3IV+zhwkT5j5/g6q4Qkku4M5832UUIP3Q9QXOyW3kvyzNqG89guHix8rH/avplAadr2xxDnAY2XcQ==",
       "dependencies": {
         "moment-js": "^1.1.15",
         "react-popper": "^2.2.5",
         "shiki": "^1.1.6"
       },
       "peerDependencies": {
-        "@malloydata/malloy": ">=0.0.201",
-        "@malloydata/render": ">=0.0.201",
+        "@malloydata/malloy": ">=0.0.203",
+        "@malloydata/render": ">=0.0.203",
         "react": "^17.0.2",
         "react-dom": "^17.0.2",
         "styled-components": "^5.3.3"
diff --git a/package.json b/package.json
index b8d99dfc..03172967 100644
--- a/package.json
+++ b/package.json
@@ -593,7 +593,7 @@
     "@malloydata/db-trino": "0.0.203",
     "@malloydata/malloy": "0.0.203",
     "@malloydata/malloy-sql": "0.0.203",
-    "@malloydata/query-composer": "0.0.201-dev11",
+    "@malloydata/query-composer": "0.0.203-dev0",
     "@malloydata/render": "0.0.203",
     "@malloydata/syntax-highlight": "0.0.203",
     "@vscode/webview-ui-toolkit": "^1.2.1",
diff --git a/src/extension/webviews/webview_html.ts b/src/extension/webviews/webview_html.ts
index d7613917..3d94aef0 100644
--- a/src/extension/webviews/webview_html.ts
+++ b/src/extension/webviews/webview_html.ts
@@ -69,14 +69,18 @@ export function getWebviewHtml(
       --malloy-composer-code-fontSize: var(--vscode-editor-font-size);
       --malloy-composer-code-fontFamily: var(--vscode-editor-font-family, monospace);
 
-      --malloy-composer-form-background: var(--vscode-editor-background);
-      --malloy-composer-form-foreground:  var(--vscode-editor-foreground);
+      --malloy-composer-form-background: var(--vscode-editorWidget-background);
+      --malloy-composer-form-foreground:  var(--vscode-editorWidget-foreground);
+      --malloy-composer-form-border: var(--vscode-editorWidget-border)
       --malloy-composer-form-fontFamily: var(--vscode-font-family, Arial);
       --malloy-composer-form-fontSize: var(--vscode-font-size);
+      --malloy-composer-form-focus: var(--vscode-focusBorder);
+      --malloy-composer-form-focusBackground: var(--vscode-list-hoverBackground);
 
       --malloy-composer-menu-background: var(--vscode-menu-background);
       --malloy-composer-menu-foreground: var(--vscode-menu-foreground);
       --malloy-composer-menu-border: var(--vscode-menu-border);
+      --malloy-composer-menu-title: var(--vscode-menu-foreground);
       --malloy-composer-menu-fontFamily: var(--vscode-menu-font);
       --malloy-composer-menu-fontSize: var(--vscode-font-size);
     }