diff --git a/packages/kbn-optimizer/limits.yml b/packages/kbn-optimizer/limits.yml
index 85434fe0f2b21..eb9782de27cad 100644
--- a/packages/kbn-optimizer/limits.yml
+++ b/packages/kbn-optimizer/limits.yml
@@ -31,7 +31,7 @@ pageLoadAssetSize:
   dataUsage: 30000
   dataViewEditor: 28082
   dataViewFieldEditor: 42021
-  dataViewManagement: 5370
+  dataViewManagement: 5500
   dataViews: 65000
   dataVisualizer: 30000
   devTools: 38637
diff --git a/packages/kbn-ui-shared-deps-npm/webpack.config.js b/packages/kbn-ui-shared-deps-npm/webpack.config.js
index 6fe4c6849f402..7e9fb94cf7de4 100644
--- a/packages/kbn-ui-shared-deps-npm/webpack.config.js
+++ b/packages/kbn-ui-shared-deps-npm/webpack.config.js
@@ -63,12 +63,12 @@ module.exports = (_, argv) => {
         '@elastic/charts',
         '@elastic/eui',
         '@elastic/eui/optimize/es/components/provider/nested',
-        '@elastic/eui/optimize/es/services',
-        '@elastic/eui/optimize/es/services/format',
+        '@elastic/eui/optimize/es/services/theme/warning',
         '@elastic/eui/dist/eui_theme_amsterdam_light.json',
         '@elastic/eui/dist/eui_theme_amsterdam_dark.json',
         '@elastic/eui/dist/eui_theme_borealis_light.json',
         '@elastic/eui/dist/eui_theme_borealis_dark.json',
+        '@elastic/eui-theme-borealis',
         '@elastic/numeral',
         '@emotion/cache',
         '@emotion/react',
diff --git a/packages/kbn-ui-shared-deps-src/src/definitions.js b/packages/kbn-ui-shared-deps-src/src/definitions.js
index 3e66e5a102f06..a7786bf3556a5 100644
--- a/packages/kbn-ui-shared-deps-src/src/definitions.js
+++ b/packages/kbn-ui-shared-deps-src/src/definitions.js
@@ -75,8 +75,7 @@ const externals = {
   '@elastic/eui': '__kbnSharedDeps__.ElasticEui',
   '@elastic/eui/lib/components/provider/nested':
     '__kbnSharedDeps__.ElasticEuiLibComponentsUseIsNestedEuiProvider',
-  '@elastic/eui/lib/services': '__kbnSharedDeps__.ElasticEuiLibServices',
-  '@elastic/eui/lib/services/format': '__kbnSharedDeps__.ElasticEuiLibServicesFormat',
+  '@elastic/eui/lib/services/theme/warning': '__kbnSharedDeps__.ElasticEuiLibServicesThemeWarning',
   '@elastic/eui-theme-borealis': '__kbnSharedDeps__.ElasticEuiThemeBorealis',
 
   // transient dep of eui
diff --git a/packages/kbn-ui-shared-deps-src/src/entry.js b/packages/kbn-ui-shared-deps-src/src/entry.js
index 1d7e6442e29d0..f30f75f7bd5af 100644
--- a/packages/kbn-ui-shared-deps-src/src/entry.js
+++ b/packages/kbn-ui-shared-deps-src/src/entry.js
@@ -41,10 +41,9 @@ export const Rxjs = require('rxjs');
 export const ElasticNumeral = require('@elastic/numeral');
 export const ElasticCharts = require('@elastic/charts');
 export const ElasticEui = require('@elastic/eui');
-export const ElasticEuiThemeBorealis = require('@elastic/eui-theme-borealis');
 export const ElasticEuiLibComponentsUseIsNestedEuiProvider = require('@elastic/eui/optimize/es/components/provider/nested');
-export const ElasticEuiLibServices = require('@elastic/eui/optimize/es/services');
-export const ElasticEuiLibServicesFormat = require('@elastic/eui/optimize/es/services/format');
+export const ElasticEuiLibServicesThemeWarning = require('@elastic/eui/optimize/es/services/theme/warning');
+export const ElasticEuiThemeBorealis = require('@elastic/eui-theme-borealis');
 export const KbnDatemath = require('@kbn/datemath');
 export const HelloPangeaDnd = require('@hello-pangea/dnd/dist/dnd');
 export const ReduxjsToolkit = require('@reduxjs/toolkit');
diff --git a/packages/kbn-ui-shared-deps-src/webpack.config.js b/packages/kbn-ui-shared-deps-src/webpack.config.js
index 26eac38c3060c..a1ee7dbf768e1 100644
--- a/packages/kbn-ui-shared-deps-src/webpack.config.js
+++ b/packages/kbn-ui-shared-deps-src/webpack.config.js
@@ -109,6 +109,9 @@ module.exports = {
     extensions: ['.js', '.ts', '.tsx'],
     alias: {
       '@elastic/eui$': '@elastic/eui/optimize/es',
+      '@elastic/eui/lib/components/provider/nested$':
+        '@elastic/eui/optimize/es/components/provider/nested',
+      '@elastic/eui/lib/services/theme/warning$': '@elastic/eui/optimize/es/services/theme/warning',
       moment: MOMENT_SRC,
       // NOTE: Used to include react profiling on bundles
       // https://gist.github.com/bvaughn/25e6233aeb1b4f0cdb8d8366e54a3977#webpack-4