diff --git a/src/AdminGuesser.tsx b/src/AdminGuesser.tsx
index c92ca6c0..5c335fc9 100644
--- a/src/AdminGuesser.tsx
+++ b/src/AdminGuesser.tsx
@@ -1,15 +1,12 @@
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import PropTypes from 'prop-types';
 import {
-  Admin,
+  AdminContext,
+  AdminUI,
   ComponentPropType,
-  I18nContextProvider,
   Loading,
-  ThemeProvider,
-  ThemesContext,
   defaultI18nProvider,
 } from 'react-admin';
-import { createHashHistory, createMemoryHistory } from 'history';
 import { ErrorBoundary } from 'react-error-boundary';
 import type { FallbackProps } from 'react-error-boundary';
 import type { ComponentType, ErrorInfo } from 'react';
@@ -23,6 +20,7 @@ import {
   Error as DefaultError,
   Layout,
   LoginPage,
+  darkTheme,
   lightTheme,
 } from './layout/index.js';
 import getRoutesAndResourcesFromNodes, {
@@ -68,7 +66,7 @@ const getOverrideCode = (resources: Resource[]) => {
 export const AdminResourcesGuesser = ({
   // Admin props
   loadingPage: LoadingPage = Loading,
-  admin: AdminEl = Admin,
+  admin: AdminEl = AdminUI,
   // Props
   children,
   includeDeprecated,
@@ -116,7 +114,7 @@ const AdminGuesser = ({
   includeDeprecated = false,
   // Admin props
   dataProvider,
-  history,
+  i18nProvider,
   layout = Layout,
   loginPage = LoginPage,
   loading: loadingPage,
@@ -129,14 +127,6 @@ const AdminGuesser = ({
   const [loading, setLoading] = useState(true);
   const [, setError] = useState();
   const [introspect, setIntrospect] = useState(true);
-  let adminHistory = history;
-
-  if (!adminHistory) {
-    adminHistory =
-      typeof window === 'undefined'
-        ? createMemoryHistory()
-        : createHashHistory();
-  }
 
   useEffect(() => {
     if (typeof dataProvider.introspect !== 'function') {
@@ -175,23 +165,29 @@ const AdminGuesser = ({
   );
 
   return (
-    <IntrospectionContext.Provider value={introspectionContext}>
-      <SchemaAnalyzerContext.Provider value={schemaAnalyzer}>
-        <AdminResourcesGuesser
-          includeDeprecated={includeDeprecated}
-          resources={resources}
-          loading={loading}
-          dataProvider={dataProvider}
-          history={adminHistory}
-          layout={layout}
-          loginPage={loginPage}
-          loadingPage={loadingPage}
-          theme={theme}
-          {...rest}>
-          {children}
-        </AdminResourcesGuesser>
-      </SchemaAnalyzerContext.Provider>
-    </IntrospectionContext.Provider>
+    <AdminContext
+      i18nProvider={i18nProvider}
+      dataProvider={dataProvider}
+      theme={theme}
+      darkTheme={darkTheme}
+      lightTheme={lightTheme}>
+      <IntrospectionContext.Provider value={introspectionContext}>
+        <SchemaAnalyzerContext.Provider value={schemaAnalyzer}>
+          <AdminResourcesGuesser
+            includeDeprecated={includeDeprecated}
+            resources={resources}
+            loading={loading}
+            dataProvider={dataProvider}
+            layout={layout}
+            loginPage={loginPage}
+            loadingPage={loadingPage}
+            theme={theme}
+            {...rest}>
+            {children}
+          </AdminResourcesGuesser>
+        </SchemaAnalyzerContext.Provider>
+      </IntrospectionContext.Provider>
+    </AdminContext>
   );
 };
 
@@ -231,19 +227,9 @@ const AdminGuesserWithError = ({
   );
 
   return (
-    <I18nContextProvider value={i18nProvider}>
-      <ThemesContext.Provider value={theme}>
-        <ThemeProvider>
-          <ErrorBoundary onError={handleError} fallbackRender={renderError}>
-            <AdminGuesser
-              {...props}
-              i18nProvider={i18nProvider}
-              theme={theme}
-            />
-          </ErrorBoundary>
-        </ThemeProvider>
-      </ThemesContext.Provider>
-    </I18nContextProvider>
+    <ErrorBoundary onError={handleError} fallbackRender={renderError}>
+      <AdminGuesser {...props} i18nProvider={i18nProvider} theme={theme} />
+    </ErrorBoundary>
   );
 };
 
diff --git a/src/__snapshots__/AdminGuesser.test.tsx.snap b/src/__snapshots__/AdminGuesser.test.tsx.snap
index 073fa111..85acc1f7 100644
--- a/src/__snapshots__/AdminGuesser.test.tsx.snap
+++ b/src/__snapshots__/AdminGuesser.test.tsx.snap
@@ -3,7 +3,7 @@
 exports[`<AdminGuesser /> renders loading 1`] = `<Loading />`;
 
 exports[`<AdminGuesser /> renders with custom resources 1`] = `
-<Admin
+<AdminUI
   dataProvider={
     {
       "create": [Function],
@@ -25,11 +25,11 @@ exports[`<AdminGuesser /> renders with custom resources 1`] = `
   <ResourceGuesser
     name="custom"
   />
-</Admin>
+</AdminUI>
 `;
 
 exports[`<AdminGuesser /> renders without custom resources 1`] = `
-<Admin
+<AdminUI
   dataProvider={
     {
       "create": [Function],
@@ -51,11 +51,11 @@ exports[`<AdminGuesser /> renders without custom resources 1`] = `
   <ResourceGuesser
     name="books"
   />
-</Admin>
+</AdminUI>
 `;
 
 exports[`<AdminGuesser /> renders without data 1`] = `
-<Admin
+<AdminUI
   dataProvider={
     {
       "create": [Function],
diff --git a/src/layout/AppBar.tsx b/src/layout/AppBar.tsx
index 3dc83d50..429b6f9d 100644
--- a/src/layout/AppBar.tsx
+++ b/src/layout/AppBar.tsx
@@ -1,10 +1,5 @@
 import React from 'react';
-import {
-  AppBar,
-  AppBarClasses,
-  ToggleThemeButton,
-  useAuthProvider,
-} from 'react-admin';
+import { AppBar, AppBarClasses, useAuthProvider } from 'react-admin';
 import type { AppBarProps } from 'react-admin';
 import { Box, Typography } from '@mui/material';
 
@@ -23,7 +18,6 @@ const CustomAppBar = ({ classes, userMenu, ...props }: AppBarProps) => {
       />
       <Logo />
       <Box component="span" sx={{ flex: 1 }} />
-      <ToggleThemeButton />
     </AppBar>
   );
 };