diff --git a/.storybook/decorators/withTheme.tsx b/.storybook/decorators/withTheme.tsx
index 69eebfb0..587c6478 100644
--- a/.storybook/decorators/withTheme.tsx
+++ b/.storybook/decorators/withTheme.tsx
@@ -2,13 +2,13 @@ import React from 'react';
 
 import type {DecoratorFn} from '@storybook/react';
 
-import {ThemeProvider} from '@gravity-ui/uikit';
+import {Provider} from '@gravity-ui/uikit';
 
 import '@gravity-ui/uikit/styles/styles.scss';
 import './styles.scss';
 
 export const withTheme: DecoratorFn = (Story, context) => (
-    <ThemeProvider theme={context.globals.theme}>
+    <Provider theme={context.globals.theme} lang={context.globals.lang}>
         <Story {...context} />
-    </ThemeProvider>
+    </Provider>
 );
diff --git a/package-lock.json b/package-lock.json
index ad564eab..efee0bee 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,9 +14,12 @@
         "@gravity-ui/date-utils": "^2.7.1",
         "@gravity-ui/i18n": "^1.8.0",
         "@gravity-ui/icons": "^2.22.0",
+        "@hello-pangea/dnd": "^18.0.1",
         "decimal.js": "^10.6.0",
         "json-schema-library": "^11.6.2",
         "lodash": "^4.18.1",
+        "react-virtualized-auto-sizer": "^1.0.26",
+        "react-window": "^1.8.11",
         "uuid": "^14.0.1"
       },
       "devDependencies": {
@@ -28,7 +31,7 @@
         "@gravity-ui/prettier-config": "^1.1.0",
         "@gravity-ui/stylelint-config": "^4.0.1",
         "@gravity-ui/tsconfig": "^1.0.0",
-        "@gravity-ui/uikit": "^7.41.0",
+        "@gravity-ui/uikit": "8.0.0-beta.1",
         "@playwright/experimental-ct-react": "^1.40.0",
         "@playwright/test": "^1.40.0",
         "@storybook/addon-essentials": "^8.6.4",
@@ -81,12 +84,12 @@
         "typescript": "^5.8.4"
       },
       "peerDependencies": {
-        "@gravity-ui/uikit": "^7.0.0",
+        "@gravity-ui/uikit": "^8.0.0-beta.1",
         "final-form": "^4.20.2",
-        "react": "^17.0.0 || ^18.0.0 || ^19.0.0",
-        "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0",
+        "react": "^18.0.0 || ^19.0.0",
+        "react-dom": "^18.0.0 || ^19.0.0",
         "react-final-form": "^6.5.3",
-        "react-is": "^17.0.0 || ^18.0.0 || ^19.0.0"
+        "react-is": "^18.0.0 || ^19.0.0"
       }
     },
     "node_modules/@aashutoshrathi/word-wrap": {
@@ -2197,7 +2200,6 @@
       "version": "7.28.4",
       "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.4.tgz",
       "integrity": "sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
@@ -3595,9 +3597,9 @@
       "dev": true
     },
     "node_modules/@gravity-ui/uikit": {
-      "version": "7.41.0",
-      "resolved": "https://registry.npmjs.org/@gravity-ui/uikit/-/uikit-7.41.0.tgz",
-      "integrity": "sha512-nJbeAzOVrEiqMzFAo/hN3oa4YCO+8jIrT6z1q2rdl/MJDGXNHkkEveQYWGNUqz6x8mUatnpjfGPBTdhm0NN1UQ==",
+      "version": "8.0.0-beta.1",
+      "resolved": "https://registry.npmjs.org/@gravity-ui/uikit/-/uikit-8.0.0-beta.1.tgz",
+      "integrity": "sha512-8cQzm90ais35cP5jRNdcZlzIE0kK4UT/Klzvv5VLspz+TgRBrNoKx3wMOPdmLbfM1QstJPSFe93fz4LrCXvl7g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3605,29 +3607,45 @@
         "@floating-ui/react": "^0.27.16",
         "@gravity-ui/i18n": "^1.8.0",
         "@gravity-ui/icons": "^2.16.0",
-        "@hello-pangea/dnd": "^18.0.1",
-        "@tanstack/react-virtual": "^3.13.12",
         "@uiw/react-color": "^2.9.2",
         "blueimp-md5": "^2.19.0",
-        "lodash": "^4.17.21",
+        "es-toolkit": "^1.47.1",
         "rc-slider": "^11.1.9",
         "react-transition-group": "^4.4.5",
-        "react-virtualized-auto-sizer": "^1.0.26",
-        "react-window": "^1.8.11",
         "tabbable": "^6.2.0",
-        "tslib": "^2.8.1",
-        "use-sync-external-store": "^1.6.0"
+        "tslib": "^2.8.1"
       },
       "peerDependencies": {
-        "react": "^16.14.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
-        "react-dom": "^16.14.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+        "@hello-pangea/dnd": "^18",
+        "@tanstack/react-virtual": "^3",
+        "@types/react": "^18.0.0 || ^19.0.0",
+        "react": "^18.0.0 || ^19.0.0",
+        "react-dom": "^18.0.0 || ^19.0.0",
+        "react-virtualized-auto-sizer": "^1",
+        "react-window": "^1"
+      },
+      "peerDependenciesMeta": {
+        "@hello-pangea/dnd": {
+          "optional": true
+        },
+        "@tanstack/react-virtual": {
+          "optional": true
+        },
+        "@types/react": {
+          "optional": true
+        },
+        "react-virtualized-auto-sizer": {
+          "optional": true
+        },
+        "react-window": {
+          "optional": true
+        }
       }
     },
     "node_modules/@hello-pangea/dnd": {
       "version": "18.0.1",
       "resolved": "https://registry.npmjs.org/@hello-pangea/dnd/-/dnd-18.0.1.tgz",
       "integrity": "sha512-xojVWG8s/TGrKT1fC8K2tIWeejJYTAeJuj36zM//yEm/ZrnZUSFGS15BpO+jGZT1ybWvyXmeDJwPYb4dhWlbZQ==",
-      "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
         "@babel/runtime": "^7.26.7",
@@ -5765,35 +5783,6 @@
         "@swc/counter": "^0.1.3"
       }
     },
-    "node_modules/@tanstack/react-virtual": {
-      "version": "3.13.12",
-      "resolved": "https://registry.npmjs.org/@tanstack/react-virtual/-/react-virtual-3.13.12.tgz",
-      "integrity": "sha512-Gd13QdxPSukP8ZrkbgS2RwoZseTTbQPLnQEn7HY/rqtM+8Zt95f7xKC7N0EsKs7aoz0WzZ+fditZux+F8EzYxA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@tanstack/virtual-core": "3.13.12"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/tannerlinsley"
-      },
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
-        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
-      }
-    },
-    "node_modules/@tanstack/virtual-core": {
-      "version": "3.13.12",
-      "resolved": "https://registry.npmjs.org/@tanstack/virtual-core/-/virtual-core-3.13.12.tgz",
-      "integrity": "sha512-1YBOJfRHV4sXUmWsFSf5rQor4Ss82G8dQWLRbnk3GA4jeP8hQt1hxXh0tmflpC0dz3VgEv/1+qwPyLeWkQuPFA==",
-      "dev": true,
-      "license": "MIT",
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/tannerlinsley"
-      }
-    },
     "node_modules/@testing-library/dom": {
       "version": "9.0.1",
       "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-9.0.1.tgz",
@@ -6366,7 +6355,6 @@
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/@types/use-sync-external-store/-/use-sync-external-store-0.0.6.tgz",
       "integrity": "sha512-zFDAD+tlpf2r4asuHEj0XH6pY6i0g5NeAHPn+15wk3BV6JA69eERFXC1gyGThDkVa1zCyKr5jox1+2LbV/AMLg==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/uuid": {
@@ -9307,7 +9295,6 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/css-box-model/-/css-box-model-1.2.1.tgz",
       "integrity": "sha512-a7Vr4Q/kd/aw96bnJG332W9V9LkJO69JRcaCYDUqjp6/z0w6VcZjgAcTbgFxEPfBgdnAwlh3iwu+hLopa+flJw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "tiny-invariant": "^1.0.6"
@@ -10368,6 +10355,19 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/es-toolkit": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/es-toolkit/-/es-toolkit-1.52.0.tgz",
+      "integrity": "sha512-XTNEJQh1tY1ZJVcf6ayP/2n4ZPyaHlW2FWs7xvw5ddPuhUVjLD3olQVQS7kf58JbAB48iL0uL/jerTrjtV3lDA==",
+      "dev": true,
+      "license": "MIT",
+      "workspaces": [
+        "docs",
+        "benchmarks",
+        "tests/types",
+        "tests/browser-compat"
+      ]
+    },
     "node_modules/es5-ext": {
       "version": "0.10.62",
       "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.62.tgz",
@@ -17685,8 +17685,7 @@
     "node_modules/memoize-one": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz",
-      "integrity": "sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==",
-      "dev": true
+      "integrity": "sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q=="
     },
     "node_modules/memoizerific": {
       "version": "1.11.3",
@@ -19639,7 +19638,6 @@
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/raf-schd/-/raf-schd-4.0.3.tgz",
       "integrity": "sha512-tQkJl2GRWh83ui2DiPTJz9wEiMN20syf+5oKfB03yYP7ioZcJwsIK8FjrtLwH1m7C7e+Tt2yYBlrOpdT+dyeIQ==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/randexp": {
@@ -19848,7 +19846,6 @@
       "version": "9.2.0",
       "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-9.2.0.tgz",
       "integrity": "sha512-ROY9fvHhwOD9ySfrF0wmvu//bKCQ6AeZZq1nJNtbDC+kk5DuSuNX/n6YWYF/SYy7bSba4D4FSz8DJeKY/S/r+g==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/use-sync-external-store": "^0.0.6",
@@ -19888,7 +19885,6 @@
       "version": "1.0.26",
       "resolved": "https://registry.npmjs.org/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.26.tgz",
       "integrity": "sha512-CblNyiNVw2o+hsa5/49NH2ogGxZ+t+3aweRvNSq7TVjDIlwk7ir4lencEg5HxHeSzwNarSkNkiu0qJSOXtxm5A==",
-      "dev": true,
       "license": "MIT",
       "peerDependencies": {
         "react": "^15.3.0 || ^16.0.0-alpha || ^17.0.0 || ^18.0.0 || ^19.0.0",
@@ -19899,7 +19895,7 @@
       "version": "1.8.11",
       "resolved": "https://registry.npmjs.org/react-window/-/react-window-1.8.11.tgz",
       "integrity": "sha512-+SRbUVT2scadgFSWx+R1P754xHPEqvcfSfVX10QYg6POOz+WNgkN48pS+BtZNIMGiL1HYrSEiCkwsMS15QogEQ==",
-      "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.0.0",
         "memoize-one": ">=3.1.1 <6"
@@ -20024,7 +20020,6 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/redux/-/redux-5.0.1.tgz",
       "integrity": "sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/reflect.getprototypeof": {
@@ -22418,7 +22413,6 @@
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.3.tgz",
       "integrity": "sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/tinyexec": {
@@ -23160,7 +23154,6 @@
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.6.0.tgz",
       "integrity": "sha512-Pp6GSwGP/NrPIrxVFAIkOQeyw8lFenOHijQWkUTrDvrF4ALqylP2C/KCkeS9dpUM3KvYRQhna5vt7IL95+ZQ9w==",
-      "dev": true,
       "license": "MIT",
       "peerDependencies": {
         "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
@@ -25857,8 +25850,7 @@
     "@babel/runtime": {
       "version": "7.28.4",
       "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.4.tgz",
-      "integrity": "sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==",
-      "dev": true
+      "integrity": "sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ=="
     },
     "@babel/template": {
       "version": "7.26.9",
@@ -26701,34 +26693,28 @@
       "dev": true
     },
     "@gravity-ui/uikit": {
-      "version": "7.41.0",
-      "resolved": "https://registry.npmjs.org/@gravity-ui/uikit/-/uikit-7.41.0.tgz",
-      "integrity": "sha512-nJbeAzOVrEiqMzFAo/hN3oa4YCO+8jIrT6z1q2rdl/MJDGXNHkkEveQYWGNUqz6x8mUatnpjfGPBTdhm0NN1UQ==",
+      "version": "8.0.0-beta.1",
+      "resolved": "https://registry.npmjs.org/@gravity-ui/uikit/-/uikit-8.0.0-beta.1.tgz",
+      "integrity": "sha512-8cQzm90ais35cP5jRNdcZlzIE0kK4UT/Klzvv5VLspz+TgRBrNoKx3wMOPdmLbfM1QstJPSFe93fz4LrCXvl7g==",
       "dev": true,
       "requires": {
         "@bem-react/classname": "^1.7.0",
         "@floating-ui/react": "^0.27.16",
         "@gravity-ui/i18n": "^1.8.0",
         "@gravity-ui/icons": "^2.16.0",
-        "@hello-pangea/dnd": "^18.0.1",
-        "@tanstack/react-virtual": "^3.13.12",
         "@uiw/react-color": "^2.9.2",
         "blueimp-md5": "^2.19.0",
-        "lodash": "^4.17.21",
+        "es-toolkit": "^1.47.1",
         "rc-slider": "^11.1.9",
         "react-transition-group": "^4.4.5",
-        "react-virtualized-auto-sizer": "^1.0.26",
-        "react-window": "^1.8.11",
         "tabbable": "^6.2.0",
-        "tslib": "^2.8.1",
-        "use-sync-external-store": "^1.6.0"
+        "tslib": "^2.8.1"
       }
     },
     "@hello-pangea/dnd": {
       "version": "18.0.1",
       "resolved": "https://registry.npmjs.org/@hello-pangea/dnd/-/dnd-18.0.1.tgz",
       "integrity": "sha512-xojVWG8s/TGrKT1fC8K2tIWeejJYTAeJuj36zM//yEm/ZrnZUSFGS15BpO+jGZT1ybWvyXmeDJwPYb4dhWlbZQ==",
-      "dev": true,
       "requires": {
         "@babel/runtime": "^7.26.7",
         "css-box-model": "^1.2.1",
@@ -28094,21 +28080,6 @@
         "@swc/counter": "^0.1.3"
       }
     },
-    "@tanstack/react-virtual": {
-      "version": "3.13.12",
-      "resolved": "https://registry.npmjs.org/@tanstack/react-virtual/-/react-virtual-3.13.12.tgz",
-      "integrity": "sha512-Gd13QdxPSukP8ZrkbgS2RwoZseTTbQPLnQEn7HY/rqtM+8Zt95f7xKC7N0EsKs7aoz0WzZ+fditZux+F8EzYxA==",
-      "dev": true,
-      "requires": {
-        "@tanstack/virtual-core": "3.13.12"
-      }
-    },
-    "@tanstack/virtual-core": {
-      "version": "3.13.12",
-      "resolved": "https://registry.npmjs.org/@tanstack/virtual-core/-/virtual-core-3.13.12.tgz",
-      "integrity": "sha512-1YBOJfRHV4sXUmWsFSf5rQor4Ss82G8dQWLRbnk3GA4jeP8hQt1hxXh0tmflpC0dz3VgEv/1+qwPyLeWkQuPFA==",
-      "dev": true
-    },
     "@testing-library/dom": {
       "version": "9.0.1",
       "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-9.0.1.tgz",
@@ -28589,8 +28560,7 @@
     "@types/use-sync-external-store": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/@types/use-sync-external-store/-/use-sync-external-store-0.0.6.tgz",
-      "integrity": "sha512-zFDAD+tlpf2r4asuHEj0XH6pY6i0g5NeAHPn+15wk3BV6JA69eERFXC1gyGThDkVa1zCyKr5jox1+2LbV/AMLg==",
-      "dev": true
+      "integrity": "sha512-zFDAD+tlpf2r4asuHEj0XH6pY6i0g5NeAHPn+15wk3BV6JA69eERFXC1gyGThDkVa1zCyKr5jox1+2LbV/AMLg=="
     },
     "@types/uuid": {
       "version": "9.0.4",
@@ -30679,7 +30649,6 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/css-box-model/-/css-box-model-1.2.1.tgz",
       "integrity": "sha512-a7Vr4Q/kd/aw96bnJG332W9V9LkJO69JRcaCYDUqjp6/z0w6VcZjgAcTbgFxEPfBgdnAwlh3iwu+hLopa+flJw==",
-      "dev": true,
       "requires": {
         "tiny-invariant": "^1.0.6"
       }
@@ -31494,6 +31463,12 @@
         "is-symbol": "^1.0.4"
       }
     },
+    "es-toolkit": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/es-toolkit/-/es-toolkit-1.52.0.tgz",
+      "integrity": "sha512-XTNEJQh1tY1ZJVcf6ayP/2n4ZPyaHlW2FWs7xvw5ddPuhUVjLD3olQVQS7kf58JbAB48iL0uL/jerTrjtV3lDA==",
+      "dev": true
+    },
     "es5-ext": {
       "version": "0.10.62",
       "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.62.tgz",
@@ -36983,8 +36958,7 @@
     "memoize-one": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz",
-      "integrity": "sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==",
-      "dev": true
+      "integrity": "sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q=="
     },
     "memoizerific": {
       "version": "1.11.3",
@@ -38394,8 +38368,7 @@
     "raf-schd": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/raf-schd/-/raf-schd-4.0.3.tgz",
-      "integrity": "sha512-tQkJl2GRWh83ui2DiPTJz9wEiMN20syf+5oKfB03yYP7ioZcJwsIK8FjrtLwH1m7C7e+Tt2yYBlrOpdT+dyeIQ==",
-      "dev": true
+      "integrity": "sha512-tQkJl2GRWh83ui2DiPTJz9wEiMN20syf+5oKfB03yYP7ioZcJwsIK8FjrtLwH1m7C7e+Tt2yYBlrOpdT+dyeIQ=="
     },
     "randexp": {
       "version": "0.5.3",
@@ -38546,7 +38519,6 @@
       "version": "9.2.0",
       "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-9.2.0.tgz",
       "integrity": "sha512-ROY9fvHhwOD9ySfrF0wmvu//bKCQ6AeZZq1nJNtbDC+kk5DuSuNX/n6YWYF/SYy7bSba4D4FSz8DJeKY/S/r+g==",
-      "dev": true,
       "requires": {
         "@types/use-sync-external-store": "^0.0.6",
         "use-sync-external-store": "^1.4.0"
@@ -38567,14 +38539,12 @@
     "react-virtualized-auto-sizer": {
       "version": "1.0.26",
       "resolved": "https://registry.npmjs.org/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.26.tgz",
-      "integrity": "sha512-CblNyiNVw2o+hsa5/49NH2ogGxZ+t+3aweRvNSq7TVjDIlwk7ir4lencEg5HxHeSzwNarSkNkiu0qJSOXtxm5A==",
-      "dev": true
+      "integrity": "sha512-CblNyiNVw2o+hsa5/49NH2ogGxZ+t+3aweRvNSq7TVjDIlwk7ir4lencEg5HxHeSzwNarSkNkiu0qJSOXtxm5A=="
     },
     "react-window": {
       "version": "1.8.11",
       "resolved": "https://registry.npmjs.org/react-window/-/react-window-1.8.11.tgz",
       "integrity": "sha512-+SRbUVT2scadgFSWx+R1P754xHPEqvcfSfVX10QYg6POOz+WNgkN48pS+BtZNIMGiL1HYrSEiCkwsMS15QogEQ==",
-      "dev": true,
       "requires": {
         "@babel/runtime": "^7.0.0",
         "memoize-one": ">=3.1.1 <6"
@@ -38660,8 +38630,7 @@
     "redux": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/redux/-/redux-5.0.1.tgz",
-      "integrity": "sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w==",
-      "dev": true
+      "integrity": "sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w=="
     },
     "reflect.getprototypeof": {
       "version": "1.0.10",
@@ -40433,8 +40402,7 @@
     "tiny-invariant": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.3.tgz",
-      "integrity": "sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==",
-      "dev": true
+      "integrity": "sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg=="
     },
     "tinyexec": {
       "version": "1.0.2",
@@ -40967,8 +40935,7 @@
     "use-sync-external-store": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.6.0.tgz",
-      "integrity": "sha512-Pp6GSwGP/NrPIrxVFAIkOQeyw8lFenOHijQWkUTrDvrF4ALqylP2C/KCkeS9dpUM3KvYRQhna5vt7IL95+ZQ9w==",
-      "dev": true
+      "integrity": "sha512-Pp6GSwGP/NrPIrxVFAIkOQeyw8lFenOHijQWkUTrDvrF4ALqylP2C/KCkeS9dpUM3KvYRQhna5vt7IL95+ZQ9w=="
     },
     "util": {
       "version": "0.12.5",
diff --git a/package.json b/package.json
index abafd63f..bbeed9d2 100644
--- a/package.json
+++ b/package.json
@@ -49,9 +49,12 @@
     "@gravity-ui/date-utils": "^2.7.1",
     "@gravity-ui/i18n": "^1.8.0",
     "@gravity-ui/icons": "^2.22.0",
+    "@hello-pangea/dnd": "^18.0.1",
     "decimal.js": "^10.6.0",
     "json-schema-library": "^11.6.2",
     "lodash": "^4.18.1",
+    "react-virtualized-auto-sizer": "^1.0.26",
+    "react-window": "^1.8.11",
     "uuid": "^14.0.1"
   },
   "devDependencies": {
@@ -63,7 +66,7 @@
     "@gravity-ui/prettier-config": "^1.1.0",
     "@gravity-ui/stylelint-config": "^4.0.1",
     "@gravity-ui/tsconfig": "^1.0.0",
-    "@gravity-ui/uikit": "^7.41.0",
+    "@gravity-ui/uikit": "8.0.0-beta.1",
     "@playwright/experimental-ct-react": "^1.40.0",
     "@playwright/test": "^1.40.0",
     "@storybook/addon-essentials": "^8.6.4",
@@ -116,12 +119,12 @@
     "typescript": "^5.8.4"
   },
   "peerDependencies": {
-    "@gravity-ui/uikit": "^7.0.0",
+    "@gravity-ui/uikit": "^8.0.0-beta.1",
     "final-form": "^4.20.2",
-    "react": "^17.0.0 || ^18.0.0 || ^19.0.0",
-    "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0",
+    "react": "^18.0.0 || ^19.0.0",
+    "react-dom": "^18.0.0 || ^19.0.0",
     "react-final-form": "^6.5.3",
-    "react-is": "^17.0.0 || ^18.0.0 || ^19.0.0"
+    "react-is": "^18.0.0 || ^19.0.0"
   },
   "nano-staged": {
     "*.{scss}": [
diff --git a/playwright/playwright/index.tsx b/playwright/playwright/index.tsx
index ec55afd1..a899f24e 100644
--- a/playwright/playwright/index.tsx
+++ b/playwright/playwright/index.tsx
@@ -1,13 +1,7 @@
 import React from 'react';
 
+import {Provider, Toaster, ToasterComponent, ToasterProvider} from '@gravity-ui/uikit';
 import {beforeMount} from '@playwright/experimental-ct-react/hooks';
-import {
-    MobileProvider,
-    ThemeProvider,
-    Toaster,
-    ToasterComponent,
-    ToasterProvider,
-} from '@gravity-ui/uikit';
 
 import './index.scss';
 
@@ -15,13 +9,11 @@ const toaster = new Toaster();
 
 beforeMount(async ({App}) => {
     return (
-        <ThemeProvider>
-            <MobileProvider>
-                <ToasterProvider toaster={toaster}>
-                    <App />
-                    <ToasterComponent />
-                </ToasterProvider>
-            </MobileProvider>
-        </ThemeProvider>
+        <Provider>
+            <ToasterProvider toaster={toaster}>
+                <App />
+                <ToasterComponent />
+            </ToasterProvider>
+        </Provider>
     );
 });
diff --git a/src/lib/core/components/Form/__tests__/DynamicField.test.tsx b/src/lib/core/components/Form/__tests__/DynamicField.test.tsx
index 8de87459..49beaad5 100644
--- a/src/lib/core/components/Form/__tests__/DynamicField.test.tsx
+++ b/src/lib/core/components/Form/__tests__/DynamicField.test.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import {ThemeProvider} from '@gravity-ui/uikit';
+import {Provider} from '@gravity-ui/uikit';
 import {act, render} from '@testing-library/react';
 import type {FormApi} from 'final-form';
 import noop from 'lodash/noop';
@@ -163,7 +163,7 @@ test('Form/hooks/DynamicField', () => {
     let form = null as FormApi | null;
 
     render(
-        <ThemeProvider>
+        <Provider>
             <Form initialValues={{}} onSubmit={noop}>
                 {() => {
                     const Caller = () => {
@@ -185,7 +185,7 @@ test('Form/hooks/DynamicField', () => {
                     );
                 }}
             </Form>
-        </ThemeProvider>,
+        </Provider>,
     );
 
     const value = {
@@ -443,11 +443,11 @@ test('warns about spec property keys containing dots', () => {
     };
 
     render(
-        <ThemeProvider>
+        <Provider>
             <Form initialValues={{}} onSubmit={noop}>
                 {() => <DynamicField name={name} spec={dottedSpec} config={dynamicConfig} />}
             </Form>
-        </ThemeProvider>,
+        </Provider>,
     );
 
     expect(warn).toHaveBeenCalledTimes(1);
@@ -464,11 +464,11 @@ test('does not warn when spec property keys have no dots', () => {
     const warn = jest.spyOn(console, 'warn').mockImplementation(() => {});
 
     render(
-        <ThemeProvider>
+        <Provider>
             <Form initialValues={{}} onSubmit={noop}>
                 {() => <DynamicField name={name} spec={spec} config={dynamicConfig} />}
             </Form>
-        </ThemeProvider>,
+        </Provider>,
     );
 
     expect(warn).not.toHaveBeenCalled();
diff --git a/src/lib/core/components/Form/hooks/__tests__/useSearch.test.tsx b/src/lib/core/components/Form/hooks/__tests__/useSearch.test.tsx
index aec4b98a..48d6e062 100644
--- a/src/lib/core/components/Form/hooks/__tests__/useSearch.test.tsx
+++ b/src/lib/core/components/Form/hooks/__tests__/useSearch.test.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
 
+import {Provider} from '@gravity-ui/uikit';
 import {render} from '@testing-library/react';
 import noop from 'lodash/noop';
 import {Form} from 'react-final-form';
@@ -56,6 +57,7 @@ describe('Form/hooks/useSearch', () => {
                     />
                 )}
             </Form>,
+            {wrapper: Provider},
         );
 
         expect(mirror.field.useSearchStore?.store).toMatchObject({
diff --git a/src/lib/kit/components/Card/__tests__/helpers.ts b/src/lib/kit/components/Card/__tests__/helpers.ts
index beeb7c4a..37371334 100644
--- a/src/lib/kit/components/Card/__tests__/helpers.ts
+++ b/src/lib/kit/components/Card/__tests__/helpers.ts
@@ -1,5 +1,5 @@
 import type {ArraySpec, FormValue, ObjectSpec} from '../../../../core';
-import {SpecTypes} from '../../../../core';
+import {SpecTypes} from '../../../../core/constants';
 
 export const ACCORDEON_CARD: Record<string, ArraySpec | ObjectSpec> = {
     arraySpec: {
diff --git a/src/lib/kit/components/Inputs/ArrayBase/__tests__/helpers.tsx b/src/lib/kit/components/Inputs/ArrayBase/__tests__/helpers.tsx
index a8599c53..8868b90f 100644
--- a/src/lib/kit/components/Inputs/ArrayBase/__tests__/helpers.tsx
+++ b/src/lib/kit/components/Inputs/ArrayBase/__tests__/helpers.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 import {DynamicForm as BaseDynamicForm} from '~playwright/core/DynamicForm';
 
 import type {ArraySpec, FormValue, Spec} from '../../../../../core';
-import {SpecTypes} from '../../../../../core';
+import {SpecTypes} from '../../../../../core/constants';
 
 export const ARRAY_BASE: Record<string, ArraySpec> = {
     default: {
diff --git a/src/lib/kit/components/Inputs/CardOneOf/__tests__/helpers.ts b/src/lib/kit/components/Inputs/CardOneOf/__tests__/helpers.ts
index 31184d2e..51981d4c 100644
--- a/src/lib/kit/components/Inputs/CardOneOf/__tests__/helpers.ts
+++ b/src/lib/kit/components/Inputs/CardOneOf/__tests__/helpers.ts
@@ -1,5 +1,5 @@
 import type {FormValue, ObjectSpec} from '../../../../../core';
-import {SpecTypes} from '../../../../../core';
+import {SpecTypes} from '../../../../../core/constants';
 
 export const CARD_ONEOF: Record<string, ObjectSpec> = {
     default: {
diff --git a/src/lib/kit/components/Inputs/Checkbox/__tests__/helpers.ts b/src/lib/kit/components/Inputs/Checkbox/__tests__/helpers.ts
index 76c126f4..7359cf7a 100644
--- a/src/lib/kit/components/Inputs/Checkbox/__tests__/helpers.ts
+++ b/src/lib/kit/components/Inputs/Checkbox/__tests__/helpers.ts
@@ -1,5 +1,5 @@
 import type {BooleanSpec, FormValue} from '../../../../../core';
-import {SpecTypes} from '../../../../../core';
+import {SpecTypes} from '../../../../../core/constants';
 
 export const CHECKBOX: Record<string, BooleanSpec> = {
     default: {
diff --git a/src/lib/kit/components/Inputs/CheckboxGroup/__tests__/helpers.ts b/src/lib/kit/components/Inputs/CheckboxGroup/__tests__/helpers.ts
index e9d72b2f..4af3440a 100644
--- a/src/lib/kit/components/Inputs/CheckboxGroup/__tests__/helpers.ts
+++ b/src/lib/kit/components/Inputs/CheckboxGroup/__tests__/helpers.ts
@@ -1,5 +1,5 @@
 import type {ArraySpec, FormValue} from '../../../../../core';
-import {SpecTypes} from '../../../../../core';
+import {SpecTypes} from '../../../../../core/constants';
 
 export const CHECKBOX_GROUP: Record<string, ArraySpec> = {
     default: {
diff --git a/src/lib/kit/components/Inputs/ColorPicker/ColorPicker.tsx b/src/lib/kit/components/Inputs/ColorPicker/ColorPicker.tsx
index dafac9ed..2136ab94 100644
--- a/src/lib/kit/components/Inputs/ColorPicker/ColorPicker.tsx
+++ b/src/lib/kit/components/Inputs/ColorPicker/ColorPicker.tsx
@@ -1,26 +1,17 @@
 import React from 'react';
 
-import {unstable_ColorPicker as ColorPickerBase} from '@gravity-ui/uikit/unstable';
+import {ColorPicker as ColorPickerBase} from '@gravity-ui/uikit';
 
 import type {StringInput} from '../../../../core';
 
 /**
- * Props forwarded to the underlying `unstable_ColorPicker` from `@gravity-ui/uikit/unstable`.
- *
- * NOTE: The underlying uikit component is marked as **unstable** — its API and behavior
- * may change in future uikit releases without following semver. Use with that in mind.
- *
- * @see https://preview.gravity-ui.com/uikit/?path=/docs/lab-colorpicker--docs
+ * Props forwarded to the underlying `ColorPicker` from `@gravity-ui/uikit`.
  */
 export interface ColorPickerProps
     extends Omit<React.ComponentProps<typeof ColorPickerBase>, 'value' | 'onUpdate' | 'disabled'> {}
 
 /**
  * Dynamic-forms input that renders a color picker for `StringSpec`.
- *
- * Wraps `unstable_ColorPicker` from `@gravity-ui/uikit/unstable`. Because the underlying
- * uikit component is **unstable**, the visual appearance, available `inputProps`, and
- * supported color formats may change between uikit releases.
  */
 export const ColorPicker: StringInput<ColorPickerProps> = ({input, spec, inputProps}) => {
     const {value, onChange, onBlur, onFocus} = input;
diff --git a/src/lib/kit/components/Inputs/ColorPicker/__tests__/helpers.ts b/src/lib/kit/components/Inputs/ColorPicker/__tests__/helpers.ts
index 189e3da6..8137421c 100644
--- a/src/lib/kit/components/Inputs/ColorPicker/__tests__/helpers.ts
+++ b/src/lib/kit/components/Inputs/ColorPicker/__tests__/helpers.ts
@@ -1,5 +1,5 @@
 import type {FormValue, StringSpec} from '../../../../../core';
-import {SpecTypes} from '../../../../../core';
+import {SpecTypes} from '../../../../../core/constants';
 
 export const COLOR_PICKER: Record<string, StringSpec> = {
     default: {
diff --git a/src/lib/kit/components/Inputs/DateInput/__tests__/helpers.ts b/src/lib/kit/components/Inputs/DateInput/__tests__/helpers.ts
index 1db6e09b..4dd45fcc 100644
--- a/src/lib/kit/components/Inputs/DateInput/__tests__/helpers.ts
+++ b/src/lib/kit/components/Inputs/DateInput/__tests__/helpers.ts
@@ -1,5 +1,5 @@
 import type {FormValue, StringSpec} from '../../../../../core';
-import {SpecTypes} from '../../../../../core';
+import {SpecTypes} from '../../../../../core/constants';
 
 export const DATE_INPUT: Record<string, StringSpec> = {
     default: {
diff --git a/src/lib/kit/components/Inputs/FileInput/__tests__/helpers.ts b/src/lib/kit/components/Inputs/FileInput/__tests__/helpers.ts
index 28417952..b0df9a76 100644
--- a/src/lib/kit/components/Inputs/FileInput/__tests__/helpers.ts
+++ b/src/lib/kit/components/Inputs/FileInput/__tests__/helpers.ts
@@ -1,5 +1,5 @@
 import type {FormValue, StringSpec} from '../../../../../core';
-import {SpecTypes} from '../../../../../core';
+import {SpecTypes} from '../../../../../core/constants';
 
 export const FILE_INPUT: Record<string, StringSpec> = {
     default: {
diff --git a/src/lib/kit/components/Inputs/MonacoInput/MonacoInputDialog.tsx b/src/lib/kit/components/Inputs/MonacoInput/MonacoInputDialog.tsx
index be39f6bc..b4d2bd91 100644
--- a/src/lib/kit/components/Inputs/MonacoInput/MonacoInputDialog.tsx
+++ b/src/lib/kit/components/Inputs/MonacoInput/MonacoInputDialog.tsx
@@ -52,6 +52,15 @@ export const MonacoInputDialog: React.FC<MonacoInputDialogProps> = ({
         onClose();
     }, [onChange, onClose, value]);
 
+    const handleOpenChange = React.useCallback(
+        (open: boolean) => {
+            if (!open) {
+                handleClose();
+            }
+        },
+        [handleClose],
+    );
+
     const options = useMonacoOptions(fontSize, false);
 
     if (!MonacoEditor) {
@@ -59,7 +68,7 @@ export const MonacoInputDialog: React.FC<MonacoInputDialogProps> = ({
     }
 
     return (
-        <Dialog open={visible} onClose={handleClose} className={b()}>
+        <Dialog open={visible} onOpenChange={handleOpenChange} className={b()}>
             <Dialog.Header caption={title} className={b('dialog-header')} />
             <Dialog.Body>
                 <div className={b('container')} data-qa={`${name}-dialog`}>
diff --git a/src/lib/kit/components/Inputs/MultiOneOf/__tests__/helpers.ts b/src/lib/kit/components/Inputs/MultiOneOf/__tests__/helpers.ts
index 1ea23f0e..bd6c0146 100644
--- a/src/lib/kit/components/Inputs/MultiOneOf/__tests__/helpers.ts
+++ b/src/lib/kit/components/Inputs/MultiOneOf/__tests__/helpers.ts
@@ -1,5 +1,5 @@
 import type {FormValue, ObjectSpec} from '../../../../../core';
-import {SpecTypes} from '../../../../../core';
+import {SpecTypes} from '../../../../../core/constants';
 
 export const MULTI_ONEOF: Record<string, ObjectSpec> = {
     default: {
diff --git a/src/lib/kit/components/Inputs/MultiSelect/MultiSelect.tsx b/src/lib/kit/components/Inputs/MultiSelect/MultiSelect.tsx
index 2792829a..19fd7a82 100644
--- a/src/lib/kit/components/Inputs/MultiSelect/MultiSelect.tsx
+++ b/src/lib/kit/components/Inputs/MultiSelect/MultiSelect.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import type {SelectProps as SelectBaseProps} from '@gravity-ui/uikit';
+import type {SelectProps as SelectBaseProps, SelectOptionProps} from '@gravity-ui/uikit';
 import {Select, Text} from '@gravity-ui/uikit';
 
 import type {ArrayInput, FieldArrayValue} from '../../../../core';
@@ -44,7 +44,6 @@ export const MultiSelect: ArrayInput<MultiSelectProps> = ({name, input, spec, in
                       return {
                           id: value,
                           value,
-                          text,
                           content: spec.viewSpec.selectParams?.meta?.[value] ? (
                               <div key={value}>
                                   <Text>{text}</Text>
@@ -71,6 +70,11 @@ export const MultiSelect: ArrayInput<MultiSelectProps> = ({name, input, spec, in
         return <React.Fragment key={option.value}>{option.content || option.value}</React.Fragment>;
     }, []);
 
+    const getOptionText: SelectBaseProps['getOptionText'] = React.useCallback(
+        (option: SelectOptionProps) => spec.description?.[option.value] || option.value,
+        [spec.description],
+    );
+
     const getOptionHeight = React.useCallback(() => {
         if (spec.viewSpec.selectParams?.meta) {
             return 44;
@@ -118,6 +122,7 @@ export const MultiSelect: ArrayInput<MultiSelectProps> = ({name, input, spec, in
             filterable={filterable}
             renderOption={renderOption}
             getOptionHeight={getOptionHeight}
+            getOptionText={withCustomOptions ? undefined : getOptionText}
             {...inputProps}
             value={_value}
             options={options}
diff --git a/src/lib/kit/components/Inputs/MultiSelect/__tests__/MultiSelect.number-enum.test.tsx b/src/lib/kit/components/Inputs/MultiSelect/__tests__/MultiSelect.number-enum.test.tsx
index f70b6566..2fc26a3e 100644
--- a/src/lib/kit/components/Inputs/MultiSelect/__tests__/MultiSelect.number-enum.test.tsx
+++ b/src/lib/kit/components/Inputs/MultiSelect/__tests__/MultiSelect.number-enum.test.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import {ThemeProvider} from '@gravity-ui/uikit';
+import {Provider} from '@gravity-ui/uikit';
 import {render, screen, waitFor} from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import noop from 'lodash/noop';
@@ -34,7 +34,7 @@ const renderNumberEnum = (values: number[], initialValue: number[] | undefined =
     };
 
     render(
-        <ThemeProvider>
+        <Provider>
             <Form initialValues={{input: initialValue}} onSubmit={noop}>
                 {({values}) => (
                     <>
@@ -43,7 +43,7 @@ const renderNumberEnum = (values: number[], initialValue: number[] | undefined =
                     </>
                 )}
             </Form>
-        </ThemeProvider>,
+        </Provider>,
     );
 
     return screen.getByText('3');
diff --git a/src/lib/kit/components/Inputs/MultiSelect/__tests__/helpers.ts b/src/lib/kit/components/Inputs/MultiSelect/__tests__/helpers.ts
index 56dfa0a1..ffe5e4d4 100644
--- a/src/lib/kit/components/Inputs/MultiSelect/__tests__/helpers.ts
+++ b/src/lib/kit/components/Inputs/MultiSelect/__tests__/helpers.ts
@@ -1,5 +1,5 @@
 import type {ArraySpec, FormValue} from '../../../../../core';
-import {SpecTypes} from '../../../../../core';
+import {SpecTypes} from '../../../../../core/constants';
 
 export const MULTI_SELECT: Record<string, ArraySpec> = {
     default: {
diff --git a/src/lib/kit/components/Inputs/Number/__tests__/Number.test.tsx b/src/lib/kit/components/Inputs/Number/__tests__/Number.test.tsx
index 7582ee10..257ec674 100644
--- a/src/lib/kit/components/Inputs/Number/__tests__/Number.test.tsx
+++ b/src/lib/kit/components/Inputs/Number/__tests__/Number.test.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import {ThemeProvider} from '@gravity-ui/uikit';
+import {Provider} from '@gravity-ui/uikit';
 import {render, screen} from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import cloneDeep from 'lodash/cloneDeep';
@@ -27,11 +27,11 @@ const SPEC_NUMBER: NumberSpec = {
 };
 
 const DynamicForm = ({spec}: {spec: Spec}) => (
-    <ThemeProvider>
+    <Provider>
         <Form initialValues={{}} onSubmit={noop}>
             {() => <DynamicField name={NAME} spec={spec} config={dynamicConfig} />}
         </Form>
-    </ThemeProvider>
+    </Provider>
 );
 
 beforeEach(() => {
diff --git a/src/lib/kit/components/Inputs/Number/__tests__/helpers.ts b/src/lib/kit/components/Inputs/Number/__tests__/helpers.ts
index 19575bc8..dcb91765 100644
--- a/src/lib/kit/components/Inputs/Number/__tests__/helpers.ts
+++ b/src/lib/kit/components/Inputs/Number/__tests__/helpers.ts
@@ -1,5 +1,5 @@
 import type {NumberSpec} from '../../../../../core';
-import {SpecTypes} from '../../../../../core';
+import {SpecTypes} from '../../../../../core/constants';
 
 export const NUMBER_SPEC: Record<string, NumberSpec> = {
     default: {
diff --git a/src/lib/kit/components/Inputs/NumberWithScale/__tests__/helpers.ts b/src/lib/kit/components/Inputs/NumberWithScale/__tests__/helpers.ts
index d806ea1b..a9219a96 100644
--- a/src/lib/kit/components/Inputs/NumberWithScale/__tests__/helpers.ts
+++ b/src/lib/kit/components/Inputs/NumberWithScale/__tests__/helpers.ts
@@ -1,5 +1,5 @@
 import type {FormValue, StringSpec} from '../../../../../core';
-import {SpecTypes} from '../../../../../core';
+import {SpecTypes} from '../../../../../core/constants';
 
 export const NUMBER_WITH_SCALE: Record<string, StringSpec> = {
     default: {
diff --git a/src/lib/kit/components/Inputs/ObjectBase/__tests__/helpers.ts b/src/lib/kit/components/Inputs/ObjectBase/__tests__/helpers.ts
index 90cea19e..57b935e6 100644
--- a/src/lib/kit/components/Inputs/ObjectBase/__tests__/helpers.ts
+++ b/src/lib/kit/components/Inputs/ObjectBase/__tests__/helpers.ts
@@ -1,5 +1,5 @@
 import type {FormValue, ObjectSpec} from '../../../../../core';
-import {SpecTypes} from '../../../../../core';
+import {SpecTypes} from '../../../../../core/constants';
 
 export const OBJECT_BASE: Record<string, ObjectSpec> = {
     default: {
diff --git a/src/lib/kit/components/Inputs/ObjectValueInput/__tests__/helpers.ts b/src/lib/kit/components/Inputs/ObjectValueInput/__tests__/helpers.ts
index 88cbbb0e..f0d51f45 100644
--- a/src/lib/kit/components/Inputs/ObjectValueInput/__tests__/helpers.ts
+++ b/src/lib/kit/components/Inputs/ObjectValueInput/__tests__/helpers.ts
@@ -1,5 +1,5 @@
 import type {FormValue, ObjectSpec} from '../../../../../core';
-import {SpecTypes} from '../../../../../core';
+import {SpecTypes} from '../../../../../core/constants';
 
 export const OBJECT_VALUE_INPUT: Record<string, ObjectSpec> = {
     default: {
diff --git a/src/lib/kit/components/Inputs/OneOf/__tests__/helpers.ts b/src/lib/kit/components/Inputs/OneOf/__tests__/helpers.ts
index cd26bdf6..157e83dc 100644
--- a/src/lib/kit/components/Inputs/OneOf/__tests__/helpers.ts
+++ b/src/lib/kit/components/Inputs/OneOf/__tests__/helpers.ts
@@ -1,5 +1,5 @@
 import type {FormValue, ObjectSpec} from '../../../../../core';
-import {SpecTypes} from '../../../../../core';
+import {SpecTypes} from '../../../../../core/constants';
 
 export const ONEOF: Record<string, ObjectSpec> = {
     default: {
diff --git a/src/lib/kit/components/Inputs/RadioGroup/__tests__/helpers.ts b/src/lib/kit/components/Inputs/RadioGroup/__tests__/helpers.ts
index 935f0820..569a83fe 100644
--- a/src/lib/kit/components/Inputs/RadioGroup/__tests__/helpers.ts
+++ b/src/lib/kit/components/Inputs/RadioGroup/__tests__/helpers.ts
@@ -1,5 +1,5 @@
 import type {StringSpec} from '../../../../../core';
-import {SpecTypes} from '../../../../../core';
+import {SpecTypes} from '../../../../../core/constants';
 
 export const RADIO_GROUP: Record<string, StringSpec> = {
     default: {
diff --git a/src/lib/kit/components/Inputs/RangeInputPicker/__tests__/helpers.ts b/src/lib/kit/components/Inputs/RangeInputPicker/__tests__/helpers.ts
index 4a25cdbd..1ba29552 100644
--- a/src/lib/kit/components/Inputs/RangeInputPicker/__tests__/helpers.ts
+++ b/src/lib/kit/components/Inputs/RangeInputPicker/__tests__/helpers.ts
@@ -1,5 +1,5 @@
 import type {FormValue, NumberSpec, ObjectSpec} from '../../../../../core';
-import {SpecTypes} from '../../../../../core';
+import {SpecTypes} from '../../../../../core/constants';
 
 const fromTo = (
     extra: Partial<NumberSpec> = {},
diff --git a/src/lib/kit/components/Inputs/Secret/__tests__/helpers.ts b/src/lib/kit/components/Inputs/Secret/__tests__/helpers.ts
index 33bc2844..a1720c95 100644
--- a/src/lib/kit/components/Inputs/Secret/__tests__/helpers.ts
+++ b/src/lib/kit/components/Inputs/Secret/__tests__/helpers.ts
@@ -1,5 +1,5 @@
 import type {ObjectSpec} from '../../../../../core';
-import {SpecTypes} from '../../../../../core';
+import {SpecTypes} from '../../../../../core/constants';
 
 export const SECRET: Record<string, ObjectSpec> = {
     default: {
diff --git a/src/lib/kit/components/Inputs/Select/Select.tsx b/src/lib/kit/components/Inputs/Select/Select.tsx
index cf90651f..e4567232 100644
--- a/src/lib/kit/components/Inputs/Select/Select.tsx
+++ b/src/lib/kit/components/Inputs/Select/Select.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import type {SelectProps as SelectBaseProps} from '@gravity-ui/uikit';
+import type {SelectProps as SelectBaseProps, SelectOptionProps} from '@gravity-ui/uikit';
 import {Select as SelectBase, Text} from '@gravity-ui/uikit';
 
 import type {StringInput} from '../../../../core';
@@ -38,7 +38,6 @@ export const Select: StringInput<SelectProps> = ({name, input, spec, inputProps}
                 : spec.enum?.map((id) => ({
                       id,
                       value: id,
-                      text: spec.description?.[id] || id,
                       content: spec.viewSpec.selectParams?.meta?.[id] ? (
                           <div key={id}>
                               <Text>{spec.description?.[id] || id}</Text>
@@ -64,6 +63,11 @@ export const Select: StringInput<SelectProps> = ({name, input, spec, inputProps}
         return <React.Fragment key={option.value}>{option.content || option.value}</React.Fragment>;
     }, []);
 
+    const getOptionText: SelectBaseProps['getOptionText'] = React.useCallback(
+        (option: SelectOptionProps) => spec.description?.[option.value] || option.value,
+        [spec.description],
+    );
+
     const getOptionHeight = React.useCallback(() => {
         if (spec.viewSpec.selectParams?.meta) {
             return 44;
@@ -91,6 +95,7 @@ export const Select: StringInput<SelectProps> = ({name, input, spec, inputProps}
             width="max"
             filterable={filterable}
             getOptionHeight={getOptionHeight}
+            getOptionText={withCustomOptions ? undefined : getOptionText}
             renderOption={renderOption}
             {...inputProps}
             value={[value]}
diff --git a/src/lib/kit/components/Inputs/Select/__tests__/Select.test.tsx b/src/lib/kit/components/Inputs/Select/__tests__/Select.test.tsx
new file mode 100644
index 00000000..6873b7e1
--- /dev/null
+++ b/src/lib/kit/components/Inputs/Select/__tests__/Select.test.tsx
@@ -0,0 +1,126 @@
+import React from 'react';
+
+import {Provider} from '@gravity-ui/uikit';
+import {render, screen, waitFor} from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import noop from 'lodash/noop';
+import {Form} from 'react-final-form';
+
+import {DynamicField, SpecTypes} from '../../../../../core';
+import {
+    JsonSchemaType,
+    NodeType,
+    SchemaRenderer,
+    SchemaRendererMode,
+} from '../../../../../unstable/core';
+import {config} from '../../../../../unstable/kit/constants';
+import {dynamicConfig} from '../../../../constants';
+
+beforeEach(() => {
+    window.matchMedia = () => ({
+        media: '',
+        matches: false,
+        onchange: null,
+        addListener: noop,
+        removeListener: noop,
+        addEventListener: noop,
+        removeEventListener: noop,
+        dispatchEvent: () => true,
+    });
+});
+
+const descriptions = {alpha: 'First option', beta: 'Second option'};
+const metadata = {alpha: 'First details', beta: 'Second details'};
+const enumValues = ['alpha', 'beta', ...Array.from({length: 8}, (_, index) => `option-${index}`)];
+const nodeParameters = {
+    entity: 'select',
+    layout: 'row',
+    entityProps: {
+        filterable: true,
+        filterPlaceholder: 'Search options',
+        enumDescriptions: descriptions,
+        optionsMeta: metadata,
+    },
+};
+
+describe.each([false, true])('Select with multiple=%s', (multiple) => {
+    test.each(['DynamicField', 'SchemaRenderer'])(
+        '%s preserves labels, filtering and submitted values with JSX options',
+        async (renderer) => {
+            const user = userEvent.setup();
+
+            render(
+                <Provider>
+                    <Form initialValues={{input: multiple ? ['alpha'] : 'alpha'}} onSubmit={noop}>
+                        {({values}) => (
+                            <>
+                                {renderer === 'DynamicField' ? (
+                                    <DynamicField
+                                        name="input"
+                                        config={dynamicConfig}
+                                        spec={{
+                                            type: multiple ? SpecTypes.Array : SpecTypes.String,
+                                            enum: enumValues,
+                                            description: descriptions,
+                                            viewSpec: {
+                                                type: 'select',
+                                                layout: 'row',
+                                                selectParams: {
+                                                    meta: metadata,
+                                                    filterPlaceholder: 'Search options',
+                                                },
+                                            },
+                                        }}
+                                    />
+                                ) : (
+                                    <SchemaRenderer
+                                        name="input"
+                                        mode={SchemaRendererMode.Form}
+                                        config={config}
+                                        validateOnBlur={false}
+                                        schema={
+                                            multiple
+                                                ? {
+                                                      type: JsonSchemaType.Array,
+                                                      items: {
+                                                          type: JsonSchemaType.String,
+                                                          enum: enumValues,
+                                                      },
+                                                      nodeParameters: {
+                                                          ...nodeParameters,
+                                                          type: NodeType.Array,
+                                                      },
+                                                  }
+                                                : {
+                                                      type: JsonSchemaType.String,
+                                                      enum: enumValues,
+                                                      nodeParameters: {
+                                                          ...nodeParameters,
+                                                          type: NodeType.String,
+                                                      },
+                                                  }
+                                        }
+                                    />
+                                )}
+                                <output data-testid="value">{JSON.stringify(values.input)}</output>
+                            </>
+                        )}
+                    </Form>
+                </Provider>,
+            );
+
+            expect(screen.getByRole('combobox')).toHaveTextContent('First option');
+            await user.click(screen.getByRole('combobox'));
+            await user.type(screen.getByPlaceholderText('Search options'), 'Second');
+
+            expect(screen.queryByRole('option', {name: /First option/})).not.toBeInTheDocument();
+            await user.click(screen.getByRole('option', {name: /Second option/}));
+
+            await waitFor(() => {
+                expect(screen.getByTestId('value')).toHaveTextContent(
+                    JSON.stringify(multiple ? ['alpha', 'beta'] : 'beta'),
+                );
+            });
+        },
+    );
+});
diff --git a/src/lib/kit/components/Inputs/Select/__tests__/helpers.ts b/src/lib/kit/components/Inputs/Select/__tests__/helpers.ts
index 5ca729cf..8547ac01 100644
--- a/src/lib/kit/components/Inputs/Select/__tests__/helpers.ts
+++ b/src/lib/kit/components/Inputs/Select/__tests__/helpers.ts
@@ -1,5 +1,5 @@
 import type {StringSpec} from '../../../../../core';
-import {SpecTypes} from '../../../../../core';
+import {SpecTypes} from '../../../../../core/constants';
 
 export const SELECT: Record<string, StringSpec> = {
     default: {
diff --git a/src/lib/kit/components/Inputs/Switch/__tests__/helpers.ts b/src/lib/kit/components/Inputs/Switch/__tests__/helpers.ts
index c3d11585..c670019c 100644
--- a/src/lib/kit/components/Inputs/Switch/__tests__/helpers.ts
+++ b/src/lib/kit/components/Inputs/Switch/__tests__/helpers.ts
@@ -1,5 +1,5 @@
 import type {BooleanSpec, FormValue} from '../../../../../core';
-import {SpecTypes} from '../../../../../core';
+import {SpecTypes} from '../../../../../core/constants';
 
 export const SWITCH: Record<string, BooleanSpec> = {
     default: {
diff --git a/src/lib/kit/components/Inputs/TableArrayInput/TableArrayInput.tsx b/src/lib/kit/components/Inputs/TableArrayInput/TableArrayInput.tsx
index 8bbfb9d3..53b40d51 100644
--- a/src/lib/kit/components/Inputs/TableArrayInput/TableArrayInput.tsx
+++ b/src/lib/kit/components/Inputs/TableArrayInput/TableArrayInput.tsx
@@ -1,7 +1,8 @@
 import React from 'react';
 
 import {Plus, TrashBin} from '@gravity-ui/icons';
-import {Button, Flex, HelpMark, Icon, Table, type TableColumnConfig} from '@gravity-ui/uikit';
+import {Button, Flex, HelpMark, Icon} from '@gravity-ui/uikit';
+import {Table, type TableColumnConfig} from '@gravity-ui/uikit/legacy';
 import noop from 'lodash/noop';
 import set from 'lodash/set';
 
@@ -118,7 +119,7 @@ export const TableArrayInput: ArrayInput = ({spec, name, arrayInput, input}) =>
                       )
                     : () => (
                           <Flex
-                              gap={0.5}
+                              gap="spacing-half"
                               alignItems="center"
                               style={{minWidth: width, maxWidth: width}}
                           >
diff --git a/src/lib/kit/components/Inputs/TableArrayInput/__tests__/helpers.tsx b/src/lib/kit/components/Inputs/TableArrayInput/__tests__/helpers.tsx
index 8960fe09..c06da747 100644
--- a/src/lib/kit/components/Inputs/TableArrayInput/__tests__/helpers.tsx
+++ b/src/lib/kit/components/Inputs/TableArrayInput/__tests__/helpers.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 import {DynamicForm as BaseDynamicForm} from '~playwright/core/DynamicForm';
 
 import type {ArraySpec, FormValue, Spec} from '../../../../../core';
-import {SpecTypes} from '../../../../../core';
+import {SpecTypes} from '../../../../../core/constants';
 
 export const TABLE_ARRAY_INPUT: Record<string, ArraySpec> = {
     default: {
diff --git a/src/lib/kit/components/Inputs/Text/__tests__/Text.test.tsx b/src/lib/kit/components/Inputs/Text/__tests__/Text.test.tsx
index 7b29a3e9..4b570091 100644
--- a/src/lib/kit/components/Inputs/Text/__tests__/Text.test.tsx
+++ b/src/lib/kit/components/Inputs/Text/__tests__/Text.test.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import {ThemeProvider} from '@gravity-ui/uikit';
+import {Provider} from '@gravity-ui/uikit';
 import {render, screen} from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import cloneDeep from 'lodash/cloneDeep';
@@ -32,11 +32,11 @@ const SPEC_PASSWORD: StringSpec = {
 };
 
 const DynamicForm = ({spec}: {spec: Spec}) => (
-    <ThemeProvider>
+    <Provider>
         <Form initialValues={{}} onSubmit={noop}>
             {() => <DynamicField name={NAME} spec={spec} config={dynamicConfig} />}
         </Form>
-    </ThemeProvider>
+    </Provider>
 );
 
 beforeEach(() => {
diff --git a/src/lib/kit/components/Inputs/Text/__tests__/helpers.ts b/src/lib/kit/components/Inputs/Text/__tests__/helpers.ts
index 4202c270..bfa45a50 100644
--- a/src/lib/kit/components/Inputs/Text/__tests__/helpers.ts
+++ b/src/lib/kit/components/Inputs/Text/__tests__/helpers.ts
@@ -1,5 +1,5 @@
 import type {StringSpec} from '../../../../../core';
-import {SpecTypes} from '../../../../../core';
+import {SpecTypes} from '../../../../../core/constants';
 
 export const PASSWORD_SPEC: Record<string, StringSpec> = {
     default: {
diff --git a/src/lib/kit/components/Inputs/TextArea/__tests__/helpers.ts b/src/lib/kit/components/Inputs/TextArea/__tests__/helpers.ts
index b521ffc7..43eb15ca 100644
--- a/src/lib/kit/components/Inputs/TextArea/__tests__/helpers.ts
+++ b/src/lib/kit/components/Inputs/TextArea/__tests__/helpers.ts
@@ -1,5 +1,5 @@
 import type {StringSpec} from '../../../../../core';
-import {SpecTypes} from '../../../../../core';
+import {SpecTypes} from '../../../../../core/constants';
 
 export const TEXT_AREA_SPEC: Record<string, StringSpec> = {
     default: {
diff --git a/src/lib/kit/components/Inputs/TextContent/__tests__/helpers.ts b/src/lib/kit/components/Inputs/TextContent/__tests__/helpers.ts
index 27f21ba5..12be9a0a 100644
--- a/src/lib/kit/components/Inputs/TextContent/__tests__/helpers.ts
+++ b/src/lib/kit/components/Inputs/TextContent/__tests__/helpers.ts
@@ -1,5 +1,5 @@
 import type {StringSpec} from '../../../../../core';
-import {SpecTypes} from '../../../../../core';
+import {SpecTypes} from '../../../../../core/constants';
 
 export const TEXT_CONTENT_SPEC: Record<string, StringSpec> = {
     defaultText: {
diff --git a/src/lib/kit/components/Inputs/TimeRangeSelector/__tests__/helpers.ts b/src/lib/kit/components/Inputs/TimeRangeSelector/__tests__/helpers.ts
index 96504bd6..985cf825 100644
--- a/src/lib/kit/components/Inputs/TimeRangeSelector/__tests__/helpers.ts
+++ b/src/lib/kit/components/Inputs/TimeRangeSelector/__tests__/helpers.ts
@@ -1,5 +1,5 @@
 import type {FormValue, ObjectSpec} from '../../../../../core';
-import {SpecTypes} from '../../../../../core';
+import {SpecTypes} from '../../../../../core/constants';
 
 const ENUM_START = [
     '00:00',
diff --git a/src/lib/kit/components/Inputs/TimeRangeSelector/components/TimeRangeSelect/TimeRangeSelect.tsx b/src/lib/kit/components/Inputs/TimeRangeSelector/components/TimeRangeSelect/TimeRangeSelect.tsx
index cc51f534..a909bf45 100644
--- a/src/lib/kit/components/Inputs/TimeRangeSelector/components/TimeRangeSelect/TimeRangeSelect.tsx
+++ b/src/lib/kit/components/Inputs/TimeRangeSelector/components/TimeRangeSelect/TimeRangeSelect.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import type {SelectOption} from '@gravity-ui/uikit';
+import type {SelectOptionProps} from '@gravity-ui/uikit';
 
 import {
     Controller,
@@ -16,7 +16,7 @@ import './TimeRangeSelect.scss';
 const b = block('time-range-select');
 
 interface TimeRangeSelectProps extends ControllerProps<FieldValue, StringSpec> {
-    options: SelectOption<string>[];
+    options: SelectOptionProps<string>[];
 }
 
 export const TimeRangeSelect: React.FC<TimeRangeSelectProps> = ({spec, options, ...props}) => {
diff --git a/src/lib/kit/components/Layouts/Accordeon/__tests__/helpers.ts b/src/lib/kit/components/Layouts/Accordeon/__tests__/helpers.ts
index 91909951..95f3e440 100644
--- a/src/lib/kit/components/Layouts/Accordeon/__tests__/helpers.ts
+++ b/src/lib/kit/components/Layouts/Accordeon/__tests__/helpers.ts
@@ -1,5 +1,5 @@
 import type {ArraySpec, FormValue, ObjectSpec} from '../../../../../core';
-import {SpecTypes} from '../../../../../core';
+import {SpecTypes} from '../../../../../core/constants';
 
 export const ACCORDEON: Record<string, ArraySpec | ObjectSpec> = {
     arraySpec: {
diff --git a/src/lib/kit/components/Layouts/AccordeonCard/__tests__/helpers.ts b/src/lib/kit/components/Layouts/AccordeonCard/__tests__/helpers.ts
index 2d9014cb..58b76785 100644
--- a/src/lib/kit/components/Layouts/AccordeonCard/__tests__/helpers.ts
+++ b/src/lib/kit/components/Layouts/AccordeonCard/__tests__/helpers.ts
@@ -1,5 +1,5 @@
 import type {ArraySpec, FormValue, ObjectSpec} from '../../../../../core';
-import {SpecTypes} from '../../../../../core';
+import {SpecTypes} from '../../../../../core/constants';
 
 export const ACCORDEON_CARD: Record<string, ArraySpec | ObjectSpec> = {
     arraySpec: {
diff --git a/src/lib/kit/components/Layouts/Column/__tests__/helpers.ts b/src/lib/kit/components/Layouts/Column/__tests__/helpers.ts
index 3e2dbe8e..8c018833 100644
--- a/src/lib/kit/components/Layouts/Column/__tests__/helpers.ts
+++ b/src/lib/kit/components/Layouts/Column/__tests__/helpers.ts
@@ -1,5 +1,5 @@
 import type {FormValue, ObjectSpec} from '../../../../../core';
-import {SpecTypes} from '../../../../../core';
+import {SpecTypes} from '../../../../../core/constants';
 
 export const COLUMN_CARD: ObjectSpec = {
     defaultValue: {
diff --git a/src/lib/kit/components/Layouts/Section/__tests__/helpers.ts b/src/lib/kit/components/Layouts/Section/__tests__/helpers.ts
index 6a40eb62..91a91432 100644
--- a/src/lib/kit/components/Layouts/Section/__tests__/helpers.ts
+++ b/src/lib/kit/components/Layouts/Section/__tests__/helpers.ts
@@ -1,5 +1,5 @@
 import type {ArraySpec, FormValue, ObjectSpec} from '../../../../../core';
-import {SpecTypes} from '../../../../../core';
+import {SpecTypes} from '../../../../../core/constants';
 
 export const SECTION: Record<string, ArraySpec | ObjectSpec> = {
     sectionArraySpec: {
diff --git a/src/lib/kit/components/RemoveButton/RemoveButton.tsx b/src/lib/kit/components/RemoveButton/RemoveButton.tsx
index bc4e3221..88e9ac99 100644
--- a/src/lib/kit/components/RemoveButton/RemoveButton.tsx
+++ b/src/lib/kit/components/RemoveButton/RemoveButton.tsx
@@ -1,8 +1,8 @@
 import React from 'react';
 
 import {Ellipsis} from '@gravity-ui/icons';
-import type {DropdownMenuItemMixed} from '@gravity-ui/uikit';
-import {Button, DropdownMenu, Icon} from '@gravity-ui/uikit';
+import {Button, Icon} from '@gravity-ui/uikit';
+import {DropdownMenu, type DropdownMenuItemMixed} from '@gravity-ui/uikit/legacy';
 
 import i18n from '../../i18n';
 
diff --git a/src/lib/kit/components/ViewLayouts/ViewColumn/__tests__/helpers.ts b/src/lib/kit/components/ViewLayouts/ViewColumn/__tests__/helpers.ts
index c8cb7b29..44eafa88 100644
--- a/src/lib/kit/components/ViewLayouts/ViewColumn/__tests__/helpers.ts
+++ b/src/lib/kit/components/ViewLayouts/ViewColumn/__tests__/helpers.ts
@@ -1,5 +1,5 @@
 import type {FormValue, ObjectSpec} from '../../../../../core';
-import {SpecTypes} from '../../../../../core';
+import {SpecTypes} from '../../../../../core/constants';
 
 export const VIEW_COLUMN: ObjectSpec = {
     defaultValue: {
diff --git a/src/lib/kit/components/ViewLayouts/ViewRow/__tests__/helpers.ts b/src/lib/kit/components/ViewLayouts/ViewRow/__tests__/helpers.ts
index 49cb76ef..cd13033e 100644
--- a/src/lib/kit/components/ViewLayouts/ViewRow/__tests__/helpers.ts
+++ b/src/lib/kit/components/ViewLayouts/ViewRow/__tests__/helpers.ts
@@ -1,5 +1,5 @@
 import type {FormValue, ObjectSpec} from '../../../../../core';
-import {SpecTypes} from '../../../../../core';
+import {SpecTypes} from '../../../../../core/constants';
 
 export const VIEW_ROW: ObjectSpec = {
     defaultValue: {
diff --git a/src/lib/kit/components/Views/MonacoInputView/MonacoViewDialog.tsx b/src/lib/kit/components/Views/MonacoInputView/MonacoViewDialog.tsx
index f556dcd5..7133c6fa 100644
--- a/src/lib/kit/components/Views/MonacoInputView/MonacoViewDialog.tsx
+++ b/src/lib/kit/components/Views/MonacoInputView/MonacoViewDialog.tsx
@@ -41,6 +41,15 @@ export const MonacoViewDialog: React.FC<MonacoViewDialogProps> = ({
         onClose();
     }, [onClose]);
 
+    const handleOpenChange = React.useCallback(
+        (open: boolean) => {
+            if (!open) {
+                handleClose();
+            }
+        },
+        [handleClose],
+    );
+
     const options = useMonacoOptions(fontSize, true);
 
     if (!MonacoEditor) {
@@ -48,7 +57,7 @@ export const MonacoViewDialog: React.FC<MonacoViewDialogProps> = ({
     }
 
     return (
-        <Dialog open={visible} onClose={handleClose} className={b()}>
+        <Dialog open={visible} onOpenChange={handleOpenChange} className={b()}>
             <Dialog.Header caption={title} className={b('dialog-header')} />
             <Dialog.Body>
                 <div className={b('container')}>
diff --git a/src/lib/kit/components/Views/TableArrayView/TableArrayView.tsx b/src/lib/kit/components/Views/TableArrayView/TableArrayView.tsx
index 871aa121..bc74eb06 100644
--- a/src/lib/kit/components/Views/TableArrayView/TableArrayView.tsx
+++ b/src/lib/kit/components/Views/TableArrayView/TableArrayView.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 
-import {Flex, HelpMark, Table, type TableColumnConfig} from '@gravity-ui/uikit';
+import {Flex, HelpMark} from '@gravity-ui/uikit';
+import {Table, type TableColumnConfig} from '@gravity-ui/uikit/legacy';
 
 import type {ArrayView, FormValue, ObjectValue} from '../../../../core';
 import {
@@ -49,7 +50,7 @@ export const TableArrayView: ArrayView = ({value = [], spec, name}) => {
                     description && showLayoutDescription
                         ? () => (
                               <Flex
-                                  gap={0.5}
+                                  gap="spacing-half"
                                   alignItems="center"
                                   style={{minWidth: width, maxWidth: width}}
                               >
diff --git a/src/lib/unstable/kit/components/DropButton/DropButton.tsx b/src/lib/unstable/kit/components/DropButton/DropButton.tsx
index a9469c7c..dae95f03 100644
--- a/src/lib/unstable/kit/components/DropButton/DropButton.tsx
+++ b/src/lib/unstable/kit/components/DropButton/DropButton.tsx
@@ -1,11 +1,6 @@
 import React from 'react';
 
-import {Text} from '@gravity-ui/uikit';
-import {
-    unstable_Menu as Menu,
-    unstable_MenuItem as MenuItem,
-    unstable_MenuTrigger as MenuTrigger,
-} from '@gravity-ui/uikit/unstable';
+import {Menu, MenuItem, MenuTrigger, Text} from '@gravity-ui/uikit';
 import {useForm} from 'react-final-form';
 
 import i18n from '../../../../kit/i18n';
diff --git a/src/lib/unstable/kit/components/EntityContainer/EntityContainer.tsx b/src/lib/unstable/kit/components/EntityContainer/EntityContainer.tsx
index 1a7d22c3..8869e103 100644
--- a/src/lib/unstable/kit/components/EntityContainer/EntityContainer.tsx
+++ b/src/lib/unstable/kit/components/EntityContainer/EntityContainer.tsx
@@ -33,7 +33,7 @@ export const EntityContainer: React.FC<EntityContainerProps> = ({
             data-droppable={droppable}
             data-width={width}
         >
-            <Flex direction="column" minWidth={0} {...restFlexProps} grow={1}>
+            <Flex direction="column" minWidth={0} {...restFlexProps} flexGrow={1}>
                 {children}
             </Flex>
         </div>
diff --git a/src/lib/unstable/kit/components/EntityDescription/EntityDescription.tsx b/src/lib/unstable/kit/components/EntityDescription/EntityDescription.tsx
index 003a9df8..8c67c434 100644
--- a/src/lib/unstable/kit/components/EntityDescription/EntityDescription.tsx
+++ b/src/lib/unstable/kit/components/EntityDescription/EntityDescription.tsx
@@ -26,7 +26,7 @@ export const EntityDescription: React.FC<EntityDescriptionProps> = ({
 
     if (likeHelpMark) {
         return (
-            <HelpMark className={className} iconSize={settings?.size === 'xl' ? 'l' : 'm'}>
+            <HelpMark className={className} size={settings?.size === 'xl' ? 'l' : 'm'}>
                 <HTMLContent content={content} />
             </HelpMark>
         );
diff --git a/src/lib/unstable/kit/components/MonacoContainer/MonacoContainer.tsx b/src/lib/unstable/kit/components/MonacoContainer/MonacoContainer.tsx
index e1d3c46d..f8fd77f1 100644
--- a/src/lib/unstable/kit/components/MonacoContainer/MonacoContainer.tsx
+++ b/src/lib/unstable/kit/components/MonacoContainer/MonacoContainer.tsx
@@ -36,7 +36,7 @@ export const MonacoContainer: React.FC<MonacoContainerProps> = ({
     return (
         <div className={b()} data-qa={qa}>
             <Flex alignItems="center" justifyContent="space-between" className={b('header')}>
-                <Flex alignItems="center" gap={1}>
+                <Flex alignItems="center" gap="spacing-1">
                     <Icon data={Code} size={16} />
                     <Text variant={settings?.titleVariant}>{language}</Text>
                 </Flex>
diff --git a/src/lib/unstable/kit/entities/Alert/Alert.tsx b/src/lib/unstable/kit/entities/Alert/Alert.tsx
index 263bc9ce..7d1bfa25 100644
--- a/src/lib/unstable/kit/entities/Alert/Alert.tsx
+++ b/src/lib/unstable/kit/entities/Alert/Alert.tsx
@@ -48,7 +48,7 @@ export const Alert: NodeEntity<JsonSchemaString, AlertProps> = ({props, schema,
                 <Flex
                     className={b('title')}
                     alignItems="center"
-                    gap="2"
+                    gap="spacing-2"
                     onClick={() => setExpanded(!expanded)}
                 >
                     <HTMLContent content={title} variant={settings?.titleVariant} />
@@ -100,14 +100,7 @@ export const Alert: NodeEntity<JsonSchemaString, AlertProps> = ({props, schema,
 
     return (
         <EntityContainer className={b({expanded})} width="fit" fill="populated">
-            <UIKitAlert
-                icon={icon}
-                message={msg}
-                title={title}
-                // @ts-expect-error
-                size={size}
-                {...entityRestProps}
-            />
+            <UIKitAlert icon={icon} message={msg} title={title} size={size} {...entityRestProps} />
         </EntityContainer>
     );
 };
diff --git a/src/lib/unstable/kit/entities/ArrayEntity/ArrayEntity.tsx b/src/lib/unstable/kit/entities/ArrayEntity/ArrayEntity.tsx
index 05be780f..61792d3e 100644
--- a/src/lib/unstable/kit/entities/ArrayEntity/ArrayEntity.tsx
+++ b/src/lib/unstable/kit/entities/ArrayEntity/ArrayEntity.tsx
@@ -104,7 +104,7 @@ export const ArrayEntity: NodeEntity<JsonSchemaArray, ArrayEntityProps> = ({
     }
 
     return (
-        <EntityContainer width="by-child" gap={4} fill="by-child" droppable>
+        <EntityContainer width="by-child" gap="spacing-4" fill="by-child" droppable>
             {items?.length ? <Flex direction="column">{items}</Flex> : null}
             {addButton}
         </EntityContainer>
diff --git a/src/lib/unstable/kit/entities/ArrayTable/ArrayTable.tsx b/src/lib/unstable/kit/entities/ArrayTable/ArrayTable.tsx
index bd8bdb9d..dd97e1d0 100644
--- a/src/lib/unstable/kit/entities/ArrayTable/ArrayTable.tsx
+++ b/src/lib/unstable/kit/entities/ArrayTable/ArrayTable.tsx
@@ -201,7 +201,7 @@ export const ArrayTable: NodeEntity<JsonSchemaArray, ArrayTableProps> = ({
         <EntityContainer
             className={b({size: settings?.size})}
             width="by-child"
-            gap={4}
+            gap="spacing-4"
             fill="by-child"
             droppable
         >
diff --git a/src/lib/unstable/kit/entities/Monaco/Monaco.tsx b/src/lib/unstable/kit/entities/Monaco/Monaco.tsx
index b29c8902..53a4e122 100644
--- a/src/lib/unstable/kit/entities/Monaco/Monaco.tsx
+++ b/src/lib/unstable/kit/entities/Monaco/Monaco.tsx
@@ -170,7 +170,7 @@ export const Monaco: NodeEntity<JsonSchemaString, MonacoProps> = ({
             >
                 {control}
             </MonacoContainer>
-            <Dialog open={dialogOpen} onClose={toggleDialogOpen} hasCloseButton={false}>
+            <Dialog open={dialogOpen} onOpenChange={setDialogOpen} hasCloseButton={false}>
                 <Dialog.Body className={b('dialog-body')}>
                     <MonacoContainer
                         dialog={true}
diff --git a/src/lib/unstable/kit/entities/ObjectInline/ObjectInline.tsx b/src/lib/unstable/kit/entities/ObjectInline/ObjectInline.tsx
index 4c33ad9f..0aa4042c 100644
--- a/src/lib/unstable/kit/entities/ObjectInline/ObjectInline.tsx
+++ b/src/lib/unstable/kit/entities/ObjectInline/ObjectInline.tsx
@@ -46,7 +46,7 @@ export const ObjectInline: NodeEntity<JsonSchemaObject, ObjectInlineProps> = ({
                 className={b('items', {overview: overviewFlag})}
                 direction="row"
                 alignItems="center"
-                gap={overviewFlag ? 1 : 2}
+                gap={overviewFlag ? 'spacing-1' : 'spacing-2'}
             >
                 {(order || Object.keys(schema.properties || {})).map(
                     (property: string, index: number, array: string[]) => (
diff --git a/src/lib/unstable/kit/form-entities/CheckboxGroupInput/CheckboxGroupInput.tsx b/src/lib/unstable/kit/form-entities/CheckboxGroupInput/CheckboxGroupInput.tsx
index 3d7e0be5..5dcfdee5 100644
--- a/src/lib/unstable/kit/form-entities/CheckboxGroupInput/CheckboxGroupInput.tsx
+++ b/src/lib/unstable/kit/form-entities/CheckboxGroupInput/CheckboxGroupInput.tsx
@@ -67,7 +67,7 @@ export const CheckboxGroupInput: NodeEntity<JsonSchemaArray, CheckboxGroupInputP
             width="fit"
             className={b({size: settings?.size})}
             direction={direction}
-            gap={2}
+            gap="spacing-2"
         >
             {options?.map(({value: optionValue, text}) => (
                 <Flex
diff --git a/src/lib/unstable/kit/form-entities/ColorPickerInput/ColorPickerInput.tsx b/src/lib/unstable/kit/form-entities/ColorPickerInput/ColorPickerInput.tsx
index f5f262f5..a673e9b0 100644
--- a/src/lib/unstable/kit/form-entities/ColorPickerInput/ColorPickerInput.tsx
+++ b/src/lib/unstable/kit/form-entities/ColorPickerInput/ColorPickerInput.tsx
@@ -1,9 +1,6 @@
 import React from 'react';
 
-import {
-    unstable_ColorPicker as ColorPicker,
-    type unstable_ColorPickerProps as ColorPickerProps,
-} from '@gravity-ui/uikit/unstable';
+import {ColorPicker, type ColorPickerProps} from '@gravity-ui/uikit';
 
 import type {JsonSchemaString, NodeEntity} from '../../../core';
 import {EntityContainer} from '../../components';
diff --git a/src/lib/unstable/kit/form-entities/FileInput/FileInput.tsx b/src/lib/unstable/kit/form-entities/FileInput/FileInput.tsx
index 91ef6624..fb75e43b 100644
--- a/src/lib/unstable/kit/form-entities/FileInput/FileInput.tsx
+++ b/src/lib/unstable/kit/form-entities/FileInput/FileInput.tsx
@@ -1,11 +1,12 @@
 import React from 'react';
 
 import {Xmark} from '@gravity-ui/icons';
-import {FilePreview, type FilePreviewAction} from '@gravity-ui/uikit';
 import {
-    unstable_FileDropZone as FileDropZone,
+    FileDropZone,
     type FileDropZoneProps,
-} from '@gravity-ui/uikit/unstable';
+    FilePreview,
+    type FilePreviewAction,
+} from '@gravity-ui/uikit';
 
 import type {JsonSchemaString, NodeEntity} from '../../../core';
 import {EntityContainer} from '../../components';
diff --git a/src/lib/unstable/kit/form-entities/MultiSelectInput/MultiSelectInput.tsx b/src/lib/unstable/kit/form-entities/MultiSelectInput/MultiSelectInput.tsx
index 5810a2a1..c99abf02 100644
--- a/src/lib/unstable/kit/form-entities/MultiSelectInput/MultiSelectInput.tsx
+++ b/src/lib/unstable/kit/form-entities/MultiSelectInput/MultiSelectInput.tsx
@@ -1,6 +1,13 @@
 import React from 'react';
 
-import {Flex, Select, type SelectOption, type SelectProps, Text} from '@gravity-ui/uikit';
+import {
+    Flex,
+    Select,
+    type SelectOptionProps,
+    type SelectProps,
+    Text,
+    getSelectOptionText,
+} from '@gravity-ui/uikit';
 import isString from 'lodash/isString';
 
 import type {JsonSchemaArray, NodeEntity} from '../../../core';
@@ -53,7 +60,7 @@ export const MultiSelectInput: NodeEntity<JsonSchemaArray, MultiSelectInputProps
 
                 if (optionMeta) {
                     content = (
-                        <Flex direction="column" gap="0.5">
+                        <Flex direction="column" gap="spacing-half">
                             {content}
                             <Text color="secondary" variant={settings?.textVariant}>
                                 {optionMeta}
@@ -62,7 +69,7 @@ export const MultiSelectInput: NodeEntity<JsonSchemaArray, MultiSelectInputProps
                     );
                 }
 
-                return {value, text, content, key: value, data: {optionMeta}};
+                return {value, content, key: value, data: {optionMeta, text}};
             });
         }
 
@@ -70,16 +77,19 @@ export const MultiSelectInput: NodeEntity<JsonSchemaArray, MultiSelectInputProps
     }, [enumDescriptions, enumValues, optionsMeta, settings]);
 
     const renderOption: SelectProps['renderOption'] = React.useCallback(
-        (option: SelectOption) => (
-            <React.Fragment key={option.value}>
-                {option.content || option.text || option.value}
-            </React.Fragment>
+        (option: SelectOptionProps) => (
+            <React.Fragment key={option.value}>{option.content || option.value}</React.Fragment>
         ),
         [],
     );
 
+    const getOptionText: SelectProps['getOptionText'] = React.useCallback(
+        (option: SelectOptionProps) => option.data?.text ?? getSelectOptionText(option),
+        [],
+    );
+
     const getOptionHeight: SelectProps['getOptionHeight'] = React.useCallback(
-        (option: SelectOption) => {
+        (option: SelectOptionProps) => {
             let height = 28;
 
             if (settings?.size) {
@@ -116,6 +126,7 @@ export const MultiSelectInput: NodeEntity<JsonSchemaArray, MultiSelectInputProps
                 filterable={(enumValues?.length || 0) > 9}
                 renderOption={renderOption}
                 getOptionHeight={getOptionHeight}
+                getOptionText={getOptionText}
                 placeholder={`${schema.examples?.[0]?.[0] || DASH}`}
                 disabled={disabled || schema.readOnly}
                 size={settings?.size}
diff --git a/src/lib/unstable/kit/form-entities/NumberWithScaleInput/NumberWithScaleInput.tsx b/src/lib/unstable/kit/form-entities/NumberWithScaleInput/NumberWithScaleInput.tsx
index ae2327cb..335eaf2f 100644
--- a/src/lib/unstable/kit/form-entities/NumberWithScaleInput/NumberWithScaleInput.tsx
+++ b/src/lib/unstable/kit/form-entities/NumberWithScaleInput/NumberWithScaleInput.tsx
@@ -110,7 +110,7 @@ export const NumberWithScaleInput: NodeEntity<JsonSchemaNumber, NumberWithScaleI
             width="max"
             className={b({error: getBooleanValidationState(meta)})}
             direction="row"
-            gap={2}
+            gap="spacing-2"
         >
             <div className={b('input')}>
                 <NumberInput
diff --git a/src/lib/unstable/kit/form-entities/RangeInput/RangeInput.tsx b/src/lib/unstable/kit/form-entities/RangeInput/RangeInput.tsx
index c59195ef..608d2654 100644
--- a/src/lib/unstable/kit/form-entities/RangeInput/RangeInput.tsx
+++ b/src/lib/unstable/kit/form-entities/RangeInput/RangeInput.tsx
@@ -95,7 +95,7 @@ export const RangeInput: NodeEntity<JsonSchemaObject, RangeInputProps> = ({
 
     return (
         <EntityContainer width="by-child" className={b({size: settings?.size})}>
-            <Flex className={b('items')} direction="row" alignItems="flex-start" gap={2}>
+            <Flex className={b('items')} direction="row" alignItems="flex-start" gap="spacing-2">
                 <SchemaRendererNode
                     headName={headName}
                     name={fromName}
diff --git a/src/lib/unstable/kit/form-entities/SelectInput/SelectInput.tsx b/src/lib/unstable/kit/form-entities/SelectInput/SelectInput.tsx
index 13279fac..3ccb4039 100644
--- a/src/lib/unstable/kit/form-entities/SelectInput/SelectInput.tsx
+++ b/src/lib/unstable/kit/form-entities/SelectInput/SelectInput.tsx
@@ -1,6 +1,13 @@
 import React from 'react';
 
-import {Flex, Select, type SelectOption, type SelectProps, Text} from '@gravity-ui/uikit';
+import {
+    Flex,
+    Select,
+    type SelectOptionProps,
+    type SelectProps,
+    Text,
+    getSelectOptionText,
+} from '@gravity-ui/uikit';
 import isString from 'lodash/isString';
 
 import type {JsonSchemaString, NodeEntity} from '../../../core';
@@ -53,7 +60,7 @@ export const SelectInput: NodeEntity<JsonSchemaString, SelectInputProps> = ({
 
                 if (optionMeta) {
                     content = (
-                        <Flex direction="column" gap="0.5">
+                        <Flex direction="column" gap="spacing-half">
                             {content}
                             <Text color="secondary" variant={settings?.textVariant}>
                                 {optionMeta}
@@ -62,22 +69,25 @@ export const SelectInput: NodeEntity<JsonSchemaString, SelectInputProps> = ({
                     );
                 }
 
-                return {value, text, content, key: value, data: {optionMeta}};
+                return {value, content, key: value, data: {optionMeta, text}};
             }),
         [enumDescriptions, optionsMeta, schema.enum, settings],
     );
 
     const renderOption: SelectProps['renderOption'] = React.useCallback(
-        (option: SelectOption) => (
-            <React.Fragment key={option.value}>
-                {option.content || option.text || option.value}
-            </React.Fragment>
+        (option: SelectOptionProps) => (
+            <React.Fragment key={option.value}>{option.content || option.value}</React.Fragment>
         ),
         [],
     );
 
+    const getOptionText: SelectProps['getOptionText'] = React.useCallback(
+        (option: SelectOptionProps) => option.data?.text ?? getSelectOptionText(option),
+        [],
+    );
+
     const getOptionHeight: SelectProps['getOptionHeight'] = React.useCallback(
-        (option: SelectOption) => {
+        (option: SelectOptionProps) => {
             let height = 28;
 
             if (settings?.size) {
@@ -114,6 +124,7 @@ export const SelectInput: NodeEntity<JsonSchemaString, SelectInputProps> = ({
                 filterable={(schema.enum?.length || 0) > 9}
                 renderOption={renderOption}
                 getOptionHeight={getOptionHeight}
+                getOptionText={getOptionText}
                 placeholder={schema.examples?.[0] || DASH}
                 disabled={disabled || schema.readOnly}
                 size={settings?.size}
diff --git a/src/lib/unstable/kit/form-entities/StringNumberWithScaleInput/StringNumberWithScaleInput.tsx b/src/lib/unstable/kit/form-entities/StringNumberWithScaleInput/StringNumberWithScaleInput.tsx
index 84fbd358..9528db5f 100644
--- a/src/lib/unstable/kit/form-entities/StringNumberWithScaleInput/StringNumberWithScaleInput.tsx
+++ b/src/lib/unstable/kit/form-entities/StringNumberWithScaleInput/StringNumberWithScaleInput.tsx
@@ -115,7 +115,7 @@ export const StringNumberWithScaleInput: NodeEntity<
             width="max"
             className={b({error: getBooleanValidationState(meta)})}
             direction="row"
-            gap={2}
+            gap="spacing-2"
         >
             <div className={b('input')}>
                 <TextInput
diff --git a/src/lib/unstable/kit/form-layouts/FormColumn/FormColumn.tsx b/src/lib/unstable/kit/form-layouts/FormColumn/FormColumn.tsx
index f0383a51..cca1f3fc 100644
--- a/src/lib/unstable/kit/form-layouts/FormColumn/FormColumn.tsx
+++ b/src/lib/unstable/kit/form-layouts/FormColumn/FormColumn.tsx
@@ -30,8 +30,8 @@ export const FormColumn: NodeLayout<JsonSchema, FormColumnProps> = ({
     const {hidden} = schema.nodeParameters?.flags || {};
 
     return (
-        <LayoutContainer className={b({size: settings?.size})} gap={1} hidden={hidden}>
-            <Flex direction="column" gap={0.5}>
+        <LayoutContainer className={b({size: settings?.size})} gap="spacing-1" hidden={hidden}>
+            <Flex direction="column" gap="spacing-half">
                 <Flex alignItems="center">
                     <div className={b('title')}>
                         <EntityTitle />
@@ -43,7 +43,7 @@ export const FormColumn: NodeLayout<JsonSchema, FormColumnProps> = ({
                 </Flex>
                 {descriptionType === 'bottom' ? <EntityDescription /> : null}
             </Flex>
-            <Flex className={b('bottom')} direction="column" gap={0.5}>
+            <Flex className={b('bottom')} direction="column" gap="spacing-half">
                 {children}
                 <EntityError />
             </Flex>
diff --git a/src/lib/unstable/kit/form-layouts/FormRow/FormRow.tsx b/src/lib/unstable/kit/form-layouts/FormRow/FormRow.tsx
index d1d6573d..58f99c64 100644
--- a/src/lib/unstable/kit/form-layouts/FormRow/FormRow.tsx
+++ b/src/lib/unstable/kit/form-layouts/FormRow/FormRow.tsx
@@ -32,7 +32,7 @@ export const FormRow: NodeLayout<JsonSchema, FormRowProps> = ({children, schema,
             className={b({size: settings?.size})}
             direction="row"
             alignItems="flex-start"
-            gap={2}
+            gap="spacing-2"
             hidden={hidden}
         >
             <div className={b('left')}>
@@ -41,8 +41,13 @@ export const FormRow: NodeLayout<JsonSchema, FormRowProps> = ({children, schema,
                     <EntityDescription className={b('help-mark')} likeHelpMark />
                 ) : null}
             </div>
-            <Flex className={b('right')} direction="column" gap={0.5} grow={1}>
-                <Flex className={b('right-content')} alignItems="center" grow={1} gap={2}>
+            <Flex className={b('right')} direction="column" gap="spacing-half" flexGrow={1}>
+                <Flex
+                    className={b('right-content')}
+                    alignItems="center"
+                    flexGrow={1}
+                    gap="spacing-2"
+                >
                     {children}
                     <LayoutButtons />
                 </Flex>
diff --git a/src/lib/unstable/kit/layouts/Accordeon/Accordeon.tsx b/src/lib/unstable/kit/layouts/Accordeon/Accordeon.tsx
index 1cc2d6cc..0a7f5c40 100644
--- a/src/lib/unstable/kit/layouts/Accordeon/Accordeon.tsx
+++ b/src/lib/unstable/kit/layouts/Accordeon/Accordeon.tsx
@@ -87,7 +87,7 @@ export const Accordeon: NodeLayout<JsonSchema, AccordeonProps> = ({
             >
                 <Disclosure.Summary>
                     {({expanded, onClick}, defaultSummary) => (
-                        <Flex alignItems="center" gap={2}>
+                        <Flex alignItems="center" gap="spacing-2">
                             {withDefaultSummary ? (
                                 defaultSummary
                             ) : (
@@ -108,7 +108,7 @@ export const Accordeon: NodeLayout<JsonSchema, AccordeonProps> = ({
                         </Flex>
                     )}
                 </Disclosure.Summary>
-                <Flex direction="column" gap={0.5} grow={1}>
+                <Flex direction="column" gap="spacing-half" flexGrow={1}>
                     <div className={b('content', {'with-indent': withIndent})}>{children}</div>
                     {overviewFlag ? null : <EntityError />}
                 </Flex>
diff --git a/src/lib/unstable/kit/layouts/Card/Card.tsx b/src/lib/unstable/kit/layouts/Card/Card.tsx
index 37332dc3..38434bb1 100644
--- a/src/lib/unstable/kit/layouts/Card/Card.tsx
+++ b/src/lib/unstable/kit/layouts/Card/Card.tsx
@@ -65,13 +65,17 @@ export const Card: NodeLayout<JsonSchema, CardProps> = ({
                 <div className={b('inner', {hidden: !expanded})}>
                     <Flex className={b('header')} direction="column" justifyContent="center">
                         <Flex justifyContent="space-between" alignItems="center">
-                            <Flex alignItems="center" gap={1}>
+                            <Flex alignItems="center" gap="spacing-1">
                                 <EntityTitle type="head" />
                                 {descriptionType === 'tooltip' ? (
                                     <EntityDescription className={b('help-mark')} likeHelpMark />
                                 ) : null}
                             </Flex>
-                            <Flex className={b('header-actions')} alignItems="center" gap={2}>
+                            <Flex
+                                className={b('header-actions')}
+                                alignItems="center"
+                                gap="spacing-2"
+                            >
                                 <LayoutButtons />
                                 {likeAccordeon ? (
                                     <Flex justifyContent="center">
diff --git a/src/lib/unstable/kit/layouts/Section/Section.tsx b/src/lib/unstable/kit/layouts/Section/Section.tsx
index 8c019730..53867ce9 100644
--- a/src/lib/unstable/kit/layouts/Section/Section.tsx
+++ b/src/lib/unstable/kit/layouts/Section/Section.tsx
@@ -37,14 +37,14 @@ export const Section: NodeLayout<JsonSchema, SectionProps> = ({children, mode, s
     return (
         <LayoutContainer
             className={b({size: settings?.size})}
-            gap={0.5}
+            gap="spacing-half"
             hideEmpty={overviewFlag}
             hidden={hidden}
         >
-            <Flex direction="column" gap={4}>
-                <Flex direction="column" gap={1}>
-                    <Flex className={b('header')} gap={2} alignItems="center">
-                        <Flex alignItems="center" gap={1}>
+            <Flex direction="column" gap="spacing-4">
+                <Flex direction="column" gap="spacing-1">
+                    <Flex className={b('header')} gap="spacing-2" alignItems="center">
+                        <Flex alignItems="center" gap="spacing-1">
                             <EntityTitle type="head" {...restLayoutProps} />
                             {descriptionType === 'tooltip' ? (
                                 <EntityDescription likeHelpMark />
diff --git a/src/lib/unstable/kit/layouts/Transparent/Transparent.tsx b/src/lib/unstable/kit/layouts/Transparent/Transparent.tsx
index 2d6e13e7..b7c1fcce 100644
--- a/src/lib/unstable/kit/layouts/Transparent/Transparent.tsx
+++ b/src/lib/unstable/kit/layouts/Transparent/Transparent.tsx
@@ -27,11 +27,11 @@ export const Transparent: NodeLayout<JsonSchema, TransparentProps> = ({
     return (
         <LayoutContainer
             className={b()}
-            gap={0.5}
+            gap="spacing-half"
             hideEmpty={isBoolean(props.hideEmpty) ? props.hideEmpty : overviewFlag}
             hidden={hidden}
         >
-            <Flex gap={2}>
+            <Flex gap="spacing-2">
                 {children}
                 <LayoutButtons />
             </Flex>
diff --git a/src/lib/unstable/kit/overview-entities/ColorPickerValue/ColorPickerValue.tsx b/src/lib/unstable/kit/overview-entities/ColorPickerValue/ColorPickerValue.tsx
index 2910198b..c02f07b7 100644
--- a/src/lib/unstable/kit/overview-entities/ColorPickerValue/ColorPickerValue.tsx
+++ b/src/lib/unstable/kit/overview-entities/ColorPickerValue/ColorPickerValue.tsx
@@ -25,7 +25,7 @@ export const ColorPickerValue: NodeEntity<JsonSchemaString, ColorPickerValueProp
             width="fit"
             fill="populated"
             direction="row"
-            gap={1}
+            gap="spacing-1"
             alignItems="center"
         >
             <LongValue
diff --git a/src/lib/unstable/kit/overview-entities/NumberWithScaleValue/NumberWithScaleValue.tsx b/src/lib/unstable/kit/overview-entities/NumberWithScaleValue/NumberWithScaleValue.tsx
index 27d5251d..4989910f 100644
--- a/src/lib/unstable/kit/overview-entities/NumberWithScaleValue/NumberWithScaleValue.tsx
+++ b/src/lib/unstable/kit/overview-entities/NumberWithScaleValue/NumberWithScaleValue.tsx
@@ -43,7 +43,7 @@ export const NumberWithScaleValue: NodeEntity<JsonSchemaNumber, NumberWithScaleV
     }
 
     return (
-        <EntityContainer width="fit" fill="populated" direction="row" gap={0.5}>
+        <EntityContainer width="fit" fill="populated" direction="row" gap="spacing-half">
             <LongValue
                 variant={settings?.textVariant}
                 {...restProps}
diff --git a/src/lib/unstable/kit/overview-entities/PrimitiveArrayValue/PrimitiveArrayValue.tsx b/src/lib/unstable/kit/overview-entities/PrimitiveArrayValue/PrimitiveArrayValue.tsx
index 23ef9aea..ba009898 100644
--- a/src/lib/unstable/kit/overview-entities/PrimitiveArrayValue/PrimitiveArrayValue.tsx
+++ b/src/lib/unstable/kit/overview-entities/PrimitiveArrayValue/PrimitiveArrayValue.tsx
@@ -33,7 +33,7 @@ export const PrimitiveArrayValue: NodeEntity<JsonSchemaArray, PrimitiveArrayValu
 
     if (direction === 'column') {
         return (
-            <EntityContainer width="fit" fill="populated" gap={0.5}>
+            <EntityContainer width="fit" fill="populated" gap="spacing-half">
                 {values.map((item, index) => (
                     <LongValue
                         variant={settings?.textVariant}
diff --git a/src/lib/unstable/kit/overview-entities/RangeValue/RangeValue.tsx b/src/lib/unstable/kit/overview-entities/RangeValue/RangeValue.tsx
index 00cfa5c0..759e9f9e 100644
--- a/src/lib/unstable/kit/overview-entities/RangeValue/RangeValue.tsx
+++ b/src/lib/unstable/kit/overview-entities/RangeValue/RangeValue.tsx
@@ -28,7 +28,13 @@ export const RangeValue: NodeEntity<JsonSchemaObject, RangeValueProps> = ({
     }
 
     return (
-        <EntityContainer width="fit" fill="populated" direction="row" gap={0.5} alignItems="center">
+        <EntityContainer
+            width="fit"
+            fill="populated"
+            direction="row"
+            gap="spacing-half"
+            alignItems="center"
+        >
             <LongValue
                 variant={settings?.textVariant}
                 {...restProps}
diff --git a/src/lib/unstable/kit/overview-entities/StringNumberWithScaleValue/StringNumberWithScaleValue.tsx b/src/lib/unstable/kit/overview-entities/StringNumberWithScaleValue/StringNumberWithScaleValue.tsx
index 2eeca067..4913189f 100644
--- a/src/lib/unstable/kit/overview-entities/StringNumberWithScaleValue/StringNumberWithScaleValue.tsx
+++ b/src/lib/unstable/kit/overview-entities/StringNumberWithScaleValue/StringNumberWithScaleValue.tsx
@@ -44,7 +44,7 @@ export const StringNumberWithScaleValue: NodeEntity<
     }
 
     return (
-        <EntityContainer width="fit" fill="populated" direction="row" gap={0.5}>
+        <EntityContainer width="fit" fill="populated" direction="row" gap="spacing-half">
             <LongValue
                 variant={settings?.textVariant}
                 {...restProps}
diff --git a/src/lib/unstable/kit/overview-layouts/OverviewColumn/OverviewColumn.tsx b/src/lib/unstable/kit/overview-layouts/OverviewColumn/OverviewColumn.tsx
index 5df355c9..692d5f49 100644
--- a/src/lib/unstable/kit/overview-layouts/OverviewColumn/OverviewColumn.tsx
+++ b/src/lib/unstable/kit/overview-layouts/OverviewColumn/OverviewColumn.tsx
@@ -17,15 +17,20 @@ export const OverviewColumn: NodeLayout<JsonSchema> = ({children, schema}) => {
     const {hidden} = schema.nodeParameters?.flags || {};
 
     return (
-        <LayoutContainer className={b({size: settings?.size})} gap={2} hidden={hidden} hideEmpty>
-            <Flex direction="column" gap={0.5} grow={1}>
+        <LayoutContainer
+            className={b({size: settings?.size})}
+            gap="spacing-2"
+            hidden={hidden}
+            hideEmpty
+        >
+            <Flex direction="column" gap="spacing-half" flexGrow={1}>
                 <div className={b('top')}>
                     <EntityTitle color="secondary" />
                     <EntityDescription className={b('help-mark')} likeHelpMark />
                 </div>
             </Flex>
-            <Flex className={b('bottom')} direction="column" gap={0.5} grow={1}>
-                <Flex grow={1} gap={2}>
+            <Flex className={b('bottom')} direction="column" gap="spacing-half" flexGrow={1}>
+                <Flex flexGrow={1} gap="spacing-2">
                     {children}
                     <LayoutButtons />
                 </Flex>
diff --git a/src/lib/unstable/kit/overview-layouts/OverviewRow/OverviewRow.tsx b/src/lib/unstable/kit/overview-layouts/OverviewRow/OverviewRow.tsx
index 25d7fa76..319c9c8e 100644
--- a/src/lib/unstable/kit/overview-layouts/OverviewRow/OverviewRow.tsx
+++ b/src/lib/unstable/kit/overview-layouts/OverviewRow/OverviewRow.tsx
@@ -21,7 +21,7 @@ export const OverviewRow: NodeLayout<JsonSchema> = ({children, schema}) => {
             className={b({size: settings?.size})}
             direction="row"
             alignItems="flex-start"
-            gap={2}
+            gap="spacing-2"
             hidden={hidden}
             hideEmpty
         >
@@ -30,8 +30,8 @@ export const OverviewRow: NodeLayout<JsonSchema> = ({children, schema}) => {
                 <EntityDescription className={b('help-mark')} likeHelpMark />
                 <div className={b('dots')} />
             </div>
-            <Flex className={b('right')} direction="column" gap={0.5} grow={1}>
-                <Flex grow={1} gap={2}>
+            <Flex className={b('right')} direction="column" gap="spacing-half" flexGrow={1}>
+                <Flex flexGrow={1} gap="spacing-2">
                     {children}
                     <LayoutButtons />
                 </Flex>
diff --git a/src/stories/StringColorPicker.stories.tsx b/src/stories/StringColorPicker.stories.tsx
index 0c4786b9..ef9378be 100644
--- a/src/stories/StringColorPicker.stories.tsx
+++ b/src/stories/StringColorPicker.stories.tsx
@@ -14,15 +14,8 @@ export default {
         docs: {
             description: {
                 component:
-                    'Color picker input for `StringSpec`. ' +
-                    '\n\n' +
-                    '> **Note:** this input wraps `unstable_ColorPicker` from ' +
-                    '`@gravity-ui/uikit/unstable`. The underlying uikit component is **unstable** — ' +
-                    'its API, available props and visual presentation may change between uikit ' +
-                    'releases without following semver. Pin the `@gravity-ui/uikit` version if you ' +
-                    'need a stable look-and-feel.' +
-                    '\n\n' +
-                    'See the [uikit ColorPicker docs](https://preview.gravity-ui.com/uikit/?path=/docs/lab-colorpicker--docs).',
+                    'Color picker input for `StringSpec`, using the stable `ColorPicker` ' +
+                    'from `@gravity-ui/uikit`.',
             },
         },
     },
diff --git a/src/stories/components/Editor/Editor.tsx b/src/stories/components/Editor/Editor.tsx
index f2dd8798..713d8722 100644
--- a/src/stories/components/Editor/Editor.tsx
+++ b/src/stories/components/Editor/Editor.tsx
@@ -155,7 +155,7 @@ export const Editor: React.FC<EditorProps> = ({spec: externalSpec, value, viewMo
                             ) : null}
                             {toggler === 'view' ? (
                                 <div className={b('input-view')}>
-                                    <Flex gap={1} spacing={{mb: 6}}>
+                                    <Flex gap="spacing-1" marginBlockEnd="spacing-6">
                                         <Text variant="body-2">
                                             Enable showLayoutDescription props
                                         </Text>
diff --git a/src/stories/components/EntityPreview/EntityPreview.tsx b/src/stories/components/EntityPreview/EntityPreview.tsx
index 40f8c72d..cc7ef440 100644
--- a/src/stories/components/EntityPreview/EntityPreview.tsx
+++ b/src/stories/components/EntityPreview/EntityPreview.tsx
@@ -67,7 +67,7 @@ const Example: React.FC<ExampleProps> = ({schema, submitOnMount, title, value})
     };
 
     return (
-        <Flex direction="column" gap="4" style={style}>
+        <Flex direction="column" gap="spacing-4" style={style}>
             <Text variant="subheader-3">{title}</Text>
             <Form
                 destroyOnUnregister
@@ -81,8 +81,8 @@ const Example: React.FC<ExampleProps> = ({schema, submitOnMount, title, value})
                     <React.Fragment>
                         {submitOnMount ? <SubmitOnMount /> : null}
                         <SyncViewValue value={get(values, `step.${SchemaRendererMode.Form}`)} />
-                        <Flex direction="column" gap="4">
-                            <Flex direction="column" gap="4">
+                        <Flex direction="column" gap="spacing-4">
+                            <Flex direction="column" gap="spacing-4">
                                 <Text variant="subheader-2">Form</Text>
                                 <SchemaRenderer
                                     config={config}
@@ -93,7 +93,7 @@ const Example: React.FC<ExampleProps> = ({schema, submitOnMount, title, value})
                                     validateOnBlur={false}
                                 />
                             </Flex>
-                            <Flex direction="column" gap="4">
+                            <Flex direction="column" gap="spacing-4">
                                 <Text variant="subheader-2">View</Text>
                                 <SchemaRenderer
                                     config={config}
@@ -104,7 +104,7 @@ const Example: React.FC<ExampleProps> = ({schema, submitOnMount, title, value})
                                     validateOnBlur={false}
                                 />
                             </Flex>
-                            <Flex direction="column" gap="4">
+                            <Flex direction="column" gap="spacing-4">
                                 <Text variant="subheader-2">Value</Text>
                                 <MonacoContainer
                                     height={getMonacoHeight(
@@ -177,7 +177,7 @@ export const EntityPreview: React.FC<EntityPreviewProps> = ({
                 alignItems="flex-start"
                 className={spacing({px: 4, pb: 4})}
                 direction="row"
-                gap="4"
+                gap="spacing-4"
                 maxWidth="100%"
             >
                 <Flex
@@ -203,7 +203,12 @@ export const EntityPreview: React.FC<EntityPreviewProps> = ({
                         />
                     </MonacoContainer>
                 </Flex>
-                <Flex direction="column" gap="4" grow maxWidth="calc(100% - 480px - (16px / 2))">
+                <Flex
+                    direction="column"
+                    gap="spacing-4"
+                    flexGrow={1}
+                    maxWidth="calc(100% - 480px - (16px / 2))"
+                >
                     <Example schema={schema} title="With correct value" value={correctValue} />
                     <Example
                         schema={schema}
diff --git a/tsconfig.json b/tsconfig.json
index 7eba7790..674afb08 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -9,7 +9,7 @@
     "paths": {
       "~playwright/*": ["playwright/*"],
       "@gravity-ui/dynamic-forms/unstable": ["./src/unstable.ts"],
-      "@gravity-ui/uikit/unstable": ["node_modules/@gravity-ui/uikit/build/esm/unstable"]
+      "@gravity-ui/uikit/legacy": ["node_modules/@gravity-ui/uikit/build/esm/legacy"]
     }
   }
 }
diff --git a/tsconfig.publish.json b/tsconfig.publish.json
index be7e2997..30874c5d 100644
--- a/tsconfig.publish.json
+++ b/tsconfig.publish.json
@@ -13,7 +13,7 @@
     "importHelpers": true,
     "paths": {
       "@gravity-ui/dynamic-forms/unstable": ["./src/unstable.ts"],
-      "@gravity-ui/uikit/unstable": ["node_modules/@gravity-ui/uikit/build/esm/unstable"]
+      "@gravity-ui/uikit/legacy": ["node_modules/@gravity-ui/uikit/build/esm/legacy"]
     }
   }
 }