diff --git a/package-lock.json b/package-lock.json
index 09b8a94..db6513d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,13 +9,13 @@
       "version": "2.0.5",
       "license": "ISC",
       "dependencies": {
-        "@diplodoc/components": "^3.6.0",
+        "@diplodoc/components": "^3.10.0-beta.1",
         "@diplodoc/latex-extension": "^1.0.2",
         "@diplodoc/mermaid-extension": "^1.2.1",
         "@diplodoc/openapi-extension": "^2.0.0",
         "@diplodoc/transform": "^4.10.3",
         "@gravity-ui/page-constructor": "^4.24.0",
-        "@gravity-ui/uikit": "6.0.0",
+        "@gravity-ui/uikit": "^6.0.0",
         "bem-cn-lite": "^4.1.0",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
@@ -1999,11 +1999,12 @@
       }
     },
     "node_modules/@diplodoc/components": {
-      "version": "3.9.1",
-      "license": "MIT",
+      "version": "3.10.0-beta.1",
+      "resolved": "https://registry.npmjs.org/@diplodoc/components/-/components-3.10.0-beta.1.tgz",
+      "integrity": "sha512-if2fanFnLChddcO4oUzn8xzrTC0P964oUSLxmtkN5OUMrzQIPQKILqKUQkj0VHPEyHy/UHaZuzHtOF7CIjw8/g==",
       "dependencies": {
         "@gravity-ui/icons": "^2.5.0",
-        "@gravity-ui/uikit": "^5.24.0",
+        "@gravity-ui/uikit": "6.0.0",
         "@popperjs/core": "^2.11.2",
         "bem-cn-lite": "4.1.0",
         "i18next": "^19.9.2",
@@ -2841,7 +2842,8 @@
     },
     "node_modules/@gravity-ui/uikit": {
       "version": "6.0.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@gravity-ui/uikit/-/uikit-6.0.0.tgz",
+      "integrity": "sha512-16xgkTI646tZoAT5pnw7Ge2Q4e9c8DWYZw0w11X8A9hyuYaNjd0isUxpD4Beywi4ELKeFv3t2IXCn/RTU7/qVw==",
       "dependencies": {
         "@bem-react/classname": "^1.6.0",
         "@gravity-ui/i18n": "^1.2.0",
diff --git a/package.json b/package.json
index 73e968c..235f78f 100644
--- a/package.json
+++ b/package.json
@@ -35,13 +35,13 @@
     "./styles": "./build/client/app.css"
   },
   "dependencies": {
-    "@diplodoc/components": "^3.6.0",
+    "@diplodoc/components": "^3.10.0-beta.1",
     "@diplodoc/latex-extension": "^1.0.2",
     "@diplodoc/mermaid-extension": "^1.2.1",
     "@diplodoc/openapi-extension": "^2.0.0",
     "@diplodoc/transform": "^4.10.3",
     "@gravity-ui/page-constructor": "^4.24.0",
-    "@gravity-ui/uikit": "6.0.0",
+    "@gravity-ui/uikit": "^6.0.0",
     "bem-cn-lite": "^4.1.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
diff --git a/src/components/App/App.tsx b/src/components/App/App.tsx
index 2af7018..0a4895a 100644
--- a/src/components/App/App.tsx
+++ b/src/components/App/App.tsx
@@ -7,6 +7,7 @@ import {
     PageConstructor,
     PageConstructorProvider,
 } from '@gravity-ui/page-constructor';
+import {ThemeProvider} from '@gravity-ui/uikit';
 import {
     DocLeadingPage,
     DocLeadingPageData,
@@ -70,12 +71,15 @@ function Page(props: DocInnerProps) {
     const Page = data.leading ? DocLeadingPage : DocPage;
 
     return (
-        <Layout>
-            <Layout.Content>
-                {/*@ts-ignore*/}
-                <Page {...data} {...pageProps} />
-            </Layout.Content>
-        </Layout>
+        <ThemeProvider theme={pageProps?.theme} direction={pageProps?.direction}>
+            <Layout>
+                <Layout.Content>
+                    {/*@ts-ignore*/}
+                    <Page {...data} {...pageProps} />
+                </Layout.Content>
+            </Layout>
+        </ThemeProvider>
+
     );
 }
 
diff --git a/webpack.config.js b/webpack.config.js
index af7d3b5..1ef5a15 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -36,6 +36,7 @@ function config({isServer, isDev, analyze = false}) {
             fallback: {
                 stream: false,
                 crypto: false,
+                url: require.resolve("url/"),
             },
             extensions: (isServer
                 ? ['.server.tsx', '.server.ts', '.server.js']