diff --git a/.changeset/fuzzy-mice-hunt.md b/.changeset/fuzzy-mice-hunt.md
new file mode 100644
index 00000000..32cd1152
--- /dev/null
+++ b/.changeset/fuzzy-mice-hunt.md
@@ -0,0 +1,5 @@
+---
+'@tanstack/devtools-a11y': patch
+---
+
+Extract theme provider and fix pnpm overrides
diff --git a/examples/react/a11y-devtools/package.json b/examples/react/a11y-devtools/package.json
index 61cb871f..00f32812 100644
--- a/examples/react/a11y-devtools/package.json
+++ b/examples/react/a11y-devtools/package.json
@@ -9,7 +9,7 @@
     "test:types": "tsc"
   },
   "dependencies": {
-    "@tanstack/devtools-a11y": "workspace:*",
+    "@tanstack/devtools-a11y": "^0.1.1",
     "@tanstack/react-devtools": "^0.10.0",
     "react": "^19.2.0",
     "react-dom": "^19.2.0"
diff --git a/package.json b/package.json
index 12c73e9d..1c064e45 100644
--- a/package.json
+++ b/package.json
@@ -84,6 +84,7 @@
   },
   "overrides": {
     "@tanstack/devtools": "workspace:*",
+    "@tanstack/devtools-a11y": "workspace:*",
     "@tanstack/react-devtools": "workspace:*",
     "@tanstack/preact-devtools": "workspace:*",
     "@tanstack/solid-devtools": "workspace:*",
diff --git a/packages/devtools-a11y/src/core/components/index.tsx b/packages/devtools-a11y/src/core/components/index.tsx
index 715f0dc7..f3fda357 100644
--- a/packages/devtools-a11y/src/core/components/index.tsx
+++ b/packages/devtools-a11y/src/core/components/index.tsx
@@ -1,12 +1,20 @@
 /** @jsxImportSource solid-js */
-
+import { ThemeContextProvider } from '@tanstack/devtools-ui'
 import { AllyProvider } from '../contexts/allyContext'
 import { Shell } from './Shell'
 
-export default function Devtools() {
+import type { TanStackDevtoolsTheme } from '@tanstack/devtools-ui'
+
+interface DevtoolsProps {
+  theme: TanStackDevtoolsTheme
+}
+
+export default function Devtools(props: DevtoolsProps) {
   return (
-    <AllyProvider>
-      <Shell />
-    </AllyProvider>
+    <ThemeContextProvider theme={props.theme}>
+      <AllyProvider>
+        <Shell />
+      </AllyProvider>
+    </ThemeContextProvider>
   )
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c071a589..10010ae7 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -148,7 +148,7 @@ importers:
   examples/react/a11y-devtools:
     dependencies:
       '@tanstack/devtools-a11y':
-        specifier: workspace:*
+        specifier: ^0.1.1
         version: link:../../../packages/devtools-a11y
       '@tanstack/react-devtools':
         specifier: ^0.10.0