diff --git a/packages/docusaurus-theme/changelogs/upcoming/9090.md b/packages/docusaurus-theme/changelogs/upcoming/9090.md
new file mode 100644
index 00000000000..f224636cbd9
--- /dev/null
+++ b/packages/docusaurus-theme/changelogs/upcoming/9090.md
@@ -0,0 +1,5 @@
+- Added `HighContrastModeToggle` component and adds it as main navbar item
+
+**Breaking changes**
+
+- Removed `ThemeSwitcher` component
\ No newline at end of file
diff --git a/packages/docusaurus-theme/src/components/high_contrast_mode_toggle/index.tsx b/packages/docusaurus-theme/src/components/high_contrast_mode_toggle/index.tsx
new file mode 100644
index 00000000000..77724568307
--- /dev/null
+++ b/packages/docusaurus-theme/src/components/high_contrast_mode_toggle/index.tsx
@@ -0,0 +1,28 @@
+import { useContext } from 'react';
+import { useEuiTheme } from '@elastic/eui';
+
+import { NavbarItem } from '../navbar_item';
+import { AppThemeContext } from '../theme_context';
+
+export const HighContrastModeToggle = () => {
+  const euiThemeContext = useEuiTheme();
+
+  const appContext = useContext(AppThemeContext);
+  const { changeHighContrastMode } = appContext;
+
+  const isForcedContrastMode = euiThemeContext.highContrastMode === 'forced';
+  const _highContrastMode =
+    appContext.highContrastMode && !isForcedContrastMode
+      ? appContext.highContrastMode
+      : euiThemeContext.highContrastMode;
+
+  return (
+    <NavbarItem
+      title={'Toggle high contrast mode'}
+      icon="contrast"
+      isMenuItem={false}
+      isSelected={!!_highContrastMode}
+      onClick={() => changeHighContrastMode(!_highContrastMode)}
+    />
+  );
+};
diff --git a/packages/docusaurus-theme/src/components/navbar_item/index.tsx b/packages/docusaurus-theme/src/components/navbar_item/index.tsx
index c4adaea68d2..c61cbbf857f 100644
--- a/packages/docusaurus-theme/src/components/navbar_item/index.tsx
+++ b/packages/docusaurus-theme/src/components/navbar_item/index.tsx
@@ -14,6 +14,7 @@ import {
   EuiIcon,
   ExclusiveUnion,
   IconType,
+  mathWithUnits,
   PropsForAnchor,
   PropsForButton,
   useEuiMemoizedStyles,
@@ -26,6 +27,7 @@ type SharedProps = {
   icon: IconType;
   showLabel?: boolean;
   isMenuItem?: boolean;
+  isSelected?: boolean;
 } & CommonProps;
 
 type Props = ExclusiveUnion<
@@ -44,8 +46,7 @@ export const getStyles = ({ euiTheme }: UseEuiTheme) => ({
     transition: background var(--ifm-transition-fast);
 
     &:hover {
-      background-color: ${euiTheme.components.buttons
-        .backgroundTextHover};
+      background-color: ${euiTheme.components.buttons.backgroundTextHover};
       color: currentColor;
     }
   `,
@@ -74,6 +75,10 @@ export const getStyles = ({ euiTheme }: UseEuiTheme) => ({
   disabled: css`
     cursor: not-allowed;
   `,
+  selected: css`
+    background-color: ${euiTheme.colors.backgroundFilledText};
+    color: ${euiTheme.colors.textInverse};
+  `,
   title: css`
     @media (min-width: 997px) {
       display: none;
@@ -97,6 +102,8 @@ export const NavbarItem = (props: Props) => {
     target,
     showLabel,
     isMenuItem = true,
+    isSelected,
+    css,
   } = props;
 
   const isBrowser = useIsBrowser();
@@ -109,6 +116,7 @@ export const NavbarItem = (props: Props) => {
     styles.item,
     isMenuItem ? styles.menuItem : styles.navItem,
     !isBrowser && styles.disabled,
+    isSelected && styles.selected,
     isDarkMode && styles.darkMode,
   ];
 
@@ -148,6 +156,7 @@ export const NavbarItem = (props: Props) => {
       title={title}
       aria-label={title}
       aria-live="polite"
+      aria-pressed={isSelected != null ? isSelected : undefined}
     >
       {content}
     </button>
diff --git a/packages/docusaurus-theme/src/components/theme_context/index.tsx b/packages/docusaurus-theme/src/components/theme_context/index.tsx
index b459db9fa51..40ccb53493f 100644
--- a/packages/docusaurus-theme/src/components/theme_context/index.tsx
+++ b/packages/docusaurus-theme/src/components/theme_context/index.tsx
@@ -11,19 +11,15 @@ import {
   FunctionComponent,
   PropsWithChildren,
   useContext,
-  useLayoutEffect,
+  useEffect,
   useState,
 } from 'react';
 import useIsBrowser from '@docusaurus/useIsBrowser';
 import createCache from '@emotion/cache';
 import { CacheProvider } from '@emotion/react';
-import {
-  EUI_THEME,
-  EuiProvider,
-  EuiThemeAmsterdam,
-  EuiThemeColorMode,
-} from '@elastic/eui';
+import { EuiProvider, EuiThemeColorMode } from '@elastic/eui';
 import { EuiThemeBorealis } from '@elastic/eui-theme-borealis';
+import { type EUI_THEME } from '@elastic/eui-theme-common';
 
 import { EuiThemeOverrides } from './theme_overrides';
 
@@ -33,11 +29,6 @@ export const AVAILABLE_THEMES: EUI_THEME[] = [
     value: EuiThemeBorealis.key,
     provider: EuiThemeBorealis,
   },
-  {
-    text: 'Amsterdam',
-    value: EuiThemeAmsterdam.key,
-    provider: EuiThemeAmsterdam,
-  },
 ];
 
 const EUI_COLOR_MODES = ['light', 'dark'] as const;
@@ -105,18 +96,22 @@ export const AppThemeProvider: FunctionComponent<PropsWithChildren> = ({
   });
 
   const [highContrastMode, setHighContrastMode] = useState<boolean | undefined>(
-    () => {
-      if (isBrowser) {
-        return localStorage.getItem('highContrastMode')
-          ? localStorage.getItem('highContrastMode') === 'true'
-          : defaultState.highContrastMode;
-      }
-
-      return defaultState.highContrastMode;
-    }
+    false
   );
 
-  const [theme, setTheme] = useState(defaultState.theme);
+  const getHighContrastModeSetting = () => {
+    return localStorage?.getItem('highContrastMode')
+      ? localStorage?.getItem('highContrastMode') === 'true'
+      : defaultState.highContrastMode;
+  };
+
+  useEffect(() => {
+    if (isBrowser) {
+      setHighContrastMode(getHighContrastModeSetting());
+    }
+  }, [isBrowser]);
+
+  const [theme, setTheme] = useState<EUI_THEME>(defaultState.theme);
 
   const handleChangeTheme = (themeValue: string) => {
     const matchedTheme = AVAILABLE_THEMES.find((t) => t.value === themeValue);
diff --git a/packages/docusaurus-theme/src/components/theme_switcher/index.tsx b/packages/docusaurus-theme/src/components/theme_switcher/index.tsx
deleted file mode 100644
index 184b87b52f6..00000000000
--- a/packages/docusaurus-theme/src/components/theme_switcher/index.tsx
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import { useContext, useEffect, useState } from 'react';
-import { css } from '@emotion/react';
-import {
-  EuiAvatar,
-  EuiButtonEmpty,
-  euiFocusRing,
-  EuiListGroup,
-  EuiListGroupItem,
-  EuiPopover,
-  EuiPopoverFooter,
-  EuiSwitch,
-  EuiSwitchEvent,
-  useEuiMemoizedStyles,
-  useEuiTheme,
-  UseEuiTheme,
-} from '@elastic/eui';
-
-import { AppThemeContext, AVAILABLE_THEMES } from '../theme_context';
-
-const getStyles = (euiThemeContext: UseEuiTheme) => {
-  const { euiTheme } = euiThemeContext;
-
-  return {
-    button: css`
-      padding: 0;
-      width: ${euiTheme.size.xl};
-      border-radius: ${euiTheme.size.base};
-    `,
-    listItem: css`
-      .euiListGroupItem__button:focus-visible {
-        // overriding the global "outset" style to ensure the focus style is not cut off
-        ${euiFocusRing(euiThemeContext, 'inset', {
-          color: euiTheme.colors.primary,
-        })};
-      }
-    `,
-  };
-};
-
-export const ThemeSwitcher = () => {
-  const euiThemeContext = useEuiTheme();
-  const { euiTheme } = euiThemeContext;
-
-  const [currentTheme, setCurrentTheme] = useState(
-    AVAILABLE_THEMES[0]?.value ?? ''
-  );
-  const [isPopoverOpen, setPopoverOpen] = useState(false);
-  const appContext = useContext(AppThemeContext);
-  const { theme, changeTheme, changeHighContrastMode } = appContext;
-
-  const isForcedContrastMode = euiThemeContext.highContrastMode === 'forced';
-  const _highContrastMode =
-    appContext.colorMode && !isForcedContrastMode
-      ? appContext.highContrastMode
-      : euiThemeContext.highContrastMode;
-
-  useEffect(() => {
-    changeTheme(currentTheme);
-  }, [currentTheme]);
-
-  const styles = useEuiMemoizedStyles(getStyles);
-
-  const button = (
-    <EuiButtonEmpty
-      size="s"
-      color="text"
-      css={styles.button}
-      onClick={() => setPopoverOpen((isOpen) => !isOpen)}
-      aria-label={`${theme.text} theme`}
-    >
-      <EuiAvatar name={theme.text} size="s" color={euiTheme.colors.primary} />
-    </EuiButtonEmpty>
-  );
-
-  return (
-    <EuiPopover
-      isOpen={isPopoverOpen}
-      closePopover={() => setPopoverOpen(false)}
-      button={button}
-      panelPaddingSize="none"
-      repositionOnScroll
-      aria-label="EUI theme list"
-    >
-      <EuiListGroup>
-        {AVAILABLE_THEMES &&
-          AVAILABLE_THEMES.map((theme) => {
-            const isCurrentTheme = currentTheme === theme.value;
-
-            const handleOnClick = () => {
-              setCurrentTheme(theme.value);
-            };
-
-            return (
-              <EuiListGroupItem
-                key={theme.value}
-                css={styles.listItem}
-                label={theme.text}
-                size="s"
-                isActive={isCurrentTheme}
-                color={isCurrentTheme ? 'primary' : 'text'}
-                onClick={handleOnClick}
-              />
-            );
-          })}
-      </EuiListGroup>
-      <EuiPopoverFooter paddingSize="s">
-        <EuiSwitch
-          compressed
-          label="High contrast"
-          checked={!!_highContrastMode}
-          onChange={(e: EuiSwitchEvent) => {
-            changeHighContrastMode(!_highContrastMode);
-          }}
-          disabled={isForcedContrastMode}
-        />
-      </EuiPopoverFooter>
-    </EuiPopover>
-  );
-};
diff --git a/packages/docusaurus-theme/src/theme/EditThisPage/index.tsx b/packages/docusaurus-theme/src/theme/EditThisPage/index.tsx
index 48ef067912f..cc1191b0059 100644
--- a/packages/docusaurus-theme/src/theme/EditThisPage/index.tsx
+++ b/packages/docusaurus-theme/src/theme/EditThisPage/index.tsx
@@ -10,10 +10,12 @@ import { JSX } from 'react';
 import { css } from '@emotion/react';
 import Translate from '@docusaurus/Translate';
 import type { Props } from '@theme-original/EditThisPage';
-import { EuiButton, useEuiMemoizedStyles, UseEuiTheme } from '@elastic/eui';
-// @ts-ignore - eui only has module declarations for '@elastic/eui/src/themes/amsterdam/global_styling/mixins/button'
-// but importing from /src results in "Module not found" error
-import { euiButtonColor } from '@elastic/eui/lib/global_styling/mixins/_button';
+import {
+  EuiButton,
+  euiButtonColor,
+  useEuiMemoizedStyles,
+  UseEuiTheme,
+} from '@elastic/eui';
 
 const getStyles = (theme: UseEuiTheme) => {
   const buttonColor = euiButtonColor(theme, 'primary');
diff --git a/packages/docusaurus-theme/src/theme/Navbar/Content/index.tsx b/packages/docusaurus-theme/src/theme/Navbar/Content/index.tsx
index 06543be3b7b..7885bdd763c 100644
--- a/packages/docusaurus-theme/src/theme/Navbar/Content/index.tsx
+++ b/packages/docusaurus-theme/src/theme/Navbar/Content/index.tsx
@@ -39,7 +39,7 @@ import {
   VersionSwitcher,
   VersionSwitcherProps,
 } from '../../../components/version_switcher';
-import { ThemeSwitcher } from '../../../components/theme_switcher';
+import { HighContrastModeToggle } from '../../../components/high_contrast_mode_toggle';
 
 const DOCS_PATH = '/docs';
 
@@ -248,13 +248,12 @@ export default function NavbarContent({
               </NavbarSearch>
             )}
             <NavbarColorModeToggle className="colorModeToggle" />
-            <NavbarItems items={rightItems} />
-
             {isBrowser && (
               <div css={styles.themeSwitcher}>
-                <ThemeSwitcher />
+                <HighContrastModeToggle />
               </div>
             )}
+            <NavbarItems items={rightItems} />
           </>
         }
       />
diff --git a/packages/docusaurus-theme/src/theme/Navbar/MobileSidebar/Header/index.tsx b/packages/docusaurus-theme/src/theme/Navbar/MobileSidebar/Header/index.tsx
index b9c1ac16f09..68c7c3e6a52 100644
--- a/packages/docusaurus-theme/src/theme/Navbar/MobileSidebar/Header/index.tsx
+++ b/packages/docusaurus-theme/src/theme/Navbar/MobileSidebar/Header/index.tsx
@@ -15,11 +15,11 @@ import { EuiIcon, useEuiMemoizedStyles, UseEuiTheme } from '@elastic/eui';
 import { css } from '@emotion/react';
 import useIsBrowser from '@docusaurus/useIsBrowser';
 
-import { ThemeSwitcher } from '../../../../components/theme_switcher';
 import {
   VersionSwitcher,
   VersionSwitcherProps,
 } from '../../../../components/version_switcher';
+import { HighContrastModeToggle } from '../../../../components/high_contrast_mode_toggle';
 
 const getStyles = ({ euiTheme }: UseEuiTheme) => ({
   sidebar: css`
@@ -81,8 +81,8 @@ export default function NavbarMobileSidebarHeader({
       {isBrowser && versionSwitcherOptions && (
         <VersionSwitcher {...versionSwitcherOptions} />
       )}
-      {isBrowser && <ThemeSwitcher />}
       <NavbarColorModeToggle />
+      {isBrowser && <HighContrastModeToggle />}
       <CloseButton />
     </div>
   );
diff --git a/packages/eui-theme-borealis/.stylelintrc.js b/packages/eui-theme-borealis/.stylelintrc.js
index 42adc41f28c..b459d263d1b 100644
--- a/packages/eui-theme-borealis/.stylelintrc.js
+++ b/packages/eui-theme-borealis/.stylelintrc.js
@@ -70,12 +70,6 @@ module.exports = {
     {
       // TODO: Remove Sass-specific config & rules once we're completely off Sass
       files: ['**/*.scss'],
-      ignoreFiles: [
-        'generator-eui/**/*.scss',
-        'src/global_styling/react_date_picker/**/*.scss',
-        'src/themes/amsterdam/global_styling/react_date_picker/**/*.scss',
-        'src/components/date_picker/react-datepicker/**/*.scss',
-      ],
       extends: [
         'stylelint-config-standard-scss',
         'stylelint-config-prettier-scss',
diff --git a/packages/eui-theme-borealis/changelogs/upcoming/9090.md b/packages/eui-theme-borealis/changelogs/upcoming/9090.md
new file mode 100644
index 00000000000..f7adca891b1
--- /dev/null
+++ b/packages/eui-theme-borealis/changelogs/upcoming/9090.md
@@ -0,0 +1,6 @@
+**Breaking changes**
+
+- Removed `euiTheme.flags.hasGlobalFocusColor`
+- Removed `euiTheme.flags.hasVisColorAdjustment`
+- Removed `euiTheme.flags.buttonVariant` and `euiTheme.flags.formVariant`
+- Removed `euiTheme.components.keyPadMenuItemBackgroundDisabledSelect`
diff --git a/packages/eui-theme-borealis/src/index.ts b/packages/eui-theme-borealis/src/index.ts
index eff55ca8ed7..0cbeea36a0a 100644
--- a/packages/eui-theme-borealis/src/index.ts
+++ b/packages/eui-theme-borealis/src/index.ts
@@ -40,10 +40,6 @@ export const euiThemeBorealis: EuiThemeShape = {
   focus,
   components,
   flags: {
-    hasGlobalFocusColor: true,
-    hasVisColorAdjustment: false,
-    buttonVariant: 'refresh',
-    formVariant: 'refresh',
     shadowVariant: 'refresh',
   },
   overrides,
diff --git a/packages/eui-theme-borealis/src/variables/_buttons.ts b/packages/eui-theme-borealis/src/variables/_buttons.ts
index 60fea4089b2..0ec6e438259 100644
--- a/packages/eui-theme-borealis/src/variables/_buttons.ts
+++ b/packages/eui-theme-borealis/src/variables/_buttons.ts
@@ -6,30 +6,9 @@
  * Side Public License, v 1.
  */
 
-import {
-  _EuiThemeButton,
-  EuiThemeVariantFlags,
-  ColorModeSwitch,
-  computed,
-} from '@elastic/eui-theme-common';
+import { _EuiThemeButton, computed } from '@elastic/eui-theme-common';
 import { SEMANTIC_COLORS } from './colors/_semantic_colors';
 
-const getTokenByVariant = (
-  buttonVariant: EuiThemeVariantFlags['buttonVariant'],
-  tokens: {
-    classic: ColorModeSwitch;
-    refresh: ColorModeSwitch;
-  }
-) => {
-  switch (buttonVariant) {
-    case 'refresh':
-      return tokens.refresh;
-    default: {
-      return tokens.classic;
-    }
-  }
-};
-
 const _buttons = {
   backgroundPrimary: computed(
     ([backgroundLightPrimary]) => backgroundLightPrimary,
@@ -64,17 +43,8 @@ const _buttons = {
     ['colors.backgroundLightDanger']
   ),
   backgroundText: computed(
-    ([buttonVariant, backgroundBasePlain, backgroundLightText]) => {
-      return getTokenByVariant(buttonVariant, {
-        refresh: backgroundBasePlain,
-        classic: backgroundLightText,
-      });
-    },
-    [
-      'flags.buttonVariant',
-      'colors.backgroundBasePlain',
-      'colors.backgroundLightText',
-    ]
+    ([backgroundBasePlain]) => backgroundBasePlain,
+    ['colors.backgroundBasePlain']
   ),
   backgroundDisabled: computed(
     ([backgroundBaseDisabled]) => backgroundBaseDisabled,
diff --git a/packages/eui-theme-borealis/src/variables/_components.ts b/packages/eui-theme-borealis/src/variables/_components.ts
index c9891724df3..e95f39b40be 100644
--- a/packages/eui-theme-borealis/src/variables/_components.ts
+++ b/packages/eui-theme-borealis/src/variables/_components.ts
@@ -206,11 +206,6 @@ const component_colors: _EuiThemeComponentColors = {
   headerDarkSectionItemBackgroundFocus:
     dark_background_colors.backgroundBasePrimary,
 
-  keyPadMenuItemBackgroundDisabledSelect: computed(
-    ([backgroundBaseDisabled]) => backgroundBaseDisabled,
-    ['colors.backgroundBaseDisabled']
-  ),
-
   listGroupItemBackgroundPrimaryActive: computed(
     ([backgroundBaseInteractiveSelect]) => backgroundBaseInteractiveSelect,
     ['colors.backgroundBaseInteractiveSelect']
diff --git a/packages/eui-theme-common/.stylelintrc.js b/packages/eui-theme-common/.stylelintrc.js
index 42adc41f28c..b459d263d1b 100644
--- a/packages/eui-theme-common/.stylelintrc.js
+++ b/packages/eui-theme-common/.stylelintrc.js
@@ -70,12 +70,6 @@ module.exports = {
     {
       // TODO: Remove Sass-specific config & rules once we're completely off Sass
       files: ['**/*.scss'],
-      ignoreFiles: [
-        'generator-eui/**/*.scss',
-        'src/global_styling/react_date_picker/**/*.scss',
-        'src/themes/amsterdam/global_styling/react_date_picker/**/*.scss',
-        'src/components/date_picker/react-datepicker/**/*.scss',
-      ],
       extends: [
         'stylelint-config-standard-scss',
         'stylelint-config-prettier-scss',
diff --git a/packages/eui-theme-common/changelogs/upcoming/9090.md b/packages/eui-theme-common/changelogs/upcoming/9090.md
new file mode 100644
index 00000000000..fb434c2ca3f
--- /dev/null
+++ b/packages/eui-theme-common/changelogs/upcoming/9090.md
@@ -0,0 +1,14 @@
+**Breaking changes**
+
+- Removed `euiTheme.flags.hasGlobalFocusColor`
+- Removed `euiTheme.flags.hasVisColorAdjustment`
+- Removed `hasVisColorAdjustment` argument from `EuiVisColorStore`
+- Removed `euiTheme.flags.buttonVariant` and `euiTheme.flags.formVariant`
+- Removed type for `euiTheme.components.keyPadMenuItemBackgroundDisabledSelect`
+- Removed outdated component-specific mixin SCSS files:
+  - `src/global_styling/mixins/_button.scss`
+  - `src/global_styling/mixins/_form.scss`
+  - `src/global_styling/mixins/_link.scss`
+  - `src/global_styling/mixins/_loading.scss`
+  - `src/global_styling/mixins/_panel.scss`
+  - `src/global_styling/mixins/_range.scss`
diff --git a/packages/eui-theme-common/src/global_styling/mixins/_button.scss b/packages/eui-theme-common/src/global_styling/mixins/_button.scss
deleted file mode 100644
index 47c87b6e742..00000000000
--- a/packages/eui-theme-common/src/global_styling/mixins/_button.scss
+++ /dev/null
@@ -1,149 +0,0 @@
-// Provides a solid reset and base for handling sizing layout
-// Does not include any visual styles
-@mixin euiButtonBase {
-  display: inline-block;
-  appearance: none;
-  cursor: pointer;
-  height: $euiButtonHeight;
-  line-height: $euiButtonHeight; // prevents descenders from getting cut off
-  text-align: center;
-  white-space: nowrap;
-  max-width: 100%;
-  vertical-align: middle;
-}
-
-// Adds the focus (and hover) animation for translating up 1px
-@mixin euiButtonFocus {
-  @include euiCanAnimate {
-    transition: transform $euiAnimSpeedNormal ease-in-out, background-color $euiAnimSpeedNormal ease-in-out;
-
-    &:hover:not(:disabled) {
-      transform: translateY(-1px);
-    }
-
-    &:focus {
-      animation: euiButtonActive $euiAnimSpeedNormal $euiAnimSlightBounce;
-    }
-
-    &:active:not(:disabled) {
-      transform: translateY(1px);
-    }
-  }
-}
-
-// All of the button base styles including the base, focus, font, and initial styles
-// Does not include individual alterations like color or sizes
-@mixin euiButton {
-  @include euiButtonBase;
-  @include euiFont;
-  @include euiFontSize;
-  @include euiButtonFocus;
-
-  font-weight: $euiButtonFontWeight;
-  text-decoration: none;
-  outline-offset: -1px;
-
-  &:hover:not(:disabled),
-  &:focus {
-    text-decoration: underline;
-  }
-}
-
-// Correctly lays out the contents of a button when using the proper dom elements of:
-// <button>
-//   <span className="__content">
-//     {icon/spinner}
-//     {child}
-//   </span>
-// </button>
-// 1. Apply margin to all but last item in the flex.
-// 2. Margin gets flipped because of the row-reverse.
-@mixin euiButtonContent($isReverse: false) {
-  height: 100%;
-  width: 100%;
-  vertical-align: middle;
-
-  .euiButtonContent__icon,
-  .euiButtonContent__spinner {
-    flex-shrink: 0; // Ensures the icons/spinner don't scale down below their intended size
-  }
-
-  @if ($isReverse) {
-    flex-direction: row-reverse;
-
-    > * + * {
-      margin-inline-start: 0; // 1, 2
-      margin-inline-end: $euiSizeS; // 1, 2
-    }
-  } @else {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-
-    > * + * {
-      margin-inline-start: $euiSizeS; // 1
-    }
-  }
-}
-
-@mixin euiButtonContentDisabled {
-  pointer-events: auto;
-  cursor: not-allowed;
-
-  &:hover,
-  &:focus,
-  &:focus-within {
-    text-decoration: none;
-  }
-
-  .euiButtonContent__spinner {
-    border-color: euiLoadingSpinnerBorderColors(currentColor);
-  }
-}
-
-/*
- * Creates the Amsterdam style of button with a transparent background
- */
-@mixin euiButtonDefaultStyle($color: 'primary', $includeStates: true, $transparency: $euiButtonDefaultTransparency) {
-  $backgroundColor: $color;
-
-  @if (map-has-key($euiButtonTypes, $color)) {
-    $backgroundColor: map-get($euiButtonTypes, $color);
-  }
-
-  $percentConversion: $transparency * 100%;
-  // This variable simulates the possibly darkest background the button could be on
-  // Simulates the 20% opaque color on top of the page background color
-  $backgroundColorSimulated: mix($euiPageBackgroundColor, $backgroundColor, $percentConversion);
-  // Then we can calculate the darkest text color needed
-  color: makeHighContrastColor($backgroundColor, $backgroundColorSimulated);
-  // But still use transparency
-  background-color: transparentize($backgroundColor, $transparency);
-
-  @if ($includeStates) {
-    &:not([class*='isDisabled']) {
-      &:hover,
-      &:focus {
-        // Duplicated from inert state simply to override default theme
-        background-color: transparentize($backgroundColor, $transparency);
-      }
-    }
-  }
-}
-
-/*
- * Creates the Amsterdam style of fill button
- */
-@mixin euiButtonFillStyle($color: 'primary') {
-  $backgroundColor: $color;
-
-  @if (map-has-key($euiButtonTypes, $color)) {
-    $backgroundColor: map-get($euiButtonTypes, $color);
-  }
-
-  background-color: $backgroundColor;
-  color: chooseLightOrDarkText($backgroundColor);
-}
-
-// Keyframe animation declarations can be found in
-// utility/animations.scss
diff --git a/packages/eui-theme-common/src/global_styling/mixins/_form.scss b/packages/eui-theme-common/src/global_styling/mixins/_form.scss
deleted file mode 100644
index 14efe32ce43..00000000000
--- a/packages/eui-theme-common/src/global_styling/mixins/_form.scss
+++ /dev/null
@@ -1,272 +0,0 @@
-@mixin euiFormControlLayoutPadding($numOfIcons, $side: 'right', $compressed: false) {
-  $iconSize: $euiSize;
-  $iconPadding: $euiFormControlPadding;
-  $marginBetweenIcons: $euiFormControlPadding / 2;
-
-  @if ($compressed) {
-    $iconPadding: $euiFormControlCompressedPadding;
-  }
-
-  @if variable-exists(numOfIcons) == false {
-    @error '$numOfIcons:integer (1-3) must be provided to @mixin euiFormControlLayoutPadding().';
-  } @else if $numOfIcons == 1 {
-    padding-#{$side}: $iconPadding + $iconSize + $iconPadding;
-  } @else if $numOfIcons == 2 {
-    padding-#{$side}: $iconPadding + $iconSize + $marginBetweenIcons + $iconSize + $iconPadding;
-  } @else if $numOfIcons == 3 {
-    padding-#{$side}: $iconPadding + $iconSize + $marginBetweenIcons + $iconSize + $marginBetweenIcons + $iconSize + $iconPadding;
-  }
-}
-
-@mixin euiPlaceholderPerBrowser {
-  // stylelint-disable selector-no-vendor-prefix
-  // Each prefix must be its own content block
-  &::-webkit-input-placeholder { @content; opacity: 1; }
-  &::-moz-placeholder { @content; opacity: 1; }
-  &:-moz-placeholder { @content; opacity: 1; }
-  &::placeholder { @content; opacity: 1; }
-}
-
-@function euiFormControlGradient($color: $euiColorPrimary) {
-  @return linear-gradient(to top,
-    $color,
-    $color 2px,
-    transparent 2px,
-    transparent 100%
-  );
-}
-
-@mixin euiFormControlText {
-  @include euiFont;
-  font-size: $euiFontSizeS;
-  color: $euiColorTextParagraph;
-
-  @include euiPlaceholderPerBrowser {
-    color: $euiFormControlPlaceholderText;
-  }
-}
-
-@mixin euiFormControlSize(
-  $height: $euiFormControlHeight,
-  $includeAlternates: false
-) {
-  // Default
-  max-width: $euiFormMaxWidth;
-  width: 100%;
-  height: $height;
-
-  @if ($includeAlternates) {
-    &--fullWidth {
-      max-width: 100%;
-    }
-
-    &--compressed {
-      height: $euiFormControlCompressedHeight;
-    }
-
-    &--inGroup {
-      height: 100%;
-    }
-  }
-}
-
-@mixin euiFormControlWithIcon($isIconOptional: false, $side: 'left', $compressed: false) {
-  @if ($isIconOptional) {
-    @at-root {
-      #{&}--withIcon {
-        @include euiFormControlLayoutPadding(1, $side, $compressed);
-      }
-    }
-  } @else {
-    @include euiFormControlLayoutPadding(1, $side, $compressed);
-  }
-}
-
-@mixin euiFormControlIsLoading($isNextToIcon: false) {
-  @at-root {
-    #{&}-isLoading {
-      @if ($isNextToIcon) {
-        @include euiFormControlLayoutPadding(2);
-      } @else {
-        @include euiFormControlLayoutPadding(1);
-      }
-    }
-
-    #{&}-isLoading#{&}--compressed {
-      @if ($isNextToIcon) {
-        @include euiFormControlLayoutPadding(2, $compressed: true);
-      } @else {
-        @include euiFormControlLayoutPadding(1, $compressed: true);
-      }
-    }
-  }
-}
-
-// 1. Must supply both values to background-size or some browsers apply the single value to both directions
-
-@mixin euiFormControlDefaultShadow($borderOnly: false) {
-  background-color: $euiFormBackgroundColor;
-  background-repeat: no-repeat;
-  background-size: 0% 100%; // 1
-
-  @if ($borderOnly) {
-    box-shadow: inset 0 0 0 1px $euiFormBorderColor;
-  } @else {
-    box-shadow:
-      #{$euiFormControlBoxShadow},
-      inset 0 0 0 1px $euiFormBorderColor;
-  }
-
-  transition:
-    box-shadow $euiAnimSpeedFast ease-in,
-    background-image $euiAnimSpeedFast ease-in,
-    background-size $euiAnimSpeedFast ease-in,
-    background-color $euiAnimSpeedFast ease-in;
-
-  // Fixes bug in Firefox where adding a transition to the background-color
-  // caused a flash of differently styled dropdown.
-  @supports (-moz-appearance: none) {
-    // List *must* be in the same order as the above.
-    transition-property: box-shadow, background-image, background-size;
-  }
-}
-
-@mixin euiFormControlFocusStyle($borderOnly: false) {
-  background-color: tintOrShade($euiColorEmptyShade, 0%, 40%);
-  background-image: euiFormControlGradient();
-  background-size: 100% 100%; // 1
-  outline: none; // Blanket remove all outlines relying on our own bottom border
-
-  @if ($borderOnly) {
-    box-shadow: inset 0 0 0 1px $euiFormBorderColor;
-  } @else {
-    box-shadow: inset 0 0 0 1px $euiFormBorderColor;
-  }
-}
-
-@mixin euiFormControlInvalidStyle {
-  background-image: euiFormControlGradient($euiColorDanger);
-  background-size: 100%;
-}
-
-@mixin euiFormControlDisabledTextStyle {
-  color: $euiFormControlDisabledColor;
-  -webkit-text-fill-color: $euiFormControlDisabledColor; // Required for Safari
-}
-
-@mixin euiFormControlDisabledStyle {
-  @include euiFormControlDisabledTextStyle;
-  cursor: not-allowed;
-  background: $euiFormBackgroundDisabledColor;
-  box-shadow: inset 0 0 0 1px $euiFormBorderDisabledColor;
-
-  @include euiPlaceholderPerBrowser {
-    color: $euiFormControlDisabledColor;
-  }
-}
-
-@mixin euiFormControlReadOnlyStyle {
-  cursor: default;
-  color: $euiColorTextParagraph;
-  -webkit-text-fill-color: $euiColorTextParagraph; // Required for Safari
-  // Use transparency since there is no border and in case form is on a non-white background
-  background: $euiFormBackgroundReadOnlyColor;
-  border-color: transparent;
-  box-shadow: inset 0 0 0 1px $euiFormBorderDisabledColor;
-}
-
-// 2. Override invalid state with focus state.
-
-@mixin euiFormControlStyle($borderOnly: false, $includeStates: true, $includeSizes: true) {
-  @include euiFormControlSize($includeAlternates: $includeSizes);
-  @include euiFormControlDefaultShadow;
-  @include euiFormControlText;
-
-  border: none;
-  border-radius: $euiFormControlBorderRadius;
-  padding: $euiFormControlPadding;
-
-  @if ($includeStates) {
-    &:invalid { // 2
-      @include euiFormControlInvalidStyle;
-    }
-
-    &:focus { // 2
-      @include euiFormControlFocusStyle;
-    }
-
-    &:disabled {
-      @include euiFormControlDisabledStyle;
-    }
-
-    &[readOnly] {
-      @include euiFormControlReadOnlyStyle;
-    }
-
-    // Needs to be set for autofill
-    &:-webkit-autofill {
-      -webkit-text-fill-color: lightOrDarkTheme($euiColorDarkestShade, $euiColorLightShade);
-
-      ~ .euiFormControlLayoutIcons {
-        color: lightOrDarkTheme($euiColorDarkestShade, $euiColorLightShade);
-      }
-    }
-  }
-
-  @if ($includeSizes) {
-    &--compressed {
-      @include euiFormControlStyleCompressed($borderOnly, $includeStates);
-    }
-
-    &--inGroup {
-      // stylelint-disable-next-line declaration-no-important
-      box-shadow: none !important;
-      border-radius: 0;
-    }
-  }
-}
-
-@mixin euiFormControlStyleCompressed($borderOnly: false, $includeStates: true) {
-  @include euiFormControlDefaultShadow($borderOnly: true);
-  padding: $euiFormControlCompressedPadding;
-  border-radius: $euiFormControlCompressedBorderRadius;
-
-  @if ($includeStates) {
-    &:invalid { // 2
-      @include euiFormControlInvalidStyle;
-    }
-
-    &:focus { // 2
-      @include euiFormControlFocusStyle($borderOnly: true);
-    }
-
-    &:disabled {
-      @include euiFormControlDisabledStyle;
-    }
-
-    &[readOnly] {
-      @include euiFormControlReadOnlyStyle;
-    }
-  }
-}
-
-@mixin euiHiddenSelectableInput {
-  position: absolute;
-  // stylelint-disable-next-line declaration-no-important
-  opacity: 0 !important; // Make sure it's still hidden when :disabled
-  width: 100%;
-  height: 100%;
-  cursor: pointer;
-}
-
-// Adjusts form controls border radius
-@mixin euiFormControlSideBorderRadius($borderRadius, $side, $internal: false) {
-  @if $internal == true {
-    $borderRadius: $borderRadius - 1;
-  }
-  @if $side == 'left' {
-    border-radius: $borderRadius 0 0 $borderRadius;
-  } @else if $side == 'right' {
-    border-radius: 0 $borderRadius $borderRadius 0;
-  }
-}
diff --git a/packages/eui-theme-common/src/global_styling/mixins/_index.scss b/packages/eui-theme-common/src/global_styling/mixins/_index.scss
index b570d0e1607..9447c0caacd 100644
--- a/packages/eui-theme-common/src/global_styling/mixins/_index.scss
+++ b/packages/eui-theme-common/src/global_styling/mixins/_index.scss
@@ -4,10 +4,4 @@
 @import 'helpers';
 @import 'states';
 
-@import 'button';
-@import 'form';
-@import 'loading';
-@import 'link';
-@import 'panel';
-@import 'range';
 @import 'tool_tip';
diff --git a/packages/eui-theme-common/src/global_styling/mixins/_link.scss b/packages/eui-theme-common/src/global_styling/mixins/_link.scss
deleted file mode 100644
index 98dac59b9cc..00000000000
--- a/packages/eui-theme-common/src/global_styling/mixins/_link.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-@mixin euiLink {
-  text-align: left;
-
-  &:hover {
-    text-decoration: underline;
-  }
-
-  &:focus {
-    text-decoration: underline;
-  }
-}
diff --git a/packages/eui-theme-common/src/global_styling/mixins/_loading.scss b/packages/eui-theme-common/src/global_styling/mixins/_loading.scss
deleted file mode 100644
index 0f72a8433f7..00000000000
--- a/packages/eui-theme-common/src/global_styling/mixins/_loading.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-@function euiLoadingSpinnerBorderColors(
-  $main: $euiColorLightShade,
-  $highlight: $euiColorPrimary
-) {
-  @return $highlight $main $main $main;
-}
diff --git a/packages/eui-theme-common/src/global_styling/mixins/_panel.scss b/packages/eui-theme-common/src/global_styling/mixins/_panel.scss
deleted file mode 100644
index 4eb0a5fb55a..00000000000
--- a/packages/eui-theme-common/src/global_styling/mixins/_panel.scss
+++ /dev/null
@@ -1,55 +0,0 @@
-@mixin euiPanel($selector) {
-  @if variable-exists(selector) == false {
-    @error 'A $selector must be provided to @mixin euiPanel().';
-  } @else {
-    #{$selector} {
-      flex-grow: 1;
-
-      &#{$selector}--flexGrowZero {
-        flex-grow: 0;
-      }
-
-      &#{$selector}--hasShadow {
-        @include euiBottomShadowMedium;
-      }
-
-      &#{$selector}--hasBorder {
-        border: $euiBorderThin;
-        box-shadow: none;
-      }
-
-      &#{$selector}--isClickable {
-        // transition the shadow
-        transition: all $euiAnimSpeedFast $euiAnimSlightResistance;
-
-        &:enabled { // This is a good selector for buttons since it doesn't exist on divs
-          // in case of button wrapper which inherently is inline-block and no width
-          display: block;
-          width: 100%;
-          text-align: left;
-        }
-
-        &:hover,
-        &:focus {
-          @include euiBottomShadow;
-          transform: translateY(-2px);
-          cursor: pointer;
-        }
-      }
-
-      // Border Radii
-      @each $modifier, $amount in $euiPanelBorderRadiusModifiers {
-        &#{$selector}--#{$modifier} {
-          border-radius: $amount;
-        }
-      }
-
-      // Background colors
-      @each $modifier, $amount in $euiPanelBackgroundColorModifiers {
-        &#{$selector}--#{$modifier} {
-          background-color: $amount;
-        }
-      }
-    }
-  }
-}
diff --git a/packages/eui-theme-common/src/global_styling/mixins/_range.scss b/packages/eui-theme-common/src/global_styling/mixins/_range.scss
deleted file mode 100644
index 5396d4d1a19..00000000000
--- a/packages/eui-theme-common/src/global_styling/mixins/_range.scss
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-The CSS in JS version of this file lives in:
-  - src/components/form/range/range.styles.ts
-
-The following files still use the Sass version:
-  - src/themes/amsterdam/overrides/_color_stops.scss
-  - src/themes/amsterdam/overrides/_hue.scss
-*/
-
-@mixin euiRangeTrackSize($compressed: false) {
-  height: $euiRangeTrackHeight;
-  width: $euiRangeTrackWidth;
-
-  @if ($compressed) {
-    height: $euiRangeTrackCompressedHeight;
-  }
-}
-
-@mixin euiRangeTrackPerBrowser {
-  &::-webkit-slider-runnable-track { @content; }
-  &::-moz-range-track { @content; }
-}
-
-@mixin euiRangeThumbBorder {
-  border: 2px solid $euiRangeThumbBorderColor;
-}
-
-@mixin euiRangeThumbBoxShadow {
-  box-shadow:
-    0 0 0 1px $euiRangeThumbBorderColor,
-    0 2px 2px -1px rgba($euiShadowColor, .2),
-    0 1px 5px -2px rgba($euiShadowColor, .2);
-}
-
-@mixin euiRangeThumbFocusBoxShadow {
-  box-shadow: 0 0 0 2px $euiFocusRingColor;
-}
-
-@mixin euiRangeThumbStyle {
-  @include euiRangeThumbBoxShadow;
-  @include euiRangeThumbBorder;
-  cursor: pointer;
-  background-color: $euiRangeThumbBackgroundColor;
-  padding: 0;
-  height: $euiRangeThumbHeight;
-  width: $euiRangeThumbWidth;
-  box-sizing: border-box;  // required for firefox or the border makes the width and height to increase
-}
-
-@mixin euiRangeThumbPerBrowser {
-  &::-webkit-slider-thumb { @content; }
-  &::-moz-range-thumb { @content; }
-}
-
-@mixin euiRangeThumbFocus {
-  @include euiRangeThumbBorder;
-  @include euiRangeThumbFocusBoxShadow;
-  background-color: $euiColorPrimary;
-}
diff --git a/packages/eui-theme-common/src/global_styling/mixins/_states.scss b/packages/eui-theme-common/src/global_styling/mixins/_states.scss
index a2d1bc83aef..48e16aba6cb 100644
--- a/packages/eui-theme-common/src/global_styling/mixins/_states.scss
+++ b/packages/eui-theme-common/src/global_styling/mixins/_states.scss
@@ -1,4 +1,4 @@
-@mixin euiFocusRing($size: 'small', $amsterdamOnlyProp: null) {
+@mixin euiFocusRing($size: 'small') {
   @if $size == 'large' {
     // It's always OK to use the focus animation. This will take precedence over times we turn it off individually like EuiButtonEmpty
     // stylelint-disable-next-line declaration-no-important
diff --git a/packages/eui-theme-common/src/global_styling/mixins/shadow.ts b/packages/eui-theme-common/src/global_styling/mixins/shadow.ts
index 652f704a245..b4dafa2f3c3 100644
--- a/packages/eui-theme-common/src/global_styling/mixins/shadow.ts
+++ b/packages/eui-theme-common/src/global_styling/mixins/shadow.ts
@@ -158,7 +158,6 @@ export const euiSlightShadowHover = (
 /**
  * @deprecated - use euiShadowXSmall instead
  *
- * Remains for backwards compatibility for the Amsterdam theme.
  * Similar to shadow medium but without the bottom depth.
  * Useful for popovers that drop UP rather than DOWN.
  */
diff --git a/packages/eui-theme-common/src/global_styling/variables/borders.ts b/packages/eui-theme-common/src/global_styling/variables/borders.ts
index 4c7b7ba3fa5..084ad6b616d 100644
--- a/packages/eui-theme-common/src/global_styling/variables/borders.ts
+++ b/packages/eui-theme-common/src/global_styling/variables/borders.ts
@@ -25,7 +25,7 @@ export interface _EuiThemeBorderWidthValues {
 export interface _EuiThemeBorderRadiusValues {
   /**
    * Primary corner radius size
-   * - Default value: 4px (6px in Amsterdam)
+   * - Default value: 4px
    */
   medium: CSSProperties['borderRadius'];
   /**
diff --git a/packages/eui-theme-common/src/global_styling/variables/components.ts b/packages/eui-theme-common/src/global_styling/variables/components.ts
index cf8ef16ec52..ab9a4ab100a 100644
--- a/packages/eui-theme-common/src/global_styling/variables/components.ts
+++ b/packages/eui-theme-common/src/global_styling/variables/components.ts
@@ -91,8 +91,6 @@ export type _EuiThemeComponentColors = {
   flyoutFooterBackground: ColorModeSwitch;
   flyoutCloseButtonInsideBackground: ColorModeSwitch;
 
-  keyPadMenuItemBackgroundDisabledSelect: ColorModeSwitch;
-
   listGroupItemBackgroundPrimaryActive: ColorModeSwitch;
   listGroupItemBackgroundSubduedActive: ColorModeSwitch;
   listGroupItemBackgroundHover: ColorModeSwitch;
diff --git a/packages/eui-theme-common/src/global_styling/variables/flags.ts b/packages/eui-theme-common/src/global_styling/variables/flags.ts
index b9118c0382f..cf5506270d7 100644
--- a/packages/eui-theme-common/src/global_styling/variables/flags.ts
+++ b/packages/eui-theme-common/src/global_styling/variables/flags.ts
@@ -7,15 +7,10 @@
  */
 
 export type EuiThemeVariantFlags = {
-  buttonVariant: 'classic' | 'refresh';
-  formVariant: 'classic' | 'refresh';
   shadowVariant: 'classic' | 'refresh';
 };
 
 /**
  * Theme specific setting flags
  */
-export type _EuiThemeFlags = {
-  hasGlobalFocusColor: boolean;
-  hasVisColorAdjustment: boolean;
-} & EuiThemeVariantFlags;
+export type _EuiThemeFlags = EuiThemeVariantFlags;
diff --git a/packages/eui-theme-common/src/services/theme/types.ts b/packages/eui-theme-common/src/services/theme/types.ts
index f417c1d9b3b..3d377682323 100644
--- a/packages/eui-theme-common/src/services/theme/types.ts
+++ b/packages/eui-theme-common/src/services/theme/types.ts
@@ -134,3 +134,9 @@ export interface UseEuiTheme<T extends {} = {}> {
   highContrastMode: EuiThemeHighContrastMode;
   modifications: EuiThemeModifications<T>;
 }
+
+export interface EUI_THEME {
+  text: string;
+  value: string;
+  provider?: EuiThemeSystem;
+}
diff --git a/packages/eui-theme-common/src/services/vis_color_store.test.ts b/packages/eui-theme-common/src/services/vis_color_store.test.ts
index 6405d4e26e2..5e1a31e7a5e 100644
--- a/packages/eui-theme-common/src/services/vis_color_store.test.ts
+++ b/packages/eui-theme-common/src/services/vis_color_store.test.ts
@@ -16,7 +16,7 @@ const visColors: _EuiThemeVisColors = {
 } as _EuiThemeVisColors;
 
 describe('EuiVisColorStore', () => {
-  const visColorStore = EuiVisColorStore.getInstance(visColors, false);
+  const visColorStore = EuiVisColorStore.getInstance(visColors);
   let updateFn: jest.Mock;
 
   beforeEach(() => {
@@ -42,12 +42,6 @@ describe('EuiVisColorStore', () => {
 
       expect(visColorStore.visColors).toEqual(customColors);
     });
-
-    it('updates hasVisColorAdjustment', () => {
-      visColorStore.setVisColors(customColors, true);
-
-      expect(visColorStore.hasVisColorAdjustment).toEqual(true);
-    });
   });
 
   describe('subcribe and unsubscribe', () => {
diff --git a/packages/eui-theme-common/src/services/vis_color_store.ts b/packages/eui-theme-common/src/services/vis_color_store.ts
index 57c6d3d62b4..4c46b25b735 100644
--- a/packages/eui-theme-common/src/services/vis_color_store.ts
+++ b/packages/eui-theme-common/src/services/vis_color_store.ts
@@ -19,50 +19,30 @@ type EventId = string;
 
 export type _EuiVisColorStore = {
   visColors: _EuiThemeVisColors;
-  hasVisColorAdjustment: boolean;
-  setVisColors: (
-    colors: _EuiThemeVisColors,
-    hasVisColorAdjustment?: boolean
-  ) => void;
+  setVisColors: (colors: _EuiThemeVisColors) => void;
   subscribe: (eventName: VisColorStoreEvents, callback: any) => EventId;
   unsubscribe: (eventName: VisColorStoreEvents, id: EventId) => void;
 };
 
 class EuiVisColorStoreImpl implements _EuiVisColorStore {
   private _visColors: _EuiVisColorStore['visColors'];
-  private _hasVisColorAdjustment: _EuiVisColorStore['hasVisColorAdjustment'];
   private events: Record<VisColorStoreEvents, Map<EventId, any>> = {} as Record<
     VisColorStoreEvents,
     Map<EventId, any>
   >;
 
-  constructor(dependencies: {
-    defaultColors: _EuiThemeVisColors;
-    hasVisColorAdjustment: boolean;
-  }) {
+  constructor(dependencies: { defaultColors: _EuiThemeVisColors }) {
     this._visColors = dependencies.defaultColors;
-    this._hasVisColorAdjustment = dependencies.hasVisColorAdjustment;
   }
 
   get visColors(): _EuiVisColorStore['visColors'] {
     return this._visColors;
   }
 
-  get hasVisColorAdjustment(): _EuiVisColorStore['hasVisColorAdjustment'] {
-    return this._hasVisColorAdjustment;
-  }
-
-  setVisColors = (colors: _EuiThemeVisColors, hasColorAdjustment?: boolean) => {
-    if (
-      !isEqual(this._visColors, colors) ||
-      hasColorAdjustment !== this._hasVisColorAdjustment
-    ) {
+  setVisColors = (colors: _EuiThemeVisColors) => {
+    if (!isEqual(this._visColors, colors)) {
       this._visColors = colors;
 
-      if (hasColorAdjustment != null) {
-        this._hasVisColorAdjustment = hasColorAdjustment;
-      }
-
       this.publishUpdate(VIS_COLOR_STORE_EVENTS.UPDATE, this._visColors);
     }
   };
@@ -101,14 +81,10 @@ class EuiVisColorStoreImpl implements _EuiVisColorStore {
 export class EuiVisColorStore {
   private static instance: EuiVisColorStoreImpl;
 
-  static getInstance(
-    defaultColors: _EuiThemeVisColors,
-    hasVisColorAdjustment: boolean
-  ): EuiVisColorStoreImpl {
+  static getInstance(defaultColors: _EuiThemeVisColors): EuiVisColorStoreImpl {
     if (!this.instance) {
       this.instance = new EuiVisColorStoreImpl({
         defaultColors,
-        hasVisColorAdjustment,
       });
     }
 
diff --git a/packages/eui/.loki/reference/chrome_desktop_Forms_EuiFilterButton_Full_Width_And_Grow.png b/packages/eui/.loki/reference/chrome_desktop_Forms_EuiFilterButton_Full_Width_And_Grow.png
index 5e57dee5cee..a4d5c344cb8 100644
Binary files a/packages/eui/.loki/reference/chrome_desktop_Forms_EuiFilterButton_Full_Width_And_Grow.png and b/packages/eui/.loki/reference/chrome_desktop_Forms_EuiFilterButton_Full_Width_And_Grow.png differ
diff --git a/packages/eui/.loki/reference/chrome_desktop_Forms_EuiFilterButton_High_Contrast.png b/packages/eui/.loki/reference/chrome_desktop_Forms_EuiFilterButton_High_Contrast.png
index 0255fb288dc..9c8628ad45e 100644
Binary files a/packages/eui/.loki/reference/chrome_desktop_Forms_EuiFilterButton_High_Contrast.png and b/packages/eui/.loki/reference/chrome_desktop_Forms_EuiFilterButton_High_Contrast.png differ
diff --git a/packages/eui/.loki/reference/chrome_mobile_Forms_EuiFilterButton_Full_Width_And_Grow.png b/packages/eui/.loki/reference/chrome_mobile_Forms_EuiFilterButton_Full_Width_And_Grow.png
index 93c33e61692..db339c60c53 100644
Binary files a/packages/eui/.loki/reference/chrome_mobile_Forms_EuiFilterButton_Full_Width_And_Grow.png and b/packages/eui/.loki/reference/chrome_mobile_Forms_EuiFilterButton_Full_Width_And_Grow.png differ
diff --git a/packages/eui/.loki/reference/chrome_mobile_Forms_EuiFilterButton_High_Contrast.png b/packages/eui/.loki/reference/chrome_mobile_Forms_EuiFilterButton_High_Contrast.png
index d950fa5b9d8..5bf5ca6690a 100644
Binary files a/packages/eui/.loki/reference/chrome_mobile_Forms_EuiFilterButton_High_Contrast.png and b/packages/eui/.loki/reference/chrome_mobile_Forms_EuiFilterButton_High_Contrast.png differ
diff --git a/packages/eui/.storybook/decorator.tsx b/packages/eui/.storybook/decorator.tsx
index 3a6cf087e96..da63a69fb78 100644
--- a/packages/eui/.storybook/decorator.tsx
+++ b/packages/eui/.storybook/decorator.tsx
@@ -19,7 +19,6 @@ import { EuiThemeBorealis } from '@elastic/eui-theme-borealis';
 
 import { EuiThemeColorMode } from '../src/services';
 import { EuiProvider, EuiProviderProps } from '../src/components/provider';
-import { EuiThemeAmsterdam } from '../src/themes';
 
 export const AVAILABLE_THEMES = [
   {
@@ -27,11 +26,6 @@ export const AVAILABLE_THEMES = [
     value: EuiThemeBorealis.key,
     provider: EuiThemeBorealis,
   },
-  {
-    text: 'Amsterdam',
-    value: EuiThemeAmsterdam.key,
-    provider: EuiThemeAmsterdam,
-  },
 ];
 
 /**
@@ -181,16 +175,4 @@ export const euiProviderDecoratorGlobals: Preview['globalTypes'] = {
       dynamicTitle: true,
     },
   },
-  theme: {
-    description: 'Theme for EuiProvider',
-    defaultValue: EuiThemeBorealis.key,
-    toolbar: {
-      title: 'Theme',
-      items: [
-        { value: EuiThemeBorealis.key, title: 'Borealis', icon: 'box' },
-        { value: EuiThemeAmsterdam.key, title: 'Amsterdam', icon: 'box' },
-      ],
-      dynamicTitle: true,
-    },
-  },
 };
diff --git a/packages/eui/.stylelintrc.js b/packages/eui/.stylelintrc.js
index 3c973578d39..2ef13e7aef9 100644
--- a/packages/eui/.stylelintrc.js
+++ b/packages/eui/.stylelintrc.js
@@ -73,7 +73,6 @@ module.exports = {
       ignoreFiles: [
         'generator-eui/**/*.scss',
         'src/global_styling/react_date_picker/**/*.scss',
-        'src/themes/amsterdam/global_styling/react_date_picker/**/*.scss',
         'src/components/date_picker/react-datepicker/**/*.scss',
       ],
       extends: [
diff --git a/packages/eui/changelogs/upcoming/9090.md b/packages/eui/changelogs/upcoming/9090.md
new file mode 100644
index 00000000000..34e0c52a406
--- /dev/null
+++ b/packages/eui/changelogs/upcoming/9090.md
@@ -0,0 +1,10 @@
+**Breaking changes**
+
+- Removed all "Amsterdam" theme related code in `src/themes/amsterdam` - EUI now only supports the "Borealis" theme in `eui-theme-borealis`
+- Removed `euiTheme.flags.hasGlobalFocusColor`
+- Removed `euiTheme.flags.hasVisColorAdjustment`
+- Removed `hasVisColorAdjustment` argument from color palettes (used in `euiPaletteColorBlindBehindText`, `euiPaletteForTemperature`, `euiPaletteComplementary`, `euiPaletteCool`)
+- Removed `euiTheme.flags.buttonVariant` and `euiTheme.flags.formVariant`
+- Removed `euiTheme.components.keyPadMenuItemBackgroundDisabledSelect`
+- Removed legacy SCSS files from `src/global_styling/variables`, `src/global_styling/mixins` and `src/global_styling/functions` - if needed, use them from `eui-theme-common` instead
+
diff --git a/packages/eui/package.json b/packages/eui/package.json
index 8e9f526d16d..a344f971645 100644
--- a/packages/eui/package.json
+++ b/packages/eui/package.json
@@ -19,8 +19,7 @@
     "build:workspaces": "yarn workspaces foreach -Rti --from @elastic/eui-theme-common run build && yarn workspaces foreach -Rti --from @elastic/eui --exclude @elastic/eui --exclude @elastic/eui-theme-common run build",
     "build:clean": "rimraf dist lib es optimize test-env eui.d.ts",
     "build:i18ntokens": "node ./scripts/build_i18ntokens.mjs",
-    "build:copy-assets": "node ./scripts/build_copy_assets.js",
-    "build": "yarn build:clean && yarn build:i18ntokens && node ./scripts/compile-eui.js && yarn build:copy-assets",
+    "build": "yarn build:clean && yarn build:i18ntokens && node ./scripts/compile-eui.js",
     "build-pack": "yarn build && yarn pack",
     "compile-icons": "node ./scripts/compile-icons.js && prettier --write --loglevel=warn \"./src/components/icon/assets/**/*.tsx\"",
     "lint": "yarn tsc --noEmit && yarn lint-es && yarn lint-css-in-js && yarn lint-sass",
diff --git a/packages/eui/scripts/build_copy_assets.js b/packages/eui/scripts/build_copy_assets.js
deleted file mode 100755
index d6cfa898a5d..00000000000
--- a/packages/eui/scripts/build_copy_assets.js
+++ /dev/null
@@ -1,31 +0,0 @@
-const { copyFile: copyFilePromise } = require('fs/promises');
-
-const chalk = require('chalk');
-
-const copyFile = async (source, destination) => {
-  await copyFilePromise(source, destination);
-  console.log(
-    chalk`{green ✔} Copied {gray ${source}} to {gray ${destination}}`
-  );
-};
-
-const copyFiles = () => Promise.all([
-  copyFile('src/themes/json/eui_theme_amsterdam_dark.json', 'dist/eui_theme_amsterdam_dark.json'),
-  copyFile('src/themes/json/eui_theme_amsterdam_dark.json.d.ts', 'dist/eui_theme_amsterdam_dark.json.d.ts'),
-
-  copyFile('src/themes/json/eui_theme_amsterdam_light.json', 'dist/eui_theme_amsterdam_light.json'),
-  copyFile('src/themes/json/eui_theme_amsterdam_light.json.d.ts', 'dist/eui_theme_amsterdam_light.json.d.ts'),
-
-  /* TODO: temp files only, remove once imports from theme package work as expected */
-  copyFile('src/themes/json/eui_theme_borealis_dark.json', 'dist/eui_theme_borealis_dark.json'),
-  copyFile('src/themes/json/eui_theme_borealis_dark.json.d.ts', 'dist/eui_theme_borealis_dark.json.d.ts'),
-
-  copyFile('src/themes/json/eui_theme_borealis_light.json', 'dist/eui_theme_borealis_light.json'),
-  copyFile('src/themes/json/eui_theme_borealis_light.json.d.ts', 'dist/eui_theme_borealis_light.json.d.ts'),
-]);
-
-copyFiles().catch((err) => {
-  console.error('Failed to copy assets');
-  console.error(err);
-  process.exit(1);
-});
diff --git a/packages/eui/src/components/badge/beta_badge/beta_badge.styles.ts b/packages/eui/src/components/badge/beta_badge/beta_badge.styles.ts
index 1ce81ad3100..0c92cfd73e3 100644
--- a/packages/eui/src/components/badge/beta_badge/beta_badge.styles.ts
+++ b/packages/eui/src/components/badge/beta_badge/beta_badge.styles.ts
@@ -26,8 +26,6 @@ export const euiBetaBadgeStyles = (euiThemeContext: UseEuiTheme) => {
     s: mathWithUnits(euiTheme.size.base, (x) => x * 1.25),
   };
 
-  const hasVisColorAdjustment = euiTheme.flags?.hasVisColorAdjustment;
-
   return {
     euiBetaBadge: css`
       display: inline-block;
@@ -49,9 +47,7 @@ export const euiBetaBadgeStyles = (euiThemeContext: UseEuiTheme) => {
       }
     `,
     // Colors
-    accent: hasVisColorAdjustment
-      ? css(badgeColors.accentText)
-      : css(badgeColors.accent),
+    accent: css(badgeColors.accent),
     subdued: css(badgeColors.subdued),
     hollow: css`
       color: ${badgeColors.hollow.color};
diff --git a/packages/eui/src/components/badge/notification_badge/badge_notification.styles.ts b/packages/eui/src/components/badge/notification_badge/badge_notification.styles.ts
index 76f708ee5d1..f7cb94b6353 100644
--- a/packages/eui/src/components/badge/notification_badge/badge_notification.styles.ts
+++ b/packages/eui/src/components/badge/notification_badge/badge_notification.styles.ts
@@ -15,20 +15,17 @@ import {
   mathWithUnits,
 } from '../../../global_styling';
 import { highContrastModeStyles } from '../../../global_styling/functions/high_contrast';
-import { isEuiThemeRefreshVariant, UseEuiTheme } from '../../../services';
+import { UseEuiTheme } from '../../../services';
 import { euiBadgeColors } from '../color_utils';
 
 export const euiNotificationBadgeStyles = (euiThemeContext: UseEuiTheme) => {
   const { euiTheme } = euiThemeContext;
-  const isRefreshVariant = isEuiThemeRefreshVariant(
-    euiThemeContext,
-    'buttonVariant'
-  );
 
   const badgeColors = euiBadgeColors(euiThemeContext);
-  const borderRadius = isRefreshVariant
-    ? mathWithUnits(euiTheme.border.radius.small, (x) => x / 2)
-    : euiTheme.border.radius.small;
+  const borderRadius = mathWithUnits(
+    euiTheme.border.radius.small,
+    (x) => x / 2
+  );
 
   return {
     euiNotificationBadge: css`
diff --git a/packages/eui/src/components/button/button_display/_button_display.styles.ts b/packages/eui/src/components/button/button_display/_button_display.styles.ts
index fd0d5dfbd36..947c6a83715 100644
--- a/packages/eui/src/components/button/button_display/_button_display.styles.ts
+++ b/packages/eui/src/components/button/button_display/_button_display.styles.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 import { css } from '@emotion/react';
-import { isEuiThemeRefreshVariant, UseEuiTheme } from '../../../services';
+import { UseEuiTheme } from '../../../services';
 import {
   euiFontSize,
   logicalCSS,
@@ -32,10 +32,6 @@ export const euiButtonBaseCSS = () => {
 
 export const euiButtonDisplayStyles = (euiThemeContext: UseEuiTheme) => {
   const { euiTheme } = euiThemeContext;
-  const isRefreshVariant = isEuiThemeRefreshVariant(
-    euiThemeContext,
-    'buttonVariant'
-  );
 
   const sizes = euiButtonSizeMap(euiThemeContext);
 
@@ -49,21 +45,12 @@ export const euiButtonDisplayStyles = (euiThemeContext: UseEuiTheme) => {
     `;
   };
 
-  const classicVariantStyles = `
-      &:hover:not(:disabled),
-      &:focus {
-        text-decoration: underline;
-      }
-  `;
-
   return {
     // Base
     euiButtonDisplay: css`
       ${euiButtonBaseCSS()}
       font-weight: ${euiTheme.font.weight.medium};
       ${logicalShorthandCSS('padding', `0 ${euiTheme.size.m}`)}
-
-      ${!isRefreshVariant && classicVariantStyles}
     `,
     // States
     isDisabled: css`
diff --git a/packages/eui/src/components/button/button_display/_button_display_content.styles.ts b/packages/eui/src/components/button/button_display/_button_display_content.styles.ts
index 82d37bf8ac9..5461482ec6e 100644
--- a/packages/eui/src/components/button/button_display/_button_display_content.styles.ts
+++ b/packages/eui/src/components/button/button_display/_button_display_content.styles.ts
@@ -6,24 +6,17 @@
  * Side Public License, v 1.
  */
 import { css } from '@emotion/react';
-import { isEuiThemeRefreshVariant, UseEuiTheme } from '../../../services';
+import { UseEuiTheme } from '../../../services';
 import { logicalCSS } from '../../../global_styling';
 
 export const euiButtonDisplayContentStyles = (euiThemeContext: UseEuiTheme) => {
   const { euiTheme } = euiThemeContext;
-  const isRefreshVariant = isEuiThemeRefreshVariant(
-    euiThemeContext,
-    'buttonVariant'
-  );
-
-  const refreshVariantStyles = `
-      /* ensure content stays ontop of hover pseudo element */
-      position: relative;
-    `;
 
   return {
     // Base
     euiButtonDisplayContent: css`
+      /* ensure content stays ontop of hover pseudo element */
+      position: relative;
       ${logicalCSS('height', '100%')}
       ${logicalCSS('width', '100%')}
       display: flex;
@@ -31,8 +24,6 @@ export const euiButtonDisplayContentStyles = (euiThemeContext: UseEuiTheme) => {
       align-items: center;
       vertical-align: middle;
       gap: ${euiTheme.size.s};
-
-      ${isRefreshVariant && refreshVariantStyles}
     `,
   };
 };
diff --git a/packages/eui/src/components/button/button_empty/button_empty.styles.ts b/packages/eui/src/components/button/button_empty/button_empty.styles.ts
index 67570951bc0..8445abf7319 100644
--- a/packages/eui/src/components/button/button_empty/button_empty.styles.ts
+++ b/packages/eui/src/components/button/button_empty/button_empty.styles.ts
@@ -8,7 +8,7 @@
 
 import { css } from '@emotion/react';
 
-import { isEuiThemeRefreshVariant, UseEuiTheme } from '../../../services';
+import { UseEuiTheme } from '../../../services';
 import {
   logicalCSS,
   logicalShorthandCSS,
@@ -19,43 +19,12 @@ import { euiButtonDisplayStyles } from '../button_display/_button_display.styles
 
 export const euiButtonEmptyStyles = (euiThemeContext: UseEuiTheme) => {
   const { euiTheme } = euiThemeContext;
-  const isRefreshVariant = isEuiThemeRefreshVariant(
-    euiThemeContext,
-    'buttonVariant'
-  );
 
   // EuiButtonEmpty uses the same size/font styling as EuiButtonDisplay,
   // but does not share enough of the same colors/props to the point
   // of using the actual component - so we'll reuse its styles instead
   const displayStyles = euiButtonDisplayStyles(euiThemeContext);
 
-  const refreshFlushStyles = `
-      /* using duplicate selector to ensure specificity */
-      &&:hover,
-      &&:active {
-        background-color: transparent;
-
-        /* removes hover overlay */
-        &::before {
-          display: none;
-        }
-      }
-
-      &:hover:not(:disabled),
-      &:focus {
-        text-decoration: underline;
-
-        ${highContrastModeStyles(euiThemeContext, {
-          forced: `
-            /* hides HCM hover border, flush buttons use text-decoration */
-            &::after {
-              display: none;
-            }
-          `,
-        })}
-      }
-  `;
-
   return {
     euiButtonEmpty: css`
       ${displayStyles.euiButtonDisplay}
@@ -74,15 +43,38 @@ export const euiButtonEmptyStyles = (euiThemeContext: UseEuiTheme) => {
     // uses array here to prevent adding duplicate "m" classname partial
     m: [
       displayStyles.m,
-      isRefreshVariant &&
-        `
+      `
         ${logicalCSS('padding-horizontal', euiTheme.size.m)}
       `,
     ],
     // Flush sides
     flush: css`
       padding-inline: 0;
-      ${isRefreshVariant && refreshFlushStyles}
+
+      /* using duplicate selector to ensure specificity */
+      &&:hover,
+      &&:active {
+        background-color: transparent;
+
+        /* removes hover overlay */
+        &::before {
+          display: none;
+        }
+      }
+
+      &:hover:not(:disabled),
+      &:focus {
+        text-decoration: underline;
+
+        ${highContrastModeStyles(euiThemeContext, {
+          forced: `
+            /* hides HCM hover border, flush buttons use text-decoration */
+            &::after {
+              display: none;
+            }
+          `,
+        })}
+      }
     `,
     left: css`
       ${logicalCSS('margin-right', euiTheme.size.s)}
diff --git a/packages/eui/src/components/button/button_group/button_group.styles.ts b/packages/eui/src/components/button/button_group/button_group.styles.ts
index 82d92038f11..1acf8e44ea2 100644
--- a/packages/eui/src/components/button/button_group/button_group.styles.ts
+++ b/packages/eui/src/components/button/button_group/button_group.styles.ts
@@ -7,7 +7,7 @@
  */
 
 import { css } from '@emotion/react';
-import { isEuiThemeRefreshVariant, UseEuiTheme } from '../../../services';
+import { UseEuiTheme } from '../../../services';
 import { logicalCSS } from '../../../global_styling';
 import {
   highContrastModeStyles,
@@ -76,15 +76,6 @@ const _highContrastStyles = (
   compressed?: boolean
 ) => {
   const { euiTheme } = euiThemeContext;
-  const isRefreshVariant = isEuiThemeRefreshVariant(
-    euiThemeContext,
-    'buttonVariant'
-  );
-
-  // Account for buttons within tooltip wrappers in selectors
-  const getButtonChildSelectors = (selector: string) => `
-    & > .euiButtonGroupButton${selector},
-    & > .euiButtonGroup__tooltipWrapper${selector} .euiButtonGroupButton`;
 
   return highContrastModeStyles(euiThemeContext, {
     preferred: compressed
@@ -93,40 +84,17 @@ const _highContrastStyles = (
           border: none;
         }
       `
-      : // Conditionally unset the high contrast borders passed by `euiButtonColor` -
-        // faux borders between selected/unselected buttons are rendered by pseudo elements,
-        // and can flip colors depending on selected/unselected siblings
-        `
-        ${
-          !isRefreshVariant &&
-          `
-              ${getButtonChildSelectors(':not(:first-child, :last-child)')} {
-                ${logicalCSS('border-horizontal', 'none')}
-              }
-              ${getButtonChildSelectors(':first-child')} {
-                ${logicalCSS('border-right', 'none')}
-              }
-              ${getButtonChildSelectors(':last-child')} {
-                ${logicalCSS('border-left', 'none')}
-              }
-            `
-        }
-      `,
+      : '',
     forced: `
       .euiButtonGroupButton-isSelected {
         ${preventForcedColors(euiThemeContext)}
         color: ${euiTheme.colors.emptyShade};
         background-color: ${euiTheme.colors.fullShade};
 
-        ${
-          isRefreshVariant &&
-          `
-              &:is(:hover, :focus):not(:disabled) {
-                &::before {
-                  border-color: ${euiTheme.colors.textInverse};
-                }
-              }
-            `
+        &:is(:hover, :focus):not(:disabled) {
+          &::before {
+            border-color: ${euiTheme.colors.textInverse};
+          }
         }
       }
 
diff --git a/packages/eui/src/components/button/button_group/button_group_button.styles.ts b/packages/eui/src/components/button/button_group/button_group_button.styles.ts
index 8ef0693d727..522da1e7bdc 100644
--- a/packages/eui/src/components/button/button_group/button_group_button.styles.ts
+++ b/packages/eui/src/components/button/button_group/button_group_button.styles.ts
@@ -9,11 +9,7 @@
 import { css, type SerializedStyles } from '@emotion/react';
 import { CSSProperties } from 'react';
 
-import {
-  UseEuiTheme,
-  isEuiThemeRefreshVariant,
-  makeDisabledContrastColor,
-} from '../../../services';
+import { UseEuiTheme } from '../../../services';
 import {
   mathWithUnits,
   logicalCSS,
@@ -25,7 +21,6 @@ import {
   highContrastModeStyles,
 } from '../../../global_styling';
 import {
-  euiButtonFillColor,
   _EuiButtonColor,
   BUTTON_COLORS,
 } from '../../../global_styling/mixins/_button';
@@ -34,16 +29,11 @@ import { euiFormVariables } from '../../form/form.styles';
 
 export const euiButtonGroupButtonStyles = (euiThemeContext: UseEuiTheme) => {
   const { euiTheme, highContrastMode } = euiThemeContext;
-  const isRefreshVariant = isEuiThemeRefreshVariant(
-    euiThemeContext,
-    'buttonVariant'
-  );
 
-  const { controlCompressedHeight, controlCompressedBorderRadius } =
-    euiFormVariables(euiThemeContext);
+  const { controlCompressedHeight } = euiFormVariables(euiThemeContext);
   const compressedButtonHeight = mathWithUnits(
     [controlCompressedHeight, euiTheme.border.width.thin],
-    (x, y) => (isRefreshVariant ? x - y * 6 : x - y * 2)
+    (x, y) => x - y * 6
   );
 
   const selectedSelectors =
@@ -67,99 +57,6 @@ export const euiButtonGroupButtonStyles = (euiThemeContext: UseEuiTheme) => {
     }
   `;
 
-  const refreshVariantStyles = `
-      &:is(${selectedSelectors}) {
-        ${highContrastModeStyles(euiThemeContext, {
-          forced: `
-            --highContrastHoverIndicatorColor: ${euiTheme.colors.textInverse};
-            border: none;
-
-            /* styles the content manually instead of the button itself to preserve the system
-            focus style, as otherwise preventForcedColors() would require manual styling */
-            > [class*="euiButtonDisplayContent"] {
-              ${preventForcedColors(euiThemeContext)}
-              color: ${euiTheme.colors.emptyShade};
-              border: none;
-            }
-          `,
-        })}
-      }
-    `;
-
-  const uncompressedStyles = isRefreshVariant
-    ? `
-      &:is(${selectedSelectors}):not(:disabled) {
-        z-index: 1;
-        /* prevent layout jumps due to missing border for selected/filled buttons */
-        border: ${euiTheme.border.width.thin} solid transparent;
-
-        ${highContrastModeStyles(euiThemeContext, {
-          forced: `
-            /* use inset focus outline to ensure visibility, same as custom hover.
-            NOTE: temp solution - this will be revisited once we handle global focus styles */
-            &:focus-visible {
-              outline-color: ${euiTheme.colors.textInverse};
-              /* has to be inset due to overflow: hidden */
-              outline-offset: -${mathWithUnits(
-                euiTheme.border.width.thin,
-                (x) => x * 4
-              )};
-            }
-          `,
-        })}
-      }
-    `
-    : `
-      &:is(.euiButtonGroupButton-isSelected) {
-        font-weight: ${euiTheme.font.weight.bold};
-      }
-    `;
-
-  const compressedStyles = isRefreshVariant
-    ? `
-      margin: ${euiTheme.size.xxs};
-      border-radius: ${mathWithUnits(
-        euiTheme.border.radius.small,
-        (x) => x / 2
-      )};
-
-      & + .euiButtonGroupButton {
-        ${logicalCSS('margin-left', '0')}
-      }
-
-      &:is(${selectedSelectors}):not(:disabled) {
-        /* prevent layout jumps due to missing border for non-selected buttons */
-        border: none;
-
-        ${highContrastModeStyles(euiThemeContext, {
-          forced: `
-            /* use inset focus outline to ensure visibility, same as custom hover.
-            NOTE: temp solution - this will be revisited once we handle global focus styles */
-            &:focus-visible {
-              outline-color: ${euiTheme.colors.textInverse};
-              /* has to be inset due to overflow: hidden */
-              outline-offset: -${mathWithUnits(
-                euiTheme.border.width.thin,
-                (x) => x * 3
-              )};
-            }
-          `,
-        })}
-      }
-    `
-    : `
-      background-clip: content-box;
-      /* Tweak border radius to account for the padding & background-clip */
-      border-radius: ${mathWithUnits(
-        [controlCompressedBorderRadius, euiTheme.border.width.thin],
-        (x, y) => x + y
-      )};
-
-      &:is(.euiButtonGroupButton-isSelected) {
-        font-weight: ${euiTheme.font.weight.semiBold};
-      }
-    `;
-
   return {
     // Base
     euiButtonGroupButton: css`
@@ -178,7 +75,22 @@ export const euiButtonGroupButtonStyles = (euiThemeContext: UseEuiTheme) => {
           color ${euiTheme.animation.normal} ease-in-out;
       }
 
-      ${isRefreshVariant && refreshVariantStyles}
+      &:is(${selectedSelectors}) {
+        ${highContrastModeStyles(euiThemeContext, {
+          forced: `
+            --highContrastHoverIndicatorColor: ${euiTheme.colors.textInverse};
+            border: none;
+
+            /* styles the content manually instead of the button itself to preserve the system
+            focus style, as otherwise preventForcedColors() would require manual styling */
+            > [class*="euiButtonDisplayContent"] {
+              ${preventForcedColors(euiThemeContext)}
+              color: ${euiTheme.colors.emptyShade};
+              border: none;
+            }
+          `,
+        })}
+      }
     `,
     iconOnly: css`
       padding-inline: ${euiTheme.size.s};
@@ -194,7 +106,26 @@ export const euiButtonGroupButtonStyles = (euiThemeContext: UseEuiTheme) => {
           )}
         }
 
-        ${uncompressedStyles}
+        &:is(${selectedSelectors}):not(:disabled) {
+          z-index: 1;
+          /* prevent layout jumps due to missing border for selected/filled buttons */
+          border: ${euiTheme.border.width.thin} solid transparent;
+
+          ${highContrastModeStyles(euiThemeContext, {
+            forced: `
+            /* use inset focus outline to ensure visibility, same as custom hover.
+            NOTE: temp solution - this will be revisited once we handle global focus styles */
+            &:focus-visible {
+              outline-color: ${euiTheme.colors.textInverse};
+              /* has to be inset due to overflow: hidden */
+              outline-offset: -${mathWithUnits(
+                euiTheme.border.width.thin,
+                (x) => x * 4
+              )};
+            }
+          `,
+          })}
+        }
       `,
       get borders() {
         // We use pseudo elements to avoid affecing button width, and to allow
@@ -208,46 +139,28 @@ export const euiButtonGroupButtonStyles = (euiThemeContext: UseEuiTheme) => {
           : euiTheme.components.buttonGroupBorderColor;
         const borderWidth = euiTheme.border.width.thin;
 
-        const borderStyles = isRefreshVariant
-          ? `
-            &:not(:first-child) {
-              margin-inline-start: -${borderWidth};
-            }
-
-            &:is(${selectors}) {
-              &::before {
-                position: absolute;
-                z-index: 1;
-                ${logicalCSS('left', 0)}
-                ${logicalCSS('vertical', `-${euiTheme.border.width.thin}`)}
-                ${logicalCSS('border-left-style', 'solid')}
-                ${logicalCSS('border-left-width', euiTheme.border.width.thin)}
-                pointer-events: none;
-
-                ${preventForcedColors(euiThemeContext)}
-              }
-            }
-          `
-          : `
-              &::before {
-                position: absolute;
-                ${logicalCSS('left', 0)}
-                ${logicalCSS(
-                  'vertical',
-                  highContrastMode ? `-${euiTheme.border.width.thin}` : 0
-                )}
-                ${logicalCSS('border-left-style', 'solid')}
-                ${logicalCSS('border-left-width', euiTheme.border.width.thin)}
-                pointer-events: none;
-              }
-          `;
-
         // "Borders" between buttons should be present between two of the same colored buttons,
         // and absent between selected vs non-selected buttons (different colors)
         return `
           position: relative;
 
-          ${borderStyles}
+          &:not(:first-child) {
+            margin-inline-start: -${borderWidth};
+          }
+
+          &:is(${selectors}) {
+            &::before {
+              position: absolute;
+              z-index: 1;
+              ${logicalCSS('left', 0)}
+              ${logicalCSS('vertical', `-${euiTheme.border.width.thin}`)}
+              ${logicalCSS('border-left-style', 'solid')}
+              ${logicalCSS('border-left-width', euiTheme.border.width.thin)}
+              pointer-events: none;
+
+              ${preventForcedColors(euiThemeContext)}
+            }
+          }
 
           &:not(${selectors}) + *:not(${selectors}) {
             &::before {
@@ -271,9 +184,7 @@ export const euiButtonGroupButtonStyles = (euiThemeContext: UseEuiTheme) => {
         `;
       },
       get m() {
-        const radius = isRefreshVariant
-          ? euiTheme.border.radius.small
-          : euiTheme.border.radius.medium;
+        const radius = euiTheme.border.radius.small;
         return css`
           ${this.borders}
           ${uncompressedBorderRadii(radius)}
@@ -290,26 +201,46 @@ export const euiButtonGroupButtonStyles = (euiThemeContext: UseEuiTheme) => {
       font-weight: ${euiTheme.font.weight.medium};
 
       /* Offset the background color from the border by clipping background to before the padding starts */
-      padding: ${isRefreshVariant
-        ? '0'
-        : mathWithUnits(euiTheme.border.width.thin, (x) => x * 2)};
+      padding: 0;
+
+      margin: ${euiTheme.size.xxs};
+      border-radius: ${mathWithUnits(
+        euiTheme.border.radius.small,
+        (x) => x / 2
+      )};
 
-      ${compressedStyles}
+      & + .euiButtonGroupButton {
+        ${logicalCSS('margin-left', '0')}
+      }
+
+      &:is(${selectedSelectors}):not(:disabled) {
+        /* prevent layout jumps due to missing border for non-selected buttons */
+        border: none;
+
+        ${highContrastModeStyles(euiThemeContext, {
+          forced: `
+            /* use inset focus outline to ensure visibility, same as custom hover.
+            NOTE: temp solution - this will be revisited once we handle global focus styles */
+            &:focus-visible {
+              outline-color: ${euiTheme.colors.textInverse};
+              /* has to be inset due to overflow: hidden */
+              outline-offset: -${mathWithUnits(
+                euiTheme.border.width.thin,
+                (x) => x * 3
+              )};
+            }
+          `,
+        })}
+      }
     `,
     // States
     disabledAndSelected: css`
-      color: ${isRefreshVariant
-        ? euiTheme.colors.textDisabled
-        : makeDisabledContrastColor(euiTheme.colors.textDisabled)(
-            euiTheme.components.buttonGroupBackgroundDisabledSelected
-          )};
+      color: ${euiTheme.colors.textDisabled};
       background-color: ${euiTheme.components
         .buttonGroupBackgroundDisabledSelected};
       border: ${highContrastMode
         ? `${euiTheme.border.width.thin} solid ${euiTheme.components.buttonGroupBackgroundDisabledSelected}`
-        : isRefreshVariant
-        ? `${euiTheme.border.width.thin} solid ${euiTheme.colors.borderBasePlain}`
-        : ''};
+        : `${euiTheme.border.width.thin} solid ${euiTheme.colors.borderBasePlain}`};
     `,
     // Skip css`` to avoid generating a className
     hasBorder: `
@@ -347,31 +278,14 @@ export const euiButtonGroupButtonStyles = (euiThemeContext: UseEuiTheme) => {
 
 export const _compressedButtonFocusColors = (euiThemeContext: UseEuiTheme) => {
   const { euiTheme } = euiThemeContext;
-  const isRefreshVariant = isEuiThemeRefreshVariant(
-    euiThemeContext,
-    'buttonVariant'
-  );
   const colors = [...BUTTON_COLORS, 'disabled'] as const;
 
   return colors.reduce((acc, color) => {
-    const { backgroundColor } = euiButtonFillColor(euiThemeContext, color);
-
     return {
       ...acc,
       [color]: css`
         &:focus-visible {
-          ${euiOutline(
-            euiThemeContext,
-            isRefreshVariant ? 'outset' : 'center',
-            isRefreshVariant ? euiTheme.focus.color : backgroundColor
-          )}
-
-          ${!isRefreshVariant &&
-          `
-            &:is(.euiButtonGroupButton-isSelected) {
-              outline-offset: 0;
-            }
-          `}
+          ${euiOutline(euiThemeContext, 'outset', euiTheme.focus.color)}
         }
       `,
     };
diff --git a/packages/eui/src/components/button/button_group/button_group_button.tsx b/packages/eui/src/components/button/button_group/button_group_button.tsx
index f385399370e..b3c0727c565 100644
--- a/packages/eui/src/components/button/button_group/button_group_button.tsx
+++ b/packages/eui/src/components/button/button_group/button_group_button.tsx
@@ -14,11 +14,7 @@ import React, {
 } from 'react';
 import { CSSInterpolation } from '@emotion/css';
 
-import {
-  isEuiThemeRefreshVariant,
-  useEuiMemoizedStyles,
-  useEuiTheme,
-} from '../../../services';
+import { useEuiMemoizedStyles } from '../../../services';
 import { useEuiButtonColorCSS } from '../../../global_styling/mixins/_button';
 import { useInnerText } from '../../inner_text';
 
@@ -72,15 +68,9 @@ export const EuiButtonGroupButton: FunctionComponent<Props> = ({
   contentProps,
   ...rest
 }) => {
-  const euiThemeContext = useEuiTheme();
-  const isRefreshVariant = isEuiThemeRefreshVariant(
-    euiThemeContext,
-    'buttonVariant'
-  );
-
   const isCompressed = size === 'compressed';
   const color = isDisabled ? 'disabled' : _color;
-  const hasBorder = isRefreshVariant && color !== 'text' && !isCompressed;
+  const hasBorder = color !== 'text' && !isCompressed;
   const display = isSelected
     ? 'fill'
     : isCompressed || hasBorder
diff --git a/packages/eui/src/components/button/button_icon/button_icon.tsx b/packages/eui/src/components/button/button_icon/button_icon.tsx
index 77dcf7b8059..d36053e6da8 100644
--- a/packages/eui/src/components/button/button_icon/button_icon.tsx
+++ b/packages/eui/src/components/button/button_icon/button_icon.tsx
@@ -14,12 +14,7 @@ import React, {
 } from 'react';
 import classNames from 'classnames';
 
-import {
-  getSecureRelForTarget,
-  isEuiThemeRefreshVariant,
-  useEuiMemoizedStyles,
-  useEuiTheme,
-} from '../../../services';
+import { getSecureRelForTarget, useEuiMemoizedStyles } from '../../../services';
 import {
   CommonProps,
   ExclusiveUnion,
@@ -37,7 +32,7 @@ import {
   _EuiExtendedButtonColor,
 } from '../../../global_styling/mixins/_button';
 import { isButtonDisabled } from '../button_display/_button_display';
-import { euiButtonIconStyles, _emptyHoverStyles } from './button_icon.styles';
+import { euiButtonIconStyles } from './button_icon.styles';
 
 export const SIZES = ['xs', 's', 'm'] as const;
 export type EuiButtonIconSizes = (typeof SIZES)[number];
@@ -130,12 +125,6 @@ export const EuiButtonIcon: FunctionComponent<Props> = ({
   isLoading,
   ...rest
 }) => {
-  const euiThemeContext = useEuiTheme();
-  const isRefreshVariant = isEuiThemeRefreshVariant(
-    euiThemeContext,
-    'buttonVariant'
-  );
-
   const isDisabled = isButtonDisabled({
     isDisabled: _isDisabled || disabled,
     href,
@@ -154,7 +143,6 @@ export const EuiButtonIcon: FunctionComponent<Props> = ({
 
   const buttonColorStyles = useEuiButtonColorCSS({ display });
   const buttonFocusStyle = useEuiButtonFocusCSS();
-  const emptyHoverStyles = useEuiMemoizedStyles(_emptyHoverStyles);
 
   const styles = useEuiMemoizedStyles(euiButtonIconStyles);
   const cssStyles = [
@@ -162,10 +150,6 @@ export const EuiButtonIcon: FunctionComponent<Props> = ({
     styles[size],
     buttonColorStyles[isDisabled ? 'disabled' : color],
     buttonFocusStyle,
-    !isRefreshVariant &&
-      display === 'empty' &&
-      !isDisabled &&
-      emptyHoverStyles[color],
     isDisabled && styles.isDisabled,
   ];
 
diff --git a/packages/eui/src/components/collapsible_nav_beta/collapsible_nav_beta.styles.ts b/packages/eui/src/components/collapsible_nav_beta/collapsible_nav_beta.styles.ts
index d0b7eeb5bce..a80cf38daab 100644
--- a/packages/eui/src/components/collapsible_nav_beta/collapsible_nav_beta.styles.ts
+++ b/packages/eui/src/components/collapsible_nav_beta/collapsible_nav_beta.styles.ts
@@ -7,9 +7,9 @@
  */
 
 import { css } from '@emotion/react';
+import { euiShadowFlat } from '@elastic/eui-theme-common';
 import { UseEuiTheme } from '../../services';
 import { logicalCSS } from '../../global_styling';
-import { euiShadowFlat } from '../../themes';
 import { euiHeaderVariables } from '../header/header.styles';
 
 import { hideScrollbars } from './collapsible_nav_body_footer.styles';
diff --git a/packages/eui/src/components/collapsible_nav_beta/collapsible_nav_item/collapsible_nav_item.styles.ts b/packages/eui/src/components/collapsible_nav_beta/collapsible_nav_item/collapsible_nav_item.styles.ts
index 139b0de6178..90e56183c4f 100644
--- a/packages/eui/src/components/collapsible_nav_beta/collapsible_nav_item/collapsible_nav_item.styles.ts
+++ b/packages/eui/src/components/collapsible_nav_beta/collapsible_nav_item/collapsible_nav_item.styles.ts
@@ -8,13 +8,12 @@
 
 import { css } from '@emotion/react';
 
-import { isEuiThemeRefreshVariant, UseEuiTheme } from '../../../services';
+import { UseEuiTheme } from '../../../services';
 import {
   logicalCSS,
   mathWithUnits,
   euiFontSize,
 } from '../../../global_styling';
-import { euiButtonColor } from '../../../global_styling/mixins/_button';
 
 /**
  * Style variables shared between accordion, link, and sub items
@@ -23,10 +22,6 @@ export const euiCollapsibleNavItemVariables = (
   euiThemeContext: UseEuiTheme
 ) => {
   const { euiTheme } = euiThemeContext;
-  const isRefreshVariant = isEuiThemeRefreshVariant(
-    euiThemeContext,
-    'buttonVariant'
-  );
 
   return {
     height: euiTheme.size.xl,
@@ -35,9 +30,7 @@ export const euiCollapsibleNavItemVariables = (
     animation: `${euiTheme.animation.normal} ease-in-out`, // Matches EuiButton
     borderRadius: euiTheme.border.radius.small,
     backgroundHoverColor: euiTheme.colors.lightestShade,
-    backgroundSelectedColor: isRefreshVariant
-      ? euiTheme.colors.backgroundBaseInteractiveSelect
-      : euiButtonColor(euiThemeContext, 'text').backgroundColor,
+    backgroundSelectedColor: euiTheme.colors.backgroundBaseInteractiveSelect,
     color: euiTheme.colors.textParagraph,
     rightIconColor: euiTheme.colors.textDisabled,
   };
diff --git a/packages/eui/src/components/combo_box/combo_box_input/combo_box_input.styles.ts b/packages/eui/src/components/combo_box/combo_box_input/combo_box_input.styles.ts
index 47e3ae1a54f..78f432a6649 100644
--- a/packages/eui/src/components/combo_box/combo_box_input/combo_box_input.styles.ts
+++ b/packages/eui/src/components/combo_box/combo_box_input/combo_box_input.styles.ts
@@ -8,7 +8,7 @@
 
 import { css } from '@emotion/react';
 
-import { isEuiThemeRefreshVariant, UseEuiTheme } from '../../../services';
+import { UseEuiTheme } from '../../../services';
 import { logicalCSS } from '../../../global_styling';
 import {
   euiFormControlStyles,
@@ -18,10 +18,7 @@ import {
 
 export const euiComboBoxInputStyles = (euiThemeContext: UseEuiTheme) => {
   const { euiTheme } = euiThemeContext;
-  const isRefreshVariant = isEuiThemeRefreshVariant(
-    euiThemeContext,
-    'formVariant'
-  );
+
   const formStyles = euiFormControlStyles(euiThemeContext);
 
   return {
@@ -30,12 +27,9 @@ export const euiComboBoxInputStyles = (euiThemeContext: UseEuiTheme) => {
       ${euiFormControlDefaultShadow(euiThemeContext)}
       display: flex;
 
-      ${isRefreshVariant &&
-      `
-        &:focus-within {
-          ${formStyles.focus}
-        }
-      `}
+      &:focus-within {
+        ${formStyles.focus}
+      }
     `,
     multiSelect: css`
       flex-wrap: wrap;
@@ -44,10 +38,7 @@ export const euiComboBoxInputStyles = (euiThemeContext: UseEuiTheme) => {
       ${formStyles.uncompressed}
       ${logicalCSS('height', 'auto')}
       ${logicalCSS('padding-vertical', euiTheme.size.s)}
-      ${logicalCSS(
-        'padding-left',
-        isRefreshVariant ? euiTheme.size.m : euiTheme.size.s
-      )}
+      ${logicalCSS('padding-left', euiTheme.size.m)}
       column-gap: ${euiTheme.size.s};
       row-gap: ${euiTheme.size.xs};
     `,
diff --git a/packages/eui/src/components/combo_box/combo_box_input/combo_box_input.tsx b/packages/eui/src/components/combo_box/combo_box_input/combo_box_input.tsx
index bff9f6d6900..b8ca9f3a479 100644
--- a/packages/eui/src/components/combo_box/combo_box_input/combo_box_input.tsx
+++ b/packages/eui/src/components/combo_box/combo_box_input/combo_box_input.tsx
@@ -21,8 +21,6 @@ import {
   keys,
   CanvasTextUtils,
   RenderWithEuiStylesMemoizer,
-  isEuiThemeRefreshVariant,
-  RenderWithEuiTheme,
 } from '../../../services';
 import { EuiScreenReaderOnly } from '../../accessibility';
 import {
@@ -319,122 +317,104 @@ export class EuiComboBoxInput<T> extends Component<
     });
 
     return (
-      <RenderWithEuiTheme>
-        {(euiThemeContext) => (
-          <RenderWithEuiStylesMemoizer>
-            {(stylesMemoizer) => {
-              const styles = stylesMemoizer(euiComboBoxInputStyles);
-              const isRefreshVariant = isEuiThemeRefreshVariant(
-                euiThemeContext,
-                'formVariant'
-              );
-
-              const stateCss = isRefreshVariant
-                ? isListOpen
-                  ? styles.open
-                  : isInvalid
-                  ? styles.invalid
-                  : undefined
-                : isInvalid
-                ? styles.invalid
-                : isListOpen
-                ? styles.open
-                : undefined;
-
-              const cssStyles = [
-                styles.euiComboBoxInputWrapper,
-                !singleSelection && styles.multiSelect,
-                compressed ? styles.compressed : styles.uncompressed,
-                ...(this.asPlainText || showPlaceholder
-                  ? [
-                      styles.plainText.plainText,
-                      compressed
-                        ? styles.plainText.compressed
-                        : styles.plainText.uncompressed,
-                    ]
-                  : []),
-                isDisabled ? styles.disabled : stateCss,
-                isInGroup && styles.inGroup,
-              ];
-              const formLayoutStyles = [
-                styles.formLayout.euiComboBox__formControlLayout,
-                !singleSelection && styles.formLayout.multiSelect,
-              ];
-
-              return (
-                <EuiFormControlLayout
-                  icon={icon}
-                  {...clickProps}
-                  inputId={id}
-                  isLoading={isLoading}
-                  isInvalid={isInvalid}
-                  isDisabled={isDisabled}
-                  compressed={compressed}
-                  fullWidth={fullWidth}
-                  prepend={prepend}
-                  append={append}
-                  css={formLayoutStyles}
+      <RenderWithEuiStylesMemoizer>
+        {(stylesMemoizer) => {
+          const styles = stylesMemoizer(euiComboBoxInputStyles);
+
+          const stateCss = isListOpen
+            ? styles.open
+            : isInvalid
+            ? styles.invalid
+            : undefined;
+
+          const cssStyles = [
+            styles.euiComboBoxInputWrapper,
+            !singleSelection && styles.multiSelect,
+            compressed ? styles.compressed : styles.uncompressed,
+            ...(this.asPlainText || showPlaceholder
+              ? [
+                  styles.plainText.plainText,
+                  compressed
+                    ? styles.plainText.compressed
+                    : styles.plainText.uncompressed,
+                ]
+              : []),
+            isDisabled ? styles.disabled : stateCss,
+            isInGroup && styles.inGroup,
+          ];
+          const formLayoutStyles = [
+            styles.formLayout.euiComboBox__formControlLayout,
+            !singleSelection && styles.formLayout.multiSelect,
+          ];
+
+          return (
+            <EuiFormControlLayout
+              icon={icon}
+              {...clickProps}
+              inputId={id}
+              isLoading={isLoading}
+              isInvalid={isInvalid}
+              isDisabled={isDisabled}
+              compressed={compressed}
+              fullWidth={fullWidth}
+              prepend={prepend}
+              append={append}
+              css={formLayoutStyles}
+            >
+              <div
+                css={cssStyles}
+                className={wrapClasses}
+                data-test-subj="comboBoxInput"
+                onClick={onClick}
+                tabIndex={-1} // becomes onBlur event's relatedTarget, otherwise relatedTarget is null when clicking on this div
+              >
+                {this.renderPills()}
+                <EuiComboBoxOptionAppendPrepend
+                  option={this.asPlainText ? selectedOptions?.[0] : undefined}
+                  classNamePrefix="euiComboBoxPlainTextSelection"
+                  marginSize="xxs"
                 >
-                  <div
-                    css={cssStyles}
-                    className={wrapClasses}
-                    data-test-subj="comboBoxInput"
-                    onClick={onClick}
-                    tabIndex={-1} // becomes onBlur event's relatedTarget, otherwise relatedTarget is null when clicking on this div
-                  >
-                    {this.renderPills()}
-                    <EuiComboBoxOptionAppendPrepend
-                      option={
-                        this.asPlainText ? selectedOptions?.[0] : undefined
-                      }
-                      classNamePrefix="euiComboBoxPlainTextSelection"
-                      marginSize="xxs"
-                    >
-                      <input
-                        aria-activedescendant={focusedOptionId}
-                        aria-autocomplete="list"
-                        aria-controls={isListOpen ? rootId('listbox') : ''}
-                        aria-expanded={isListOpen}
-                        aria-label={ariaLabel}
-                        aria-labelledby={ariaLabelledby}
-                        aria-describedby={ariaDescribedby}
-                        aria-invalid={isInvalid}
-                        aria-haspopup="listbox"
-                        css={styles.euiComboBoxInput}
-                        className="euiComboBox__input"
-                        data-test-subj="comboBoxSearchInput"
-                        disabled={isDisabled}
-                        id={id}
-                        onBlur={this.onBlur}
-                        onChange={(event) => onChange(event.target.value)}
-                        onFocus={this.onFocus}
-                        onKeyDown={this.onKeyDown}
-                        ref={this.inputRefCallback}
-                        role="combobox"
-                        style={{
-                          inlineSize:
-                            this.asPlainText || showPlaceholder
-                              ? '100%'
-                              : this.state.inputWidth,
-                        }}
-                        placeholder={showPlaceholder ? placeholder : undefined}
-                        value={this.searchValue}
-                        autoFocus={autoFocus}
-                        autoComplete="off"
-                        // Force the menu to re-open on every input click - only necessary when plain text
-                        onClick={
-                          this.asPlainText ? (onFocus as any) : undefined
-                        } // Type shenanigans - event should be mostly the same
-                      />
-                    </EuiComboBoxOptionAppendPrepend>
-                    {removeOptionMessage}
-                  </div>
-                </EuiFormControlLayout>
-              );
-            }}
-          </RenderWithEuiStylesMemoizer>
-        )}
-      </RenderWithEuiTheme>
+                  <input
+                    aria-activedescendant={focusedOptionId}
+                    aria-autocomplete="list"
+                    aria-controls={isListOpen ? rootId('listbox') : ''}
+                    aria-expanded={isListOpen}
+                    aria-label={ariaLabel}
+                    aria-labelledby={ariaLabelledby}
+                    aria-describedby={ariaDescribedby}
+                    aria-invalid={isInvalid}
+                    aria-haspopup="listbox"
+                    css={styles.euiComboBoxInput}
+                    className="euiComboBox__input"
+                    data-test-subj="comboBoxSearchInput"
+                    disabled={isDisabled}
+                    id={id}
+                    onBlur={this.onBlur}
+                    onChange={(event) => onChange(event.target.value)}
+                    onFocus={this.onFocus}
+                    onKeyDown={this.onKeyDown}
+                    ref={this.inputRefCallback}
+                    role="combobox"
+                    style={{
+                      inlineSize:
+                        this.asPlainText || showPlaceholder
+                          ? '100%'
+                          : this.state.inputWidth,
+                    }}
+                    placeholder={showPlaceholder ? placeholder : undefined}
+                    value={this.searchValue}
+                    autoFocus={autoFocus}
+                    autoComplete="off"
+                    // Force the menu to re-open on every input click - only necessary when plain text
+                    onClick={this.asPlainText ? (onFocus as any) : undefined} // Type shenanigans - event should be mostly the same
+                  />
+                </EuiComboBoxOptionAppendPrepend>
+                {removeOptionMessage}
+              </div>
+            </EuiFormControlLayout>
+          );
+        }}
+      </RenderWithEuiStylesMemoizer>
     );
   }
 }
diff --git a/packages/eui/src/components/datagrid/controls/column_selector.styles.ts b/packages/eui/src/components/datagrid/controls/column_selector.styles.ts
index cd26451674b..6fc5a439ff9 100644
--- a/packages/eui/src/components/datagrid/controls/column_selector.styles.ts
+++ b/packages/eui/src/components/datagrid/controls/column_selector.styles.ts
@@ -7,6 +7,7 @@
  */
 
 import { css } from '@emotion/react';
+import { euiShadowLarge } from '@elastic/eui-theme-common';
 
 import { UseEuiTheme } from '../../../services';
 import {
@@ -14,7 +15,6 @@ import {
   logicalCSS,
   mathWithUnits,
 } from '../../../global_styling';
-import { euiShadowLarge } from '../../../themes';
 
 export const euiDataGridColumnSelectorStyles = (
   euiThemeContext: UseEuiTheme
diff --git a/packages/eui/src/components/datagrid/controls/column_sorting.styles.ts b/packages/eui/src/components/datagrid/controls/column_sorting.styles.ts
index c2e85b86d6e..c657db7688a 100644
--- a/packages/eui/src/components/datagrid/controls/column_sorting.styles.ts
+++ b/packages/eui/src/components/datagrid/controls/column_sorting.styles.ts
@@ -7,6 +7,7 @@
  */
 
 import { css } from '@emotion/react';
+import { euiShadowLarge } from '@elastic/eui-theme-common';
 
 import { UseEuiTheme } from '../../../services';
 import {
@@ -17,7 +18,6 @@ import {
   logicalCSS,
   mathWithUnits,
 } from '../../../global_styling';
-import { euiShadowLarge } from '../../../themes';
 
 export const euiDataGridColumnSortingStyles = (
   euiThemeContext: UseEuiTheme
diff --git a/packages/eui/src/components/datagrid/controls/data_grid_toolbar_control.tsx b/packages/eui/src/components/datagrid/controls/data_grid_toolbar_control.tsx
index 1c9303699f6..450e3631635 100644
--- a/packages/eui/src/components/datagrid/controls/data_grid_toolbar_control.tsx
+++ b/packages/eui/src/components/datagrid/controls/data_grid_toolbar_control.tsx
@@ -11,7 +11,7 @@ import classNames from 'classnames';
 import { css } from '@emotion/react';
 import { UseEuiTheme } from '@elastic/eui-theme-common';
 
-import { useEuiTheme, useEuiThemeRefreshVariant } from '../../../services';
+import { useEuiTheme } from '../../../services';
 import { EuiButtonEmpty, EuiButtonEmptyProps } from '../../button';
 import { EuiNotificationBadge } from '../../badge';
 import { useEuiI18n } from '../../i18n';
@@ -24,13 +24,9 @@ export const EuiDataGridToolbarControl: FunctionComponent<
   EuiDataGridToolbarControlProps
 > = ({ children, className, badgeContent, textProps, ...rest }) => {
   const euiThemeContext = useEuiTheme();
-  const isRefreshVariant = useEuiThemeRefreshVariant('buttonVariant');
   const classes = classNames('euiDataGridToolbarControl', className);
 
-  const cssStyles = isRefreshVariant
-    ? // passes euiThemeContext here instead via `css` to ensure legacy Enzyme tests work
-      interactiveStyles(euiThemeContext)
-    : underlineStyles;
+  const cssStyles = interactiveStyles(euiThemeContext);
 
   const badgeAriaLabel = useEuiI18n(
     'euiDataGridToolbarControl.badgeAriaLabel',
@@ -83,18 +79,6 @@ export const EuiDataGridToolbarControl: FunctionComponent<
 const betterScreenReaderSlashes = (badgeContent: string) =>
   badgeContent.replaceAll('/', ' out of ');
 
-// Underline actual text, but not the badge
-const underlineStyles = css`
-  &:focus,
-  &:hover:not(:disabled) {
-    text-decoration: none;
-
-    .euiDataGridToolbarControl__text {
-      text-decoration: underline;
-    }
-  }
-`;
-
 const interactiveStyles = ({ euiTheme }: UseEuiTheme) => css`
   &:focus,
   &:hover:not(:disabled) {
diff --git a/packages/eui/src/components/datagrid/data_grid.styles.ts b/packages/eui/src/components/datagrid/data_grid.styles.ts
index f1a46f4a66c..19e713587ef 100644
--- a/packages/eui/src/components/datagrid/data_grid.styles.ts
+++ b/packages/eui/src/components/datagrid/data_grid.styles.ts
@@ -234,7 +234,6 @@ export const euiDataGridStyles = (euiThemeContext: UseEuiTheme) => {
         return css(this.fontSize('m'));
       },
       get l() {
-        // On the Amsterdam theme, the l fontSize is the same as m
         return css(this.fontSize('m'));
       },
     },
diff --git a/packages/eui/src/components/date_picker/date_picker.styles.ts b/packages/eui/src/components/date_picker/date_picker.styles.ts
index 2e2e171d1d0..ed9fddbb7da 100644
--- a/packages/eui/src/components/date_picker/date_picker.styles.ts
+++ b/packages/eui/src/components/date_picker/date_picker.styles.ts
@@ -9,7 +9,7 @@
 import { css } from '@emotion/react';
 import { euiShadowMedium } from '@elastic/eui-theme-common';
 
-import { isEuiThemeRefreshVariant, UseEuiTheme } from '../../services';
+import { UseEuiTheme } from '../../services';
 import { logicalCSS } from '../../global_styling';
 import {
   euiFormControlDisabledStyles,
@@ -20,17 +20,6 @@ import {
 
 export const euiDatePickerStyles = (euiThemeContext: UseEuiTheme) => {
   const { euiTheme } = euiThemeContext;
-  const isRefreshVariant = isEuiThemeRefreshVariant(
-    euiThemeContext,
-    'formVariant'
-  );
-
-  const inlineStyles = `
-      /* removes form layout border */
-      &::after {
-        display: none;
-      }
-    `;
 
   return {
     euiDatePicker: css`
@@ -45,7 +34,10 @@ export const euiDatePickerStyles = (euiThemeContext: UseEuiTheme) => {
           border: none;
           padding: 0;
 
-          ${isRefreshVariant && inlineStyles}
+          /* removes form layout border */
+          &::after {
+            display: none;
+          }
         }
 
         .euiFormControlLayout__childrenWrapper {
diff --git a/packages/eui/src/components/date_picker/date_picker_range.styles.ts b/packages/eui/src/components/date_picker/date_picker_range.styles.ts
index f9ec6f32711..21f2b2d07b4 100644
--- a/packages/eui/src/components/date_picker/date_picker_range.styles.ts
+++ b/packages/eui/src/components/date_picker/date_picker_range.styles.ts
@@ -10,27 +10,10 @@ import { css } from '@emotion/react';
 import { euiShadowMedium } from '@elastic/eui-theme-common';
 
 import { logicalCSS } from '../../global_styling';
-import { isEuiThemeRefreshVariant, UseEuiTheme } from '../../services';
+import { UseEuiTheme } from '../../services';
 import { disableFormControlHoverStyles } from '../form/form.styles';
 
-export const euiDatePickerRangeStyles = (euiThemeContext: UseEuiTheme) => {
-  const isRefreshVariant = isEuiThemeRefreshVariant(
-    euiThemeContext,
-    'formVariant'
-  );
-
-  const refreshStyles = `
-      .euiPopover:last-child {
-        ${logicalCSS('border-top-right-radius', 'inherit')}
-        ${logicalCSS('border-bottom-right-radius', 'inherit')}
-
-        * {
-          ${logicalCSS('border-top-right-radius', 'inherit')}
-          ${logicalCSS('border-bottom-right-radius', 'inherit')}
-        }
-      }
-    `;
-
+export const euiDatePickerRangeStyles = () => {
   return {
     euiDatePickerRange: css`
       /* Needed for correct focus/invalid underline/linear-gradient styles */
@@ -45,7 +28,15 @@ export const euiDatePickerRangeStyles = (euiThemeContext: UseEuiTheme) => {
         flex: 1;
       }
 
-      ${isRefreshVariant && refreshStyles}
+      .euiPopover:last-child {
+        ${logicalCSS('border-top-right-radius', 'inherit')}
+        ${logicalCSS('border-bottom-right-radius', 'inherit')}
+
+        * {
+          ${logicalCSS('border-top-right-radius', 'inherit')}
+          ${logicalCSS('border-bottom-right-radius', 'inherit')}
+        }
+      }
     `,
   };
 };
@@ -54,10 +45,6 @@ export const euiDatePickerRangeInlineStyles = (
   euiThemeContext: UseEuiTheme
 ) => {
   const { euiTheme } = euiThemeContext;
-  const isRefreshVariant = isEuiThemeRefreshVariant(
-    euiThemeContext,
-    'formVariant'
-  );
 
   // Use a container query to stack date pickers vertically if the container is
   // not wide enough to fit both. We need a fn for this to render two width queries,
@@ -109,12 +96,9 @@ export const euiDatePickerRangeInlineStyles = (
           ${logicalCSS('padding-bottom', euiTheme.size.s)}
         }
 
-        ${isRefreshVariant &&
-        `
-          &::after {
-            display: none;
-          }
-        `}
+        &::after {
+          display: none;
+        }
       }
 
       /* Make sure the inline date picker sets its absolute positioning based off the correct parent */
@@ -134,16 +118,13 @@ export const euiDatePickerRangeInlineStyles = (
           borderAllInHighContrastMode: true,
         })}
 
-        ${isRefreshVariant &&
-        `
-          /* the form layout is not part of the interactive behavior but rather a container in this variant  */
+        /* the form layout is not part of the interactive behavior but rather a container in this variant  */
           ${disableFormControlHoverStyles()}
 
           .euiFormControlLayout__childrenWrapper {
-            box-shadow: none;
-            ${disableFormControlHoverStyles()}
-          }
-        `}
+          box-shadow: none;
+          ${disableFormControlHoverStyles()}
+        }
       }
     `,
 
diff --git a/packages/eui/src/components/date_picker/super_date_picker/super_date_picker.styles.ts b/packages/eui/src/components/date_picker/super_date_picker/super_date_picker.styles.ts
index 0e8e460f48a..6188087503e 100644
--- a/packages/eui/src/components/date_picker/super_date_picker/super_date_picker.styles.ts
+++ b/packages/eui/src/components/date_picker/super_date_picker/super_date_picker.styles.ts
@@ -8,11 +8,7 @@
 
 import { css } from '@emotion/react';
 
-import {
-  UseEuiTheme,
-  isEuiThemeRefreshVariant,
-  makeHighContrastColor,
-} from '../../../services';
+import { UseEuiTheme, makeHighContrastColor } from '../../../services';
 import {
   euiFontSize,
   euiMaxBreakpoint,
@@ -25,17 +21,12 @@ import {
   euiFormControlDefaultShadow,
   euiFormControlInvalidStyles,
   euiFormControlDisabledStyles,
-  euiFormControlShowBackgroundLine,
   euiFormControlFocusStyles,
   euiFormControlHighlightBorderStyles,
 } from '../../form/form.styles';
 
 export const euiSuperDatePickerStyles = (euiThemeContext: UseEuiTheme) => {
   const { euiTheme } = euiThemeContext;
-  const isRefreshVariant = isEuiThemeRefreshVariant(
-    euiThemeContext,
-    'formVariant'
-  );
 
   const forms = euiFormVariables(euiThemeContext);
 
@@ -63,116 +54,6 @@ export const euiSuperDatePickerStyles = (euiThemeContext: UseEuiTheme) => {
     needsUpdatingBackgroundColor
   );
 
-  const formLayoutStyles = `
-      /* using wrapper hover styles instead */
-      .euiDatePopoverButton:not(.euiDatePopoverButton-isSelected):hover {
-        outline: none;
-      }
-
-      .euiPopover {
-        /* mimic input border-radius */
-        border-radius: ${forms.controlBorderRadius};
-
-        &:first-child {
-          ${logicalCSS('border-top-left-radius', 'inherit')}
-          ${logicalCSS('border-bottom-left-radius', 'inherit')}
-        }
-
-        &:last-child {
-          ${logicalCSS('border-top-right-radius', 'inherit')}
-          ${logicalCSS('border-bottom-right-radius', 'inherit')}
-        }
-      }
-
-      .euiDatePopoverButton {
-        background-color: transparent;
-        border-radius: inherit;
-      }
-    `;
-
-  const popoverButtonFocusStyles = isRefreshVariant
-    ? `
-       ${euiFormControlFocusStyles(euiThemeContext)}
-    `
-    : `
-      --euiFormControlStateColor: ${euiTheme.colors.primary};
-      ${euiFormControlShowBackgroundLine(
-        euiThemeContext,
-        euiTheme.colors.primary
-      )}
-    `;
-
-  const invalidStyles = isRefreshVariant
-    ? `
-      &:has(.euiPopover-isOpen, .euiDatePopoverButton:focus) {
-        --euiFormControlStateColor: ${forms.borderColor};
-        --euiFormControlStateHoverColor: ${forms.borderHovered};
-      }
-
-      &:not(:has(.euiPopover-isOpen, .euiDatePopoverButton:focus)) {
-        ${euiFormControlInvalidStyles(euiThemeContext)}
-      }
-
-      .euiDatePopoverButton:focus,
-      .euiPopover-isOpen .euiDatePopoverButton {
-        ${euiFormControlFocusStyles(euiThemeContext)}
-      }
-    `
-    : `
-      ${euiFormControlInvalidStyles(euiThemeContext)}
-    `;
-
-  const needsUpdatingStyles = `
-      --euiFormControlStateColor: ${euiTheme.colors.success};
-      --euiFormControlStateHoverColor: ${euiTheme.colors.success};
-      --euiFormControlStateWidth: ${euiTheme.border.width.thin};
-      ${euiFormControlHighlightBorderStyles}
-  
-      &:has(.euiPopover-isOpen),
-      &:focus-within {
-        --euiFormControlStateColor: ${forms.borderColor};
-        --euiFormControlStateHoverColor: ${forms.borderHovered};
-      }
-    `;
-
-  const needsUpdatingPopoverButtonFocusStyles = isRefreshVariant
-    ? `
-      ${euiFormControlFocusStyles(euiThemeContext)}
-    `
-    : `
-      --euiFormControlStateColor: ${euiTheme.colors.success};
-      ${euiFormControlShowBackgroundLine(
-        euiThemeContext,
-        euiTheme.colors.success
-      )}
-
-      ${highContrastModeStyles(euiThemeContext, {
-        // Force the fill color of all icons/svgs to give a bit more indication of state,
-        // since Windows high contrast themes otherwise override background/text color
-        forced: `
-          svg,
-          & + * svg {
-            fill: ${euiTheme.colors.success};
-          }
-        `,
-      })}
-    `;
-
-  const prettyFormatStyles = `
-      --euiFormControlStateHoverColor: ${forms.borderHovered};
-      ${euiFormControlDefaultShadow(euiThemeContext)}
-      
-      ${highContrastModeStyles(euiThemeContext, {
-        preferred: `
-          border: none;
-        `,
-      })}
-
-      &:focus {
-        ${euiFormControlFocusStyles(euiThemeContext)}
-      }
-    `;
-
   return {
     euiSuperDatePicker: css`
       display: flex;
@@ -255,7 +136,18 @@ export const euiSuperDatePickerStyles = (euiThemeContext: UseEuiTheme) => {
       ${_buttonStyles(euiThemeContext)}
       text-align: start;
 
-      ${isRefreshVariant && prettyFormatStyles}
+      --euiFormControlStateHoverColor: ${forms.borderHovered};
+      ${euiFormControlDefaultShadow(euiThemeContext)}
+
+      &:focus {
+        ${euiFormControlFocusStyles(euiThemeContext)}
+      }
+
+      ${highContrastModeStyles(euiThemeContext, {
+        preferred: `
+          border: none;
+        `,
+      })}
     `,
 
     // Form states
@@ -263,13 +155,39 @@ export const euiSuperDatePickerStyles = (euiThemeContext: UseEuiTheme) => {
       euiSuperDatePicker__formControlLayout: css`
         .euiFormControlLayout__childrenWrapper {
           --euiFormControlStateHoverColor: ${forms.borderHovered};
-          ${euiFormControlDefaultShadow(euiThemeContext)}
+
           ${highContrastModeStyles(euiThemeContext, {
-            none: 'box-shadow: none;',
+            none: `
+              ${euiFormControlDefaultShadow(euiThemeContext)}
+              box-shadow: none;
+            `,
             preferred: 'border: none;',
           })}
 
-          ${isRefreshVariant && formLayoutStyles}
+          /* using wrapper hover styles instead */
+          .euiDatePopoverButton:not(.euiDatePopoverButton-isSelected):hover {
+            outline: none;
+          }
+
+          .euiPopover {
+            /* mimic input border-radius */
+            border-radius: ${forms.controlBorderRadius};
+
+            &:first-child {
+              ${logicalCSS('border-top-left-radius', 'inherit')}
+              ${logicalCSS('border-bottom-left-radius', 'inherit')}
+            }
+
+            &:last-child {
+              ${logicalCSS('border-top-right-radius', 'inherit')}
+              ${logicalCSS('border-bottom-right-radius', 'inherit')}
+            }
+          }
+
+          .euiDatePopoverButton {
+            background-color: transparent;
+            border-radius: inherit;
+          }
         }
       `,
       default: css`
@@ -281,17 +199,12 @@ export const euiSuperDatePickerStyles = (euiThemeContext: UseEuiTheme) => {
         /* Focus/selection underline per-button */
         .euiDatePopoverButton {
           --euiFormControlStateHoverColor: ${forms.borderHovered};
-          ${!isRefreshVariant &&
-          euiFormControlDefaultShadow(euiThemeContext, {
-            withBorder: false,
-            withBackgroundColor: false,
-          })}
           box-shadow: none;
         }
 
         .euiDatePopoverButton:focus,
         .euiPopover-isOpen .euiDatePopoverButton {
-          ${popoverButtonFocusStyles}
+          ${euiFormControlFocusStyles(euiThemeContext)}
         }
       `,
       disabled: css`
@@ -304,15 +217,37 @@ export const euiSuperDatePickerStyles = (euiThemeContext: UseEuiTheme) => {
           color: ${euiTheme.colors.textDanger};
           background-color: ${forms.backgroundColor};
 
-          ${invalidStyles}
+          &:has(.euiPopover-isOpen, .euiDatePopoverButton:focus) {
+            --euiFormControlStateColor: ${forms.borderColor};
+            --euiFormControlStateHoverColor: ${forms.borderHovered};
+          }
+
+          &:not(:has(.euiPopover-isOpen, .euiDatePopoverButton:focus)) {
+            ${euiFormControlInvalidStyles(euiThemeContext)}
+          }
+
+          .euiDatePopoverButton:focus,
+          .euiPopover-isOpen .euiDatePopoverButton {
+            ${euiFormControlFocusStyles(euiThemeContext)}
+          }
         }
       `,
       needsUpdating: css`
         .euiFormControlLayout__childrenWrapper {
+          --euiFormControlStateColor: ${euiTheme.colors.success};
+          --euiFormControlStateHoverColor: ${euiTheme.colors.success};
+          --euiFormControlStateWidth: ${euiTheme.border.width.thin};
+
           color: ${needsUpdatingTextColor};
           background-color: ${needsUpdatingBackgroundColor};
 
-          ${isRefreshVariant && needsUpdatingStyles}
+          ${euiFormControlHighlightBorderStyles}
+
+          &:has(.euiPopover-isOpen),
+          &:focus-within {
+            --euiFormControlStateColor: ${forms.borderColor};
+            --euiFormControlStateHoverColor: ${forms.borderHovered};
+          }
         }
 
         .euiFormControlLayoutDelimited__delimiter {
@@ -331,7 +266,7 @@ export const euiSuperDatePickerStyles = (euiThemeContext: UseEuiTheme) => {
 
         .euiDatePopoverButton:focus,
         .euiPopover-isOpen .euiDatePopoverButton {
-          ${needsUpdatingPopoverButtonFocusStyles}
+          ${euiFormControlFocusStyles(euiThemeContext)}
         }
       `,
     },
diff --git a/packages/eui/src/components/filter_group/__snapshots__/filter_button.test.tsx.snap b/packages/eui/src/components/filter_group/__snapshots__/filter_button.test.tsx.snap
index 150b37cbeba..6d5c1e5741c 100644
--- a/packages/eui/src/components/filter_group/__snapshots__/filter_button.test.tsx.snap
+++ b/packages/eui/src/components/filter_group/__snapshots__/filter_button.test.tsx.snap
@@ -2,7 +2,7 @@
 
 exports[`EuiFilterButton does not render a badge or count if numFilters is not passed 1`] = `
 <div
-  class="euiFilterButton__wrapper css-72u45h-wrapper"
+  class="euiFilterButton__wrapper css-ln4f6z-wrapper"
 >
   <button
     aria-label="aria-label"
@@ -23,7 +23,7 @@ exports[`EuiFilterButton does not render a badge or count if numFilters is not p
 
 exports[`EuiFilterButton props badgeColor renders 1`] = `
 <div
-  class="euiFilterButton__wrapper css-72u45h-wrapper"
+  class="euiFilterButton__wrapper css-ln4f6z-wrapper"
 >
   <button
     class="euiButtonEmpty euiFilterButton emotion-euiButtonDisplay-euiButtonEmpty-m-empty-text-euiFilterButton-default"
@@ -42,7 +42,7 @@ exports[`EuiFilterButton props badgeColor renders 1`] = `
 
 exports[`EuiFilterButton props grow can be turned off 1`] = `
 <div
-  class="euiFilterButton__wrapper css-4um6ew-wrapper-noGrow"
+  class="euiFilterButton__wrapper css-1thkee5-wrapper-noGrow"
 >
   <button
     class="euiButtonEmpty euiFilterButton emotion-euiButtonDisplay-euiButtonEmpty-m-empty-text-euiFilterButton-default"
@@ -61,7 +61,7 @@ exports[`EuiFilterButton props grow can be turned off 1`] = `
 
 exports[`EuiFilterButton props iconType and iconSide renders 1`] = `
 <div
-  class="euiFilterButton__wrapper css-72u45h-wrapper"
+  class="euiFilterButton__wrapper css-ln4f6z-wrapper"
 >
   <button
     class="euiButtonEmpty euiFilterButton emotion-euiButtonDisplay-euiButtonEmpty-m-empty-text-euiFilterButton-default"
@@ -84,7 +84,7 @@ exports[`EuiFilterButton props iconType and iconSide renders 1`] = `
 
 exports[`EuiFilterButton props isDisabled renders 1`] = `
 <div
-  class="euiFilterButton__wrapper css-72u45h-wrapper"
+  class="euiFilterButton__wrapper css-ln4f6z-wrapper"
 >
   <button
     class="euiButtonEmpty euiFilterButton emotion-euiButtonDisplay-euiButtonEmpty-m-empty-disabled-isDisabled-euiFilterButton-default"
@@ -104,7 +104,7 @@ exports[`EuiFilterButton props isDisabled renders 1`] = `
 
 exports[`EuiFilterButton props isSelected renders 1`] = `
 <div
-  class="euiFilterButton__wrapper css-72u45h-wrapper"
+  class="euiFilterButton__wrapper css-ln4f6z-wrapper"
 >
   <button
     class="euiButtonEmpty euiFilterButton euiFilterButton-isSelected emotion-euiButtonDisplay-euiButtonEmpty-m-empty-text-euiFilterButton-default"
@@ -123,7 +123,7 @@ exports[`EuiFilterButton props isSelected renders 1`] = `
 
 exports[`EuiFilterButton props numActiveFilters and hasActiveFilters renders 1`] = `
 <div
-  class="euiFilterButton__wrapper css-72u45h-wrapper"
+  class="euiFilterButton__wrapper css-ln4f6z-wrapper"
 >
   <button
     class="euiButtonEmpty euiFilterButton euiFilterButton-hasActiveFilters emotion-euiButtonDisplay-euiButtonEmpty-m-empty-text-euiFilterButton-hasActiveFilters-default"
@@ -153,7 +153,7 @@ exports[`EuiFilterButton props numActiveFilters and hasActiveFilters renders 1`]
 
 exports[`EuiFilterButton props numFilters renders 1`] = `
 <div
-  class="euiFilterButton__wrapper css-1u66048-wrapper-hasNotification"
+  class="euiFilterButton__wrapper css-1xcpmpj-wrapper-hasNotification"
 >
   <button
     class="euiButtonEmpty euiFilterButton euiFilterButton-hasNotification emotion-euiButtonDisplay-euiButtonEmpty-m-empty-text-euiFilterButton-default"
@@ -183,7 +183,7 @@ exports[`EuiFilterButton props numFilters renders 1`] = `
 
 exports[`EuiFilterButton props type renders 1`] = `
 <div
-  class="euiFilterButton__wrapper css-72u45h-wrapper"
+  class="euiFilterButton__wrapper css-ln4f6z-wrapper"
 >
   <button
     class="euiButtonEmpty euiFilterButton emotion-euiButtonDisplay-euiButtonEmpty-m-empty-text-euiFilterButton-default"
@@ -202,7 +202,7 @@ exports[`EuiFilterButton props type renders 1`] = `
 
 exports[`EuiFilterButton props withNext renders 1`] = `
 <div
-  class="euiFilterButton__wrapper css-ey2vw6-wrapper-withNext"
+  class="euiFilterButton__wrapper css-mvbmby-wrapper-withNext"
 >
   <button
     class="euiButtonEmpty euiFilterButton emotion-euiButtonDisplay-euiButtonEmpty-m-empty-text-euiFilterButton-default"
@@ -221,7 +221,7 @@ exports[`EuiFilterButton props withNext renders 1`] = `
 
 exports[`EuiFilterButton renders 1`] = `
 <div
-  class="euiFilterButton__wrapper css-72u45h-wrapper"
+  class="euiFilterButton__wrapper css-ln4f6z-wrapper"
 >
   <button
     aria-label="aria-label"
@@ -242,7 +242,7 @@ exports[`EuiFilterButton renders 1`] = `
 
 exports[`EuiFilterButton renders zero properly 1`] = `
 <div
-  class="euiFilterButton__wrapper css-1u66048-wrapper-hasNotification"
+  class="euiFilterButton__wrapper css-1xcpmpj-wrapper-hasNotification"
 >
   <button
     aria-label="aria-label"
diff --git a/packages/eui/src/components/filter_group/filter_button.styles.ts b/packages/eui/src/components/filter_group/filter_button.styles.ts
index b78fa30a9e8..664986ddf0b 100644
--- a/packages/eui/src/components/filter_group/filter_button.styles.ts
+++ b/packages/eui/src/components/filter_group/filter_button.styles.ts
@@ -8,7 +8,7 @@
 
 import { css } from '@emotion/react';
 
-import { isEuiThemeRefreshVariant, UseEuiTheme } from '../../services';
+import { UseEuiTheme } from '../../services';
 import {
   logicalCSS,
   mathWithUnits,
@@ -16,174 +16,68 @@ import {
   euiTextTruncate,
   highContrastModeStyles,
   preventForcedColors,
-  euiButtonEmptyColor,
 } from '../../global_styling';
 import { cssSupportsHasWithNextSibling } from '../../global_styling/functions/supports';
 import { euiFormVariables } from '../form/form.styles';
 
 export const euiFilterButtonDisplay = (euiThemeContext: UseEuiTheme) => {
   const { euiTheme } = euiThemeContext;
-  const isRefreshVariant = isEuiThemeRefreshVariant(
-    euiThemeContext,
-    'buttonVariant'
-  );
 
   return {
     flex: '1 1 auto',
-    minInlineSize: mathWithUnits(
-      euiTheme.size.base,
-      (x) => x * (isRefreshVariant ? 2.75 : 3)
-    ),
+    minInlineSize: mathWithUnits(euiTheme.size.base, (x) => x * 2.75),
   };
 };
 
 export const euiFilterButtonStyles = (euiThemeContext: UseEuiTheme) => {
   const { euiTheme } = euiThemeContext;
-  const isRefreshVariant = isEuiThemeRefreshVariant(
-    euiThemeContext,
-    'buttonVariant'
-  );
-  const { controlHeight, borderColor } = euiFormVariables(euiThemeContext);
 
   const selectedSelector = '.euiFilterButton-isSelected';
-  const border = `${euiTheme.border.width.thin} solid ${borderColor}`;
+  const withNextSelector = '& + .euiFilterButton__wrapper';
 
-  // Pseudo elements create borders without affecting width. We also prefer them
-  // over box-shadow for Windows high contrast theme compatibility
-  const leftBorder = `
-    &::before {
-      content: '';
-      position: absolute;
-      ${logicalCSS('right', '100%')}
-      ${logicalCSS('vertical', 0)}
-      ${logicalCSS('border-left', border)}
-    }
-  `;
-  // Bottom borders are needed for responsive flex-wrap behavior
-  const bottomBorder = `
-    &::after {
-      content: '';
-      position: absolute;
-      ${logicalCSS('top', '100%')}
-      ${logicalCSS('horizontal', 0)}
-      ${logicalCSS('border-bottom', border)}
-    }
-  `;
+  return {
+    euiFilterButton: css`
+      position: relative;
 
-  const buttonStyles = isRefreshVariant
-    ? `
       ${logicalCSS('width', '100%')}
 
       &:not(${selectedSelector}) {
         &:hover,
         &:active {
-          .euiFilterButton__notification[class*="subdued"] {
-            background-color: ${
-              euiTheme.components.filterButtonBadgeBackgroundHover
-            }
+          .euiFilterButton__notification[class*='subdued'] {
+            background-color: ${euiTheme.components
+              .filterButtonBadgeBackgroundHover};
           }
         }
       }
-    `
-    : `
-      ${logicalCSS('height', controlHeight)}
-      border-radius: 0;
-      ${leftBorder}
-      ${bottomBorder}
-
-      /* :not(:disabled) specificity needed to override EuiButtonEmpty styles */
-      &:hover:not(:disabled),
-      &:focus:not(:disabled) {
-        /* Remove underline from whole button so notifications don't get the underline */
-        text-decoration: none;
-
-        .euiFilterButton__text {
-          /* And put it only on the actual text part */
-          text-decoration: underline;
-        }
-      }
-    `;
-
-  const toggleTypeStyles = isRefreshVariant
-    ? `
-      ${euiFilterButtonDisplay(euiThemeContext)};
-
-      ${highContrastModeStyles(euiThemeContext, {
-        forced: `
-          &:is(${selectedSelector}) {
-            ${preventForcedColors(euiThemeContext)}
-              color: ${euiTheme.colors.emptyShade};
-              background-color: ${euiTheme.colors.fullShade};
-          }
-        `,
-      })}
-    `
-    : `
-      font-weight: ${euiTheme.font.weight.medium};
-      padding: 0;
-
-      &:is(${selectedSelector}) {
-        color: ${euiButtonEmptyColor(euiThemeContext, 'text').color};
-        background-color: transparent;
-        font-weight: ${euiTheme.font.weight.bold};
-      }
-    `;
-
-  const withNextSelector = isRefreshVariant
-    ? '& + .euiFilterButton__wrapper'
-    : '.euiFilterButton__wrapper:has(&) + .euiFilterButton__wrapper';
-  // handles display of borders between buttons
-  const withNextStyles = isRefreshVariant
-    ? `
-      &::before {
-        border: none;
-      }
-
-      ${cssSupportsHasWithNextSibling(
-        `
-          &:has(+ :not(&)) {
-            ${logicalCSS('padding-right', '0')}
-          }
-        `
-      )}
-    `
-    : `
-      .euiFilterButton {
-        &::before {
-          border: none;
-        }
-      }
-    `;
-
-  return {
-    euiFilterButton: css`
-      ${!isRefreshVariant && euiFilterButtonDisplay(euiThemeContext)};
-      position: relative;
-
-      ${buttonStyles}
     `,
     buttonType: {
       default: css`
-        ${isRefreshVariant &&
-        `
-          border-radius: 0;
+        border-radius: 0;
 
-          &:focus-visible {
-            z-index: 1;
-            outline-offset: -${euiTheme.border.width.thick};
-            border-radius: ${euiTheme.border.radius.small};
-            transition: none;
-          }
-        `}
+        &:focus-visible {
+          z-index: 1;
+          outline-offset: -${euiTheme.border.width.thick};
+          border-radius: ${euiTheme.border.radius.small};
+          transition: none;
+        }
       `,
       toggle: css`
+        ${euiFilterButtonDisplay(euiThemeContext)}
+
         &:focus-visible {
-          outline-offset: ${mathWithUnits(euiTheme.focus.width, (x) =>
-            isRefreshVariant ? x / 2 : x * -1
-          )};
+          outline-offset: ${mathWithUnits(euiTheme.focus.width, (x) => x / 2)};
         }
 
-        ${toggleTypeStyles}
+        ${highContrastModeStyles(euiThemeContext, {
+          forced: `
+            &:is(${selectedSelector}) {
+              ${preventForcedColors(euiThemeContext)}
+                color: ${euiTheme.colors.emptyShade};
+                background-color: ${euiTheme.colors.fullShade};
+            }
+          `,
+        })}
       `,
     },
     withNext: css`
@@ -191,7 +85,17 @@ export const euiFilterButtonStyles = (euiThemeContext: UseEuiTheme) => {
         ${logicalCSS('margin-left', `-${euiTheme.size.xs}`)}
 
         /* Remove just the left faux border */
-        ${withNextStyles}
+        &::before {
+          border: none;
+        }
+
+        ${cssSupportsHasWithNextSibling(
+          `
+            &:has(+ :not(&)) {
+              ${logicalCSS('padding-right', '0')}
+            }
+          `
+        )}
       }
     `,
     noGrow: css`
@@ -204,19 +108,13 @@ export const euiFilterButtonStyles = (euiThemeContext: UseEuiTheme) => {
       )}
     `,
     hasActiveFilters: css`
-      font-weight: ${isRefreshVariant
-        ? euiTheme.font.weight.medium
-        : euiTheme.font.weight.bold};
+      font-weight: ${euiTheme.font.weight.medium};
     `,
   };
 };
 
 export const euiFilterButtonWrapperStyles = (euiThemeContext: UseEuiTheme) => {
   const { euiTheme } = euiThemeContext;
-  const isRefreshVariant = isEuiThemeRefreshVariant(
-    euiThemeContext,
-    'buttonVariant'
-  );
 
   const { borderColor } = euiFormVariables(euiThemeContext);
   const border = `${euiTheme.border.width.thin} solid ${borderColor}`;
@@ -251,19 +149,13 @@ export const euiFilterButtonWrapperStyles = (euiThemeContext: UseEuiTheme) => {
       display: flex;
       align-items: center;
 
-      ${isRefreshVariant &&
-      `
-        ${leftBorder}
-        ${bottomBorder}
-      `}
+      ${leftBorder}
+      ${bottomBorder}
 
       ${logicalCSS('padding-vertical', euiTheme.border.width.thin)}
     `,
     hasToggle: css`
-      ${logicalCSS(
-        'padding-horizontal',
-        isRefreshVariant ? euiTheme.border.width.thin : '0'
-      )}
+      ${logicalCSS('padding-horizontal', euiTheme.border.width.thin)}
 
       /* removes right padding for toggle buttons that have a right divider border */
       ${cssSupportsHasWithNextSibling(
@@ -279,20 +171,13 @@ export const euiFilterButtonWrapperStyles = (euiThemeContext: UseEuiTheme) => {
 
 export const euiFilterButtonChildStyles = (euiThemeContext: UseEuiTheme) => {
   const { euiTheme } = euiThemeContext;
-  const isRefreshVariant = isEuiThemeRefreshVariant(
-    euiThemeContext,
-    'buttonVariant'
-  );
 
   return {
     content: {
       euiFilterButton__content: css`
-        ${isRefreshVariant &&
-        `
-          .euiThemeProvider {
-            display: inline-flex;
-          }
-        `}
+        .euiThemeProvider {
+          display: inline-flex;
+        }
       `,
       hasIcon: css`
         /* Align the dropdown arrow/caret to the right */
@@ -309,10 +194,7 @@ export const euiFilterButtonChildStyles = (euiThemeContext: UseEuiTheme) => {
       hasNotification: css`
         ${logicalCSS(
           'min-width',
-          mathWithUnits(
-            euiTheme.size.base,
-            (x) => x * (isRefreshVariant ? 2 : 3)
-          )
+          mathWithUnits(euiTheme.size.base, (x) => x * 2)
         )}
       `,
     },
diff --git a/packages/eui/src/components/filter_group/filter_button.tsx b/packages/eui/src/components/filter_group/filter_button.tsx
index 8e2c3e7016e..80dd6dfadba 100644
--- a/packages/eui/src/components/filter_group/filter_button.tsx
+++ b/packages/eui/src/components/filter_group/filter_button.tsx
@@ -15,7 +15,6 @@ import {
   useEuiMemoizedStyles,
   useEuiTheme,
   useGeneratedHtmlId,
-  useEuiThemeRefreshVariant,
 } from '../../services';
 import { useEuiI18n } from '../i18n';
 import { useInnerText } from '../inner_text';
@@ -118,29 +117,22 @@ export const EuiFilterButton: FunctionComponent<EuiFilterButtonProps> = ({
   const euiThemeContext = useEuiTheme();
   const { colorMode } = euiThemeContext;
 
-  const isRefreshVariant = useEuiThemeRefreshVariant('buttonVariant');
-
   // assumption about type of usage based on icon usage
   // requires manual override to apply correct aria attributes for more custom usages
   const isCollapsible = !isToggle && iconType === 'arrowDown';
-  // NOTE: in Amsterdam `hasActiveFilters` applies selected styling while `isSelected` does not.
-  // With Borealis this is more granular as EuiFilterButton now supports proper toggle buttons next to regular buttons
   const isExpanded = isCollapsible && (isSelected ?? hasActiveFilters);
 
   const styles = useEuiMemoizedStyles(euiFilterButtonStyles);
   const focusColorStyles = useEuiMemoizedStyles(_compressedButtonFocusColors);
 
-  const toggleVariantStyles = isRefreshVariant
-    ? [
-        isToggle && styles.buttonType.toggle,
-        !isToggle && !isDisabled && focusColorStyles[color],
-        !isToggle && styles.buttonType.default,
-      ]
-    : [isToggle && styles.buttonType.toggle];
+  const toggleVariantStyles = [
+    isToggle && styles.buttonType.toggle,
+    !isToggle && !isDisabled && focusColorStyles[color],
+    !isToggle && styles.buttonType.default,
+  ];
 
   const cssStyles = [
     styles.euiFilterButton,
-    !isRefreshVariant && withNext && styles.withNext,
     hasActiveFilters && styles.hasActiveFilters,
     ...toggleVariantStyles,
   ];
@@ -149,7 +141,7 @@ export const EuiFilterButton: FunctionComponent<EuiFilterButtonProps> = ({
 
   const wrapperCssStyles = [
     wrapperStyles.wrapper,
-    isRefreshVariant && withNext && styles.withNext,
+    withNext && styles.withNext,
     numFiltersDefined && styles.hasNotification,
     isToggle && wrapperStyles.hasToggle,
     !grow && styles.noGrow,
@@ -168,7 +160,7 @@ export const EuiFilterButton: FunctionComponent<EuiFilterButtonProps> = ({
       'euiFilterButton-isSelected': isSelected,
       'euiFilterButton-hasActiveFilters': hasActiveFilters,
       'euiFilterButton-hasNotification': numFiltersDefined,
-      'euiFilterButton-isToggle': isRefreshVariant && isToggle,
+      'euiFilterButton-isToggle': isToggle,
     },
     className
   );
@@ -205,17 +197,13 @@ export const EuiFilterButton: FunctionComponent<EuiFilterButtonProps> = ({
     </EuiNotificationBadge>
   );
 
-  const badgeElement =
-    showBadge &&
-    (isRefreshVariant ? (
-      <EuiThemeProvider
-        colorMode={isToggle && isSelected ? 'INVERSE' : colorMode}
-      >
-        {badgeContent}
-      </EuiThemeProvider>
-    ) : (
-      badgeContent
-    ));
+  const badgeElement = showBadge && (
+    <EuiThemeProvider
+      colorMode={isToggle && isSelected ? 'INVERSE' : colorMode}
+    >
+      {badgeContent}
+    </EuiThemeProvider>
+  );
 
   /**
    * Text
diff --git a/packages/eui/src/components/filter_group/filter_group.styles.ts b/packages/eui/src/components/filter_group/filter_group.styles.ts
index 4c6a82a0c1b..a46dd451c1c 100644
--- a/packages/eui/src/components/filter_group/filter_group.styles.ts
+++ b/packages/eui/src/components/filter_group/filter_group.styles.ts
@@ -6,70 +6,44 @@
  * Side Public License, v 1.
  */
 
-import { CSSProperties } from 'react';
 import { css } from '@emotion/react';
 
-import { isEuiThemeRefreshVariant, UseEuiTheme } from '../../services';
+import { UseEuiTheme } from '../../services';
 import { logicalCSS, mathWithUnits, euiBreakpoint } from '../../global_styling';
-import { highContrastModeStyles } from '../../global_styling/functions/high_contrast';
 import { euiFormVariables } from '../form/form.styles';
 
 import { euiFilterButtonDisplay } from './filter_button.styles';
 
 export const euiFilterGroupStyles = (euiThemeContext: UseEuiTheme) => {
   const { euiTheme } = euiThemeContext;
-  const isRefreshVariant = isEuiThemeRefreshVariant(
-    euiThemeContext,
-    'buttonVariant'
-  );
-
-  const {
-    backgroundColor,
-    borderColor,
-    controlBorderRadius,
-    controlHeight,
-    controlCompressedBorderRadius,
-    controlCompressedHeight,
-  } = euiFormVariables(euiThemeContext);
-
-  const borderRadius = isRefreshVariant
-    ? euiTheme.border.radius.small
-    : controlBorderRadius;
-
-  const borderRadiusCompressed = isRefreshVariant
-    ? euiTheme.border.radius.small
-    : controlCompressedBorderRadius;
-
-  const borderStyle = isRefreshVariant
-    ? `
-      /* Adds the border on a pseudo element to prevent height differences between wrapper and buttons.
-      Uses ::after to ensure overlap and prevents blocking by setting pointer-events: none */
-      &::after {
-        content: '';
-        position: absolute;
-        inset: 0;
-        border: ${euiTheme.border.width.thin} solid ${euiTheme.colors.borderBasePlain};
-        border-radius: inherit;
-        pointer-events: none;
-      }
-    `
-    : `
-      ${highContrastModeStyles(euiThemeContext, {
-        none: `box-shadow: inset 0 0 0 ${euiTheme.border.width.thin} ${borderColor};`,
-        forced: `border: ${euiTheme.border.thin};`,
-      })}
-    `;
+
+  const { backgroundColor, controlHeight, controlCompressedHeight } =
+    euiFormVariables(euiThemeContext);
+
+  const borderRadius = euiTheme.border.radius.small;
+
+  const borderRadiusCompressed = euiTheme.border.radius.small;
 
   return {
     euiFilterGroup: css`
-      ${isRefreshVariant && `position: relative;`}
+      position: relative;
       display: inline-flex;
       ${logicalCSS('max-width', '100%')}
       overflow: hidden;
 
       background-color: ${backgroundColor};
 
-      ${borderStyle}
+      /* Adds the border on a pseudo element to prevent height differences between wrapper and buttons.
+      Uses ::after to ensure overlap and prevents blocking by setting pointer-events: none */
+      &::after {
+        content: '';
+        position: absolute;
+        inset: 0;
+        border: ${euiTheme.border.width.thin} solid
+          ${euiTheme.colors.borderBasePlain};
+        border-radius: inherit;
+        pointer-events: none;
+      }
 
       /* Account for popover or tooltip wrappers around EuiFilterButtons */
       > *:not(.euiFilterButton__wrapper, .euiFilterButton) {
@@ -87,20 +61,13 @@ export const euiFilterGroupStyles = (euiThemeContext: UseEuiTheme) => {
         /* Force all tiny screens to take up the entire width */
         display: flex;
 
+        .euiPopover:focus-within {
+          z-index: 1;
+        }
+
         .euiFilterButton__wrapper {
           flex-grow: 1;
         }
-
-        ${isRefreshVariant &&
-        `
-          .euiPopover:focus-within {
-            z-index: 1;
-          }
-            
-          .euiFilterButton__wrapper {
-            flex-grow: 1;
-          }
-        `}
       }
     `,
     fullWidth: css`
@@ -117,48 +84,35 @@ export const euiFilterGroupStyles = (euiThemeContext: UseEuiTheme) => {
         ${logicalCSS('height', controlHeight)}
       }
 
-      ${!isRefreshVariant && buttonChildrenBorderRadii(borderRadius)}
-      ${isRefreshVariant &&
-      `
-        .euiFilterButton-isToggle {
-          ${logicalCSS(
-            'height',
-            mathWithUnits(
-              [controlHeight, euiTheme.size.xxs],
-              (x, y) => x - 3 * y
-            )
-          )}
-        }
-      `}
+      .euiFilterButton-isToggle {
+        ${logicalCSS(
+          'height',
+          mathWithUnits([controlHeight, euiTheme.size.xxs], (x, y) => x - 3 * y)
+        )}
+      }
     `,
     compressed: css`
       border-radius: ${borderRadiusCompressed};
-      ${!isRefreshVariant && buttonChildrenBorderRadii(borderRadiusCompressed)}
 
       .euiFilterButton {
         ${logicalCSS(
           'height',
-          isRefreshVariant
-            ? mathWithUnits(
-                [controlCompressedHeight, euiTheme.border.width.thin],
-                (x, y) => x - 2 * y
-              )
-            : controlCompressedHeight
+          mathWithUnits(
+            [controlCompressedHeight, euiTheme.border.width.thin],
+            (x, y) => x - 2 * y
+          )
         )}
       }
 
-      ${isRefreshVariant &&
-      `
-        .euiFilterButton-isToggle {
-          ${logicalCSS(
-            'height',
-            mathWithUnits(
-              [controlCompressedHeight, euiTheme.size.xxs],
-              (x, y) => x - 3 * y
-            )
-          )}
-        }
-      `}
+      .euiFilterButton-isToggle {
+        ${logicalCSS(
+          'height',
+          mathWithUnits(
+            [controlCompressedHeight, euiTheme.size.xxs],
+            (x, y) => x - 3 * y
+          )
+        )}
+      }
     `,
     /**
      * Not used in EuiFilterGroup directly, but used by EuiSearchBar and consumers
@@ -173,26 +127,3 @@ export const euiFilterGroupStyles = (euiThemeContext: UseEuiTheme) => {
     `,
   };
 };
-
-/**
- * Small util for manually rounding the borders of the first and last EuiFilterButtons
- * - this makes their focus rings appear nicely instead of being cutt off.
- * 2nd selector accounts for EuiFilterButtons nested within popover/tooltip wrappers.
- *
- * NOTE: Do not use `logicalShorthandCSS()` here, as that will cause single buttons to not be rounded
- */
-const buttonChildrenBorderRadii = (
-  radiusSize: CSSProperties['borderRadius']
-) => `
-  > :first-child,
-  > :first-child .euiFilterButton {
-    ${logicalCSS('border-top-left-radius', radiusSize)}
-    ${logicalCSS('border-bottom-left-radius', radiusSize)}
-  }
-
-  > :last-child,
-  > :last-child .euiFilterButton {
-    ${logicalCSS('border-top-right-radius', radiusSize)}
-    ${logicalCSS('border-bottom-right-radius', radiusSize)}
-  }
-`;
diff --git a/packages/eui/src/components/form/field_number/field_number.styles.ts b/packages/eui/src/components/form/field_number/field_number.styles.ts
index 8a4785b8e39..7140274547e 100644
--- a/packages/eui/src/components/form/field_number/field_number.styles.ts
+++ b/packages/eui/src/components/form/field_number/field_number.styles.ts
@@ -8,33 +8,14 @@
 
 import { css } from '@emotion/react';
 
-import { isEuiThemeRefreshVariant, UseEuiTheme } from '../../../services';
+import { UseEuiTheme } from '../../../services';
 import { euiFormControlStyles } from '../form.styles';
 
 export const euiFieldNumberStyles = (euiThemeContext: UseEuiTheme) => {
   const { colorMode } = euiThemeContext;
-  const isRefreshVariant = isEuiThemeRefreshVariant(
-    euiThemeContext,
-    'formVariant'
-  );
 
   const formStyles = euiFormControlStyles(euiThemeContext);
 
-  const invalidStyles = isRefreshVariant
-    ? `
-      &:is(:invalid, [aria-invalid='true']):not(
-        .euiFormControlLayoutDelimited__input, :focus
-      ) {
-          ${formStyles.invalid}
-        }
-    `
-    : `
-      /* Account for native validity detection as well via [aria-invalid="true"] */
-      &:is(:invalid, [aria-invalid='true']) {
-        ${formStyles.invalid}
-      }
-    `;
-
   return {
     euiFieldNumber: css`
       ${formStyles.shared}
@@ -42,7 +23,12 @@ export const euiFieldNumberStyles = (euiThemeContext: UseEuiTheme) => {
       /* Force the browser number stepper UI to follow EUI's light/dark mode */
       color-scheme: ${colorMode === 'DARK' ? 'dark' : 'light'};
 
-      ${invalidStyles}
+      &:is(:invalid, [aria-invalid='true']):not(
+          .euiFormControlLayoutDelimited__input,
+          :focus
+        ) {
+        ${formStyles.invalid}
+      }
 
       &:focus {
         ${formStyles.focus}
diff --git a/packages/eui/src/components/form/field_text/field_text.styles.ts b/packages/eui/src/components/form/field_text/field_text.styles.ts
index 814c0ac5032..776e9628668 100644
--- a/packages/eui/src/components/form/field_text/field_text.styles.ts
+++ b/packages/eui/src/components/form/field_text/field_text.styles.ts
@@ -8,35 +8,21 @@
 
 import { css } from '@emotion/react';
 
-import { isEuiThemeRefreshVariant, UseEuiTheme } from '../../../services';
+import { UseEuiTheme } from '../../../services';
 import { euiFormControlStyles } from '../form.styles';
 
 export const euiFieldTextStyles = (euiThemeContext: UseEuiTheme) => {
-  const isRefreshVariant = isEuiThemeRefreshVariant(
-    euiThemeContext,
-    'formVariant'
-  );
   const formStyles = euiFormControlStyles(euiThemeContext);
 
-  const invalidStyles = isRefreshVariant
-    ? `
+  return {
+    euiFieldText: css`
+      ${formStyles.shared}
+
       &:is(:invalid, [aria-invalid='true']):not(
         .euiFormControlLayoutDelimited__input, :focus
       ) {
-          ${formStyles.invalid}
-        }
-    `
-    : `
-      &:is(:invalid){
         ${formStyles.invalid}
       }
-    `;
-
-  return {
-    euiFieldText: css`
-      ${formStyles.shared}
-
-      ${invalidStyles}
 
       &:focus {
         ${formStyles.focus}
diff --git a/packages/eui/src/components/form/file_picker/file_picker.styles.ts b/packages/eui/src/components/form/file_picker/file_picker.styles.ts
index e68d15c78d6..18c674aa649 100644
--- a/packages/eui/src/components/form/file_picker/file_picker.styles.ts
+++ b/packages/eui/src/components/form/file_picker/file_picker.styles.ts
@@ -8,7 +8,7 @@
 
 import { css } from '@emotion/react';
 
-import { isEuiThemeRefreshVariant, UseEuiTheme } from '../../../services';
+import { UseEuiTheme } from '../../../services';
 import {
   euiCanAnimate,
   euiFontSize,
@@ -25,10 +25,6 @@ import {
 
 export const euiFilePickerStyles = (euiThemeContext: UseEuiTheme) => {
   const { euiTheme, highContrastMode } = euiThemeContext;
-  const isRefreshVariant = isEuiThemeRefreshVariant(
-    euiThemeContext,
-    'formVariant'
-  );
 
   const formStyles = euiFormControlStyles(euiThemeContext);
   const formVariables = euiFormVariables(euiThemeContext);
@@ -48,9 +44,7 @@ export const euiFilePickerStyles = (euiThemeContext: UseEuiTheme) => {
         --euiFormControlStateColor: ${highContrastMode
           ? euiTheme.border.color
           : formVariables.borderHovered};
-        --euiFormControlStateStyle: ${highContrastMode && isRefreshVariant
-          ? 'solid'
-          : 'dashed'};
+        --euiFormControlStateStyle: solid;
       }
 
       &:focus-within {
@@ -65,17 +59,12 @@ export const euiFilePickerStyles = (euiThemeContext: UseEuiTheme) => {
       }
     `,
     isDroppingFile: css`
-      --euiFormControlStateColor: ${isRefreshVariant
-        ? euiTheme.colors.borderStrongSuccess
-        : euiTheme.colors.primary};
+      --euiFormControlStateColor: ${euiTheme.colors.borderStrongSuccess};
+      --euiFormControlStateStyle: ${highContrastMode === 'forced'
+        ? 'solid'
+        : 'dashed'};
 
-      ${isRefreshVariant &&
-      `  
-        --euiFormControlStateStyle: ${
-          highContrastMode === 'forced' ? 'solid' : 'dashed'
-        };
-        background-color: ${euiTheme.components.forms.backgroundDropping}
-      `}
+      background-color: ${euiTheme.components.forms.backgroundDropping};
     `,
     invalid: css`
       --euiFormControlStateColor: ${formVariables.borderInvalid};
@@ -134,8 +123,6 @@ export const euiFilePickerStyles = (euiThemeContext: UseEuiTheme) => {
         .euiFilePicker-isDroppingFile & {
           & + .euiFilePicker__prompt {
             .euiFilePicker__promptText {
-              text-decoration: ${isRefreshVariant ? '' : 'underline'};
-
               ${highContrastModeStyles(euiThemeContext, {
                 forced: `
                   text-decoration: underline;
@@ -144,7 +131,7 @@ export const euiFilePickerStyles = (euiThemeContext: UseEuiTheme) => {
             }
 
             .euiFilePicker__icon {
-              transform: scale(${isRefreshVariant ? 1.05 : 1.1});
+              transform: scale(1.05);
             }
           }
         }
@@ -157,16 +144,9 @@ export const euiFilePickerStyles = (euiThemeContext: UseEuiTheme) => {
       line-height: 1; /* Vertically centers default display text */
       ${euiTextTruncate()}
       color: ${euiTheme.colors.textParagraph};
-      border: ${isRefreshVariant
-          ? euiTheme.border.width.thin
-          : euiTheme.border.width.thick}
+      border: ${euiTheme.border.width.thin}
         var(--euiFormControlStateStyle, dashed)
-        var(
-          --euiFormControlStateColor,
-          ${isRefreshVariant
-            ? formVariables.borderColor
-            : euiTheme.border.color}
-        );
+        var(--euiFormControlStateColor, ${formVariables.borderColor});
 
       ${euiCanAnimate} {
         transition: border-color ${euiTheme.animation.fast} ease-in,
diff --git a/packages/eui/src/components/form/file_picker/file_picker.tsx b/packages/eui/src/components/form/file_picker/file_picker.tsx
index 91ab93de901..3166a774227 100644
--- a/packages/eui/src/components/form/file_picker/file_picker.tsx
+++ b/packages/eui/src/components/form/file_picker/file_picker.tsx
@@ -13,8 +13,6 @@ import {
   withEuiStylesMemoizer,
   WithEuiStylesMemoizerProps,
   htmlIdGenerator,
-  RenderWithEuiTheme,
-  isEuiThemeRefreshVariant,
 } from '../../../services';
 import { CommonProps } from '../../common';
 
@@ -145,210 +143,194 @@ export class EuiFilePickerClass extends Component<
     const { defaultFullWidth } = this.context as FormContextValue;
 
     return (
-      <RenderWithEuiTheme>
-        {(euiThemeContext) => (
-          <EuiI18n
-            token="euiFilePicker.removeSelectedAriaLabel"
-            default="Remove selected files"
-          >
-            {(removeSelectedAriaLabel: string) => {
-              const {
-                stylesMemoizer,
-                id,
-                name,
-                initialPromptText,
-                className,
-                disabled,
-                compressed,
-                onChange,
-                isInvalid,
-                fullWidth = defaultFullWidth,
-                isLoading,
-                display,
-                ...rest
-              } = this.props;
-
-              const isRefreshVariant = isEuiThemeRefreshVariant(
-                euiThemeContext,
-                'formVariant'
-              );
-
-              const promptId = `${id || this.generatedId}-filePicker__prompt`;
-
-              const isOverridingInitialPrompt = this.state.promptText != null;
-
-              const normalFormControl = display === 'default';
-
-              const classes = classNames(
-                'euiFilePicker',
-                {
-                  'euiFilePicker-isDroppingFile': this.state.isHoveringDrop,
-                  'euiFilePicker-isInvalid': isInvalid,
-                  'euiFilePicker-isLoading': isLoading,
-                  'euiFilePicker-hasFiles': isOverridingInitialPrompt,
-                },
-                className
+      <EuiI18n
+        token="euiFilePicker.removeSelectedAriaLabel"
+        default="Remove selected files"
+      >
+        {(removeSelectedAriaLabel: string) => {
+          const {
+            stylesMemoizer,
+            id,
+            name,
+            initialPromptText,
+            className,
+            disabled,
+            compressed,
+            onChange,
+            isInvalid,
+            fullWidth = defaultFullWidth,
+            isLoading,
+            display,
+            ...rest
+          } = this.props;
+
+          const promptId = `${id || this.generatedId}-filePicker__prompt`;
+
+          const isOverridingInitialPrompt = this.state.promptText != null;
+
+          const normalFormControl = display === 'default';
+
+          const classes = classNames(
+            'euiFilePicker',
+            {
+              'euiFilePicker-isDroppingFile': this.state.isHoveringDrop,
+              'euiFilePicker-isInvalid': isInvalid,
+              'euiFilePicker-isLoading': isLoading,
+              'euiFilePicker-hasFiles': isOverridingInitialPrompt,
+            },
+            className
+          );
+
+          const styles = stylesMemoizer(euiFilePickerStyles);
+          const cssStyles = [
+            styles.euiFilePicker,
+            fullWidth ? styles.fullWidth : styles.formWidth,
+            this.state.isHoveringDrop && styles.isDroppingFile,
+            isInvalid && !disabled && styles.invalid,
+            isOverridingInitialPrompt && !disabled && styles.hasFiles,
+            isLoading && styles.loading,
+          ];
+
+          const inputStyles = [
+            styles.input.euiFilePicker__input,
+            !normalFormControl && !disabled && styles.input.largeInteractive,
+          ];
+
+          const promptStyles = [
+            styles.euiFilePicker__prompt,
+            disabled && styles.disabled,
+            ...(normalFormControl
+              ? [compressed ? styles.compressed : styles.uncompressed]
+              : [
+                  styles.large.large,
+                  compressed
+                    ? styles.large.compressed
+                    : styles.large.uncompressed,
+                ]),
+          ];
+
+          const iconStyles = [
+            styles.icon.euiFilePicker__icon,
+            ...(normalFormControl
+              ? [
+                  styles.icon.normal,
+                  compressed
+                    ? styles.icon.compresssed
+                    : styles.icon.uncompressed,
+                ]
+              : [styles.icon.large]),
+          ];
+
+          const rightIconStyles = normalFormControl
+            ? [
+                styles.rightIcon.euiFilePicker__rightIcon,
+                compressed
+                  ? styles.rightIcon.compressed
+                  : styles.rightIcon.uncompressed,
+              ]
+            : undefined;
+
+          let clearButton;
+          if (isLoading && normalFormControl) {
+            // Override clear button with loading spinner if it is in loading state
+            clearButton = (
+              <EuiLoadingSpinner
+                css={rightIconStyles}
+                className="euiFilePicker__loadingSpinner"
+                size={compressed ? 's' : 'm'}
+              />
+            );
+          } else if (isOverridingInitialPrompt && !disabled) {
+            if (normalFormControl) {
+              clearButton = (
+                <EuiFormControlLayoutClearButton
+                  aria-label={removeSelectedAriaLabel}
+                  css={[styles.euiFilePicker__clearButton, rightIconStyles]}
+                  className="euiFilePicker__clearButton"
+                  onClick={this.removeFiles}
+                  size={compressed ? 's' : 'm'}
+                />
               );
-
-              const styles = stylesMemoizer(euiFilePickerStyles);
-              const cssStyles = [
-                styles.euiFilePicker,
-                fullWidth ? styles.fullWidth : styles.formWidth,
-                this.state.isHoveringDrop && styles.isDroppingFile,
-                isInvalid && !disabled && styles.invalid,
-                isOverridingInitialPrompt && !disabled && styles.hasFiles,
-                isLoading && styles.loading,
-              ];
-
-              const inputStyles = [
-                styles.input.euiFilePicker__input,
-                !normalFormControl &&
-                  !disabled &&
-                  styles.input.largeInteractive,
-              ];
-
-              const promptStyles = [
-                styles.euiFilePicker__prompt,
-                disabled && styles.disabled,
-                ...(normalFormControl
-                  ? [compressed ? styles.compressed : styles.uncompressed]
-                  : [
-                      styles.large.large,
-                      compressed
-                        ? styles.large.compressed
-                        : styles.large.uncompressed,
-                    ]),
-              ];
-
-              const iconStyles = [
-                styles.icon.euiFilePicker__icon,
-                ...(normalFormControl
-                  ? [
-                      styles.icon.normal,
-                      compressed
-                        ? styles.icon.compresssed
-                        : styles.icon.uncompressed,
-                    ]
-                  : [styles.icon.large]),
-              ];
-
-              const rightIconStyles = normalFormControl
-                ? [
-                    styles.rightIcon.euiFilePicker__rightIcon,
-                    compressed
-                      ? styles.rightIcon.compressed
-                      : styles.rightIcon.uncompressed,
-                  ]
-                : undefined;
-
-              let clearButton;
-              if (isLoading && normalFormControl) {
-                // Override clear button with loading spinner if it is in loading state
-                clearButton = (
-                  <EuiLoadingSpinner
-                    css={rightIconStyles}
-                    className="euiFilePicker__loadingSpinner"
-                    size={compressed ? 's' : 'm'}
+            } else {
+              clearButton = (
+                <EuiButtonEmpty
+                  aria-label={removeSelectedAriaLabel}
+                  css={styles.euiFilePicker__clearButton}
+                  className="euiFilePicker__clearButton"
+                  size="xs"
+                  onClick={this.removeFiles}
+                >
+                  <EuiI18n
+                    token="euiFilePicker.removeSelected"
+                    default="Remove"
                   />
-                );
-              } else if (isOverridingInitialPrompt && !disabled) {
-                if (normalFormControl) {
-                  clearButton = (
-                    <EuiFormControlLayoutClearButton
-                      aria-label={removeSelectedAriaLabel}
-                      css={[styles.euiFilePicker__clearButton, rightIconStyles]}
-                      className="euiFilePicker__clearButton"
-                      onClick={this.removeFiles}
-                      size={compressed ? 's' : 'm'}
-                    />
-                  );
-                } else {
-                  clearButton = (
-                    <EuiButtonEmpty
-                      aria-label={removeSelectedAriaLabel}
-                      css={styles.euiFilePicker__clearButton}
-                      className="euiFilePicker__clearButton"
-                      size="xs"
-                      onClick={this.removeFiles}
-                    >
-                      <EuiI18n
-                        token="euiFilePicker.removeSelected"
-                        default="Remove"
-                      />
-                    </EuiButtonEmpty>
-                  );
-                }
-              } else {
-                clearButton = null;
-              }
-
-              const loader = !normalFormControl && isLoading && (
-                <EuiProgress size="xs" color="accent" position="absolute" />
-              );
-
-              // Currently this tenary is a little complex, it'll be simplified once we remove Amsterdam
-              const iconColor = isInvalid
-                ? 'danger'
-                : disabled
-                ? isRefreshVariant
-                  ? 'disabled'
-                  : 'subdued'
-                : isRefreshVariant
-                ? 'text'
-                : 'primary';
-
-              return (
-                <div css={cssStyles} className={classes}>
-                  <EuiValidatableControl isInvalid={isInvalid}>
-                    <input
-                      type="file"
-                      id={id}
-                      name={name}
-                      css={inputStyles}
-                      className="euiFilePicker__input"
-                      onChange={this.handleChange}
-                      ref={(input) => {
-                        this.fileInput = input;
-                      }}
-                      onDragOver={this.showDrop}
-                      onDragLeave={this.hideDrop}
-                      onDrop={this.hideDrop}
-                      disabled={disabled}
-                      aria-describedby={promptId}
-                      {...rest}
-                    />
-                  </EuiValidatableControl>
-                  <div
-                    css={promptStyles}
-                    className="euiFilePicker__prompt"
-                    id={promptId}
-                  >
-                    <EuiIcon
-                      css={iconStyles}
-                      className="euiFilePicker__icon"
-                      color={iconColor}
-                      type={
-                        isInvalid
-                          ? 'alert'
-                          : isRefreshVariant && disabled
-                          ? 'minusInCircle'
-                          : 'importAction'
-                      }
-                      size={normalFormControl ? 'm' : 'l'}
-                      aria-hidden="true"
-                    />
-                    <span className="euiFilePicker__promptText">
-                      {this.state.promptText || initialPromptText}
-                    </span>
-                    {clearButton}
-                    {loader}
-                  </div>
-                </div>
+                </EuiButtonEmpty>
               );
-            }}
-          </EuiI18n>
-        )}
-      </RenderWithEuiTheme>
+            }
+          } else {
+            clearButton = null;
+          }
+
+          const loader = !normalFormControl && isLoading && (
+            <EuiProgress size="xs" color="accent" position="absolute" />
+          );
+
+          const iconColor = isInvalid
+            ? 'danger'
+            : disabled
+            ? 'disabled'
+            : 'text';
+
+          return (
+            <div css={cssStyles} className={classes}>
+              <EuiValidatableControl isInvalid={isInvalid}>
+                <input
+                  type="file"
+                  id={id}
+                  name={name}
+                  css={inputStyles}
+                  className="euiFilePicker__input"
+                  onChange={this.handleChange}
+                  ref={(input) => {
+                    this.fileInput = input;
+                  }}
+                  onDragOver={this.showDrop}
+                  onDragLeave={this.hideDrop}
+                  onDrop={this.hideDrop}
+                  disabled={disabled}
+                  aria-describedby={promptId}
+                  {...rest}
+                />
+              </EuiValidatableControl>
+              <div
+                css={promptStyles}
+                className="euiFilePicker__prompt"
+                id={promptId}
+              >
+                <EuiIcon
+                  css={iconStyles}
+                  className="euiFilePicker__icon"
+                  color={iconColor}
+                  type={
+                    isInvalid
+                      ? 'alert'
+                      : disabled
+                      ? 'minusInCircle'
+                      : 'importAction'
+                  }
+                  size={normalFormControl ? 'm' : 'l'}
+                  aria-hidden="true"
+                />
+                <span className="euiFilePicker__promptText">
+                  {this.state.promptText || initialPromptText}
+                </span>
+                {clearButton}
+                {loader}
+              </div>
+            </div>
+          );
+        }}
+      </EuiI18n>
     );
   }
 }
diff --git a/packages/eui/src/components/form/form.styles.test.tsx b/packages/eui/src/components/form/form.styles.test.tsx
index 68b2bd70d67..3f1d3371467 100644
--- a/packages/eui/src/components/form/form.styles.test.tsx
+++ b/packages/eui/src/components/form/form.styles.test.tsx
@@ -85,7 +85,6 @@ describe('euiFormControlStyles', () => {
             -webkit-text-fill-color: #2B394F;
             -webkit-box-shadow: inset 0 0 0 1px #BFDBFF, inset 0 0 0 100vw #E8F1FF;
 
-            
             &:hover,
             &:focus {
               -webkit-box-shadow: inset 0 0 0 1px #0B64DD, inset 0 0 0 100vw #E8F1FF;
@@ -98,7 +97,6 @@ describe('euiFormControlStyles', () => {
                 -webkit-box-shadow: inset 0 0 0 1px #DA3737, inset 0 0 0 100vw #E8F1FF;
               }
             }
-          
           }
         ",
         "compressed": "
@@ -109,18 +107,16 @@ describe('euiFormControlStyles', () => {
             border-radius: 4px;
           ",
         "disabled": "
+          --euiFormControlStateColor: transparent;
+          --euiFormControlStateHoverColor: transparent;
+          --euiFormControlStateColor: #CAD3E2;
+
           color: #798EAF;
           /* Required for Safari */
           -webkit-text-fill-color: #798EAF;
           background-color: #ECF1F9;
           cursor: not-allowed;
-          --euiFormControlStateColor: transparent;
-
           
-            --euiFormControlStateHoverColor: transparent;
-            --euiFormControlStateColor: #CAD3E2;
-          
-
           
         &::-webkit-input-placeholder { 
           color: #798EAF;
@@ -181,25 +177,24 @@ describe('euiFormControlStyles', () => {
             background-size: 100% 100%;
           ",
         "readOnly": "
+          --euiFormControlStateColor: #CAD3E2;
+          --euiFormControlStateHoverColor: #CAD3E2;
+          --euiFormControlStateWidth: 1px;
+
+          /* keep the input below wrapper borders */
+          position: relative;
+          z-index: 0;
           background-color: #ECF1F9;
           cursor: default;
           color: #1D2A3E;
           -webkit-text-fill-color: #1D2A3E; /* Required for Safari */
+          outline: none;
+          box-shadow: inset 0 0 0 var(--euiFormControlStateWidth) var(--euiFormControlStateColor);
 
-          
-            --euiFormControlStateColor: #CAD3E2;
-            --euiFormControlStateHoverColor: #CAD3E2;
-            --euiFormControlStateWidth: 1px;
-            /* keep the input below wrapper borders */
-            position: relative;
-            z-index: 0;
-            outline: none;
-            box-shadow: inset 0 0 0 var(--euiFormControlStateWidth) var(--euiFormControlStateColor);
+          .euiFormControlLayout__childrenWrapper[class*=inGroup] & {
+            box-shadow: none;
+          }
 
-            .euiFormControlLayout__childrenWrapper[class*=inGroup] & {
-              box-shadow: none;
-            }
-            
           
         ",
         "shared": "
@@ -244,7 +239,6 @@ describe('euiFormControlStyles', () => {
           }
           background-color: #FFFFFF;
           
-          
         
           ",
         "uncompressed": "
diff --git a/packages/eui/src/components/form/form.styles.ts b/packages/eui/src/components/form/form.styles.ts
index dcb04f0149a..75932eab2d3 100644
--- a/packages/eui/src/components/form/form.styles.ts
+++ b/packages/eui/src/components/form/form.styles.ts
@@ -6,11 +6,7 @@
  * Side Public License, v 1.
  */
 
-import {
-  UseEuiTheme,
-  isEuiThemeRefreshVariant,
-  makeHighContrastColor,
-} from '../../services';
+import { UseEuiTheme, makeHighContrastColor } from '../../services';
 import {
   logicalCSS,
   mathWithUnits,
@@ -40,10 +36,6 @@ export const euiFormPlaceholderStyles = (
 
 export const euiFormVariables = (euiThemeContext: UseEuiTheme) => {
   const { euiTheme, highContrastMode } = euiThemeContext;
-  const isRefreshVariant = isEuiThemeRefreshVariant(
-    euiThemeContext,
-    'formVariant'
-  );
 
   const backgroundColor = highContrastMode
     ? euiTheme.colors.emptyShade
@@ -58,15 +50,10 @@ export const euiFormVariables = (euiThemeContext: UseEuiTheme) => {
     controlCompressedHeight: controlCompressedHeight,
     controlPadding: euiTheme.size.m,
     controlCompressedPadding: euiTheme.size.s,
-    controlBorderRadius: isRefreshVariant
-      ? euiTheme.border.radius.small
-      : euiTheme.border.radius.medium,
+    controlBorderRadius: euiTheme.border.radius.small,
     controlCompressedBorderRadius: euiTheme.border.radius.small,
     iconAffordance: mathWithUnits(euiTheme.size.base, (x) => x * 1.5),
-    iconCompressedAffordance: mathWithUnits(
-      isRefreshVariant ? euiTheme.size.base : euiTheme.size.m,
-      (x) => x * 1.5
-    ),
+    iconCompressedAffordance: mathWithUnits(euiTheme.size.base, (x) => x * 1.5),
     stateUnderlineHeight: highContrastMode
       ? mathWithUnits(euiTheme.border.width.thick, (x) => x * 2)
       : euiTheme.border.width.thick,
@@ -87,13 +74,11 @@ export const euiFormVariables = (euiThemeContext: UseEuiTheme) => {
     borderInvalidHovered: euiTheme.components.forms.borderInvalidHovered,
     controlDisabledColor: euiTheme.components.forms.controlBackgroundDisabled,
     controlBoxShadow: '0 0 transparent',
-    controlPlaceholderText: isRefreshVariant
-      ? highContrastMode
-        ? makeHighContrastColor(euiTheme.components.forms.colorDisabled)(
-            backgroundColor
-          )
-        : euiTheme.components.forms.colorDisabled
-      : makeHighContrastColor(euiTheme.colors.textSubdued)(backgroundColor),
+    controlPlaceholderText: highContrastMode
+      ? makeHighContrastColor(euiTheme.components.forms.colorDisabled)(
+          backgroundColor
+        )
+      : euiTheme.components.forms.colorDisabled,
     appendPrependBackground: euiTheme.components.forms.prependBackground,
   };
 
@@ -129,10 +114,6 @@ const formControlLayoutWrapperSelector =
   '.euiFormControlLayout__childrenWrapper';
 
 export const euiFormControlStyles = (euiThemeContext: UseEuiTheme) => {
-  const isRefreshVariant = isEuiThemeRefreshVariant(
-    euiThemeContext,
-    'formVariant'
-  );
   const form = euiFormVariables(euiThemeContext);
 
   return {
@@ -176,7 +157,7 @@ export const euiFormControlStyles = (euiThemeContext: UseEuiTheme) => {
         none: 'box-shadow: none;',
         preferred: 'border: none;',
       })}
-      border-radius: ${isRefreshVariant ? 'inherit' : '0'};
+      border-radius: inherit;
     `,
 
     // Widths
@@ -220,25 +201,18 @@ export const euiFormControlDefaultShadow = (
     withBorder = true,
     withBackground = true,
     withBackgroundColor = withBackground,
-    withBackgroundAnimation = withBackground,
   }: {
     withBorder?: boolean;
     withBackground?: boolean;
     withBackgroundColor?: boolean;
-    withBackgroundAnimation?: boolean;
   } = {}
 ) => {
   const { euiTheme } = euiThemeContext;
-  const isRefreshVariant = isEuiThemeRefreshVariant(
-    euiThemeContext,
-    'formVariant'
-  );
-  const form = euiFormVariables(euiThemeContext);
 
+  const form = euiFormVariables(euiThemeContext);
   const border = highContrastModeStyles(euiThemeContext, {
     // We use inset box-shadow instead of border to skip extra height calculations
-    none: isRefreshVariant
-      ? `
+    none: `
       --euiFormControlStateColor: ${form.borderColor};
       border: none;
       box-shadow: inset 0 0 0 ${
@@ -246,10 +220,6 @@ export const euiFormControlDefaultShadow = (
       } var(--euiFormControlStateColor);
 
       ${euiFormControlHoverStyles(euiThemeContext)}
-    `
-      : `
-      border: none;
-      box-shadow: inset 0 0 0 ${euiTheme.border.width.thin} ${form.borderColor};
     `,
     // In high contrast mode, this doesn't matter - we need to prioritize visibility
     preferred: `
@@ -264,25 +234,6 @@ export const euiFormControlDefaultShadow = (
   `.trim();
 
   const backgroundGradient = highContrastModeStyles(euiThemeContext, {
-    none: !isRefreshVariant
-      ? `
-      background-repeat: no-repeat;
-      background-size: 0% 100%;
-      background-image: linear-gradient(to top,
-        var(--euiFormControlStateColor),
-        var(--euiFormControlStateColor) ${
-          isRefreshVariant
-            ? mathWithUnits(
-                [euiTheme.border.width.thick, euiTheme.border.width.thin],
-                (x, y) => x + y // account for pseudo element border
-              )
-            : form.stateUnderlineHeight
-        },
-        transparent ${form.stateUnderlineHeight},
-        transparent 100%
-      );
-    `
-      : '',
     // Windows high contrast mode overrides/hides background gradients - we'll need another approach
     forced: `
       background-repeat: no-repeat;
@@ -292,22 +243,10 @@ export const euiFormControlDefaultShadow = (
     `,
   });
 
-  const backgroundAnimation = !isRefreshVariant
-    ? `
-    ${euiCanAnimate} {
-      transition:
-        background-image ${form.animationTiming},
-        background-size ${form.animationTiming},
-        background-color ${form.animationTiming};
-    }
-  `.trim()
-    : '';
-
   return `
     ${withBorder ? border : ''}
     ${withBackgroundColor ? backgroundColor : ''}
     ${withBackground ? backgroundGradient : ''}
-    ${withBackgroundAnimation ? backgroundAnimation : ''}
   `;
 };
 
@@ -355,16 +294,11 @@ export const euiFormControlHighlightBorderStyles = `
 
 export const euiFormControlFocusStyles = (euiThemeContext: UseEuiTheme) => {
   const { euiTheme } = euiThemeContext;
-  const isRefreshVariant = isEuiThemeRefreshVariant(
-    euiThemeContext,
-    'formVariant'
-  );
 
   const form = euiFormVariables(euiThemeContext);
   const focusColor = euiTheme.colors.primary;
 
-  return isRefreshVariant
-    ? `
+  return `
       --euiFormControlStateColor: ${form.borderFocused};
       --euiFormControlStateHoverColor: ${form.borderFocused};
       --euiFormControlStateWidth: ${euiTheme.border.width.thick};
@@ -374,27 +308,16 @@ export const euiFormControlFocusStyles = (euiThemeContext: UseEuiTheme) => {
           ${euiFormControlShowBackgroundLine(euiThemeContext, focusColor)}
         `,
       })}
-    `
-    : `
-      --euiFormControlStateColor: ${focusColor};
-      background-color: ${euiTheme.components.forms.backgroundFocused};
-      ${euiFormControlShowBackgroundLine(euiThemeContext, focusColor)}
-      outline: none; /* Remove all outlines and rely on our own bottom border gradient */
     `;
 };
 
 export const euiFormControlInvalidStyles = (euiThemeContext: UseEuiTheme) => {
   const { euiTheme, highContrastMode } = euiThemeContext;
-  const isRefreshVariant = isEuiThemeRefreshVariant(
-    euiThemeContext,
-    'formVariant'
-  );
 
   const form = euiFormVariables(euiThemeContext);
   const invalidColor = euiTheme.colors.danger;
 
-  return isRefreshVariant
-    ? `
+  return `
       --euiFormControlStateColor: ${form.borderInvalid};
       --euiFormControlStateHoverColor: ${form.borderInvalidHovered};
       --euiFormControlStateWidth: ${
@@ -405,92 +328,61 @@ export const euiFormControlInvalidStyles = (euiThemeContext: UseEuiTheme) => {
 
       ${euiFormControlHighlightBorderStyles}
       ${euiFormControlShowBackgroundLine(euiThemeContext, invalidColor)}
-    `
-    : `
-      --euiFormControlStateColor: ${invalidColor};
-      ${euiFormControlShowBackgroundLine(euiThemeContext, invalidColor)}
     `;
 };
 
 export const euiFormControlDisabledStyles = (euiThemeContext: UseEuiTheme) => {
-  const isRefreshVariant = isEuiThemeRefreshVariant(
-    euiThemeContext,
-    'formVariant'
-  );
   const form = euiFormVariables(euiThemeContext);
 
-  const refreshVariantStyles = `
-      --euiFormControlStateHoverColor: transparent;
-      --euiFormControlStateColor: ${form.borderColor};
-    `;
-
   return `
+    --euiFormControlStateColor: transparent;
+    --euiFormControlStateHoverColor: transparent;
+    --euiFormControlStateColor: ${form.borderColor};
+
     color: ${form.textColorDisabled};
     /* Required for Safari */
     -webkit-text-fill-color: ${form.textColorDisabled};
     background-color: ${form.backgroundDisabledColor};
     cursor: not-allowed;
-    --euiFormControlStateColor: transparent;
-
-    ${isRefreshVariant && refreshVariantStyles}
-
+    
     ${euiPlaceholderPerBrowser(euiFormPlaceholderStyles(euiThemeContext))}
   `;
 };
 
 export const euiFormControlReadOnlyStyles = (euiThemeContext: UseEuiTheme) => {
   const { euiTheme } = euiThemeContext;
-  const isRefreshVariant = isEuiThemeRefreshVariant(
-    euiThemeContext,
-    'formVariant'
-  );
 
   const form = euiFormVariables(euiThemeContext);
 
-  const styles = isRefreshVariant
-    ? `
-      --euiFormControlStateColor: ${form.borderColor};
-      --euiFormControlStateHoverColor: ${form.borderColor};
-      --euiFormControlStateWidth: ${euiTheme.border.width.thin};
-      /* keep the input below wrapper borders */
-      position: relative;
-      z-index: 0;
-      outline: none;
-      box-shadow: inset 0 0 0 var(--euiFormControlStateWidth) var(--euiFormControlStateColor);
-
-      ${formControlLayoutWrapperSelector}[class*=inGroup] & {
-        box-shadow: none;
-      }
-      ${highContrastModeStyles(euiThemeContext, {
-        preferred: 'box-shadow: none;',
-      })}
-    `
-    : `
-      --euiFormControlStateColor: transparent;
-      ${highContrastModeStyles(euiThemeContext, {
-        forced: 'background-image: none;',
-      })}
-    `;
-
   return `
+    --euiFormControlStateColor: ${form.borderColor};
+    --euiFormControlStateHoverColor: ${form.borderColor};
+    --euiFormControlStateWidth: ${euiTheme.border.width.thin};
+
+    /* keep the input below wrapper borders */
+    position: relative;
+    z-index: 0;
     background-color: ${form.backgroundReadOnlyColor};
     cursor: default;
     color: ${form.textColor};
     -webkit-text-fill-color: ${form.textColor}; /* Required for Safari */
+    outline: none;
+    box-shadow: inset 0 0 0 var(--euiFormControlStateWidth) var(--euiFormControlStateColor);
+
+    ${formControlLayoutWrapperSelector}[class*=inGroup] & {
+      box-shadow: none;
+    }
 
-    ${styles}
+    ${highContrastModeStyles(euiThemeContext, {
+      preferred: 'box-shadow: none;',
+    })}
   `;
 };
 
 export const euiFormControlAutoFillStyles = (euiThemeContext: UseEuiTheme) => {
   const { euiTheme } = euiThemeContext;
-  const isRefreshVariant = isEuiThemeRefreshVariant(
-    euiThemeContext,
-    'formVariant'
-  );
 
   const form = euiFormVariables(euiThemeContext);
-
   // Make the text color slightly less prominent than the default colors.text
   const textColor = euiTheme.colors.darkestShade;
 
@@ -508,8 +400,12 @@ export const euiFormControlAutoFillStyles = (euiThemeContext: UseEuiTheme) => {
   const borderShadow = (color: string) =>
     `inset 0 0 0 ${euiTheme.border.width.thin} ${color}`;
 
-  const interactiveStyles = isRefreshVariant
-    ? `
+  // These styles only apply/override Chrome/webkit browsers - Firefox does not set autofill styles
+  return `
+    &:-webkit-autofill {
+      -webkit-text-fill-color: ${textColor};
+      -webkit-box-shadow: ${borderShadow(borderColor)}, ${backgroundShadow};
+
       &:hover,
       &:focus {
         -webkit-box-shadow: ${borderShadow(borderHovered)}, ${backgroundShadow};
@@ -524,22 +420,6 @@ export const euiFormControlAutoFillStyles = (euiThemeContext: UseEuiTheme) => {
           )}, ${backgroundShadow};
         }
       }
-    `
-    : `
-      &:invalid {
-          -webkit-box-shadow: ${borderShadow(
-            borderInvalid
-          )}, ${backgroundShadow};
-      }
-    `;
-
-  // These styles only apply/override Chrome/webkit browsers - Firefox does not set autofill styles
-  return `
-    &:-webkit-autofill {
-      -webkit-text-fill-color: ${textColor};
-      -webkit-box-shadow: ${borderShadow(borderColor)}, ${backgroundShadow};
-
-      ${interactiveStyles}
     }
   `;
 };
@@ -549,10 +429,6 @@ export const euiFormControlShowBackgroundLine = (
   color: string
 ) => {
   const { euiTheme, highContrastMode } = euiThemeContext;
-  const isRefreshVariant = isEuiThemeRefreshVariant(
-    euiThemeContext,
-    'formVariant'
-  );
 
   if (highContrastMode !== 'forced') {
     return 'background-size: 100% 100%;';
@@ -565,23 +441,16 @@ export const euiFormControlShowBackgroundLine = (
   // using a static inline SVG workaround
   const fill = encodeURIComponent(color);
   const strokeWidth = stateUnderlineHeight ?? '4px';
-
-  const inlineSVG = `data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg'%3E%3Crect width='100%25' height='100%25' fill='${fill}' /%3E%3C/svg%3E`;
   const refreshInlineSVG = `data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg'%3E%3Crect width='100%25' height='100%25' style='fill:transparent;stroke-width:${strokeWidth};stroke:${fill}' /%3E%3C/svg%3E`;
 
-  return isRefreshVariant
-    ? `
+  return `
       background-size: calc(100% - ${mathWithUnits(
         strokeWidth,
         (x) => x / 2
       )}) calc(100% - ${mathWithUnits(strokeWidth, (x) => x / 2)});
       background-position: ${euiTheme.border.width.thin};
       background-image: url("${refreshInlineSVG}");
-    `
-    : `
-    background-size: 100% ${stateUnderlineHeight};
-    background-image: url("${inlineSVG}");
-  `;
+    `;
 };
 
 const euiPlaceholderPerBrowser = (content: string) => `
diff --git a/packages/eui/src/components/form/form_control_layout/form_control_layout.styles.ts b/packages/eui/src/components/form/form_control_layout/form_control_layout.styles.ts
index 9d7cadd18ea..852272d3603 100644
--- a/packages/eui/src/components/form/form_control_layout/form_control_layout.styles.ts
+++ b/packages/eui/src/components/form/form_control_layout/form_control_layout.styles.ts
@@ -8,81 +8,16 @@
 
 import { css } from '@emotion/react';
 
-import { isEuiThemeRefreshVariant, UseEuiTheme } from '../../../services';
-import {
-  euiTextTruncate,
-  logicalCSS,
-  mathWithUnits,
-} from '../../../global_styling';
+import { UseEuiTheme } from '../../../services';
+import { euiTextTruncate, logicalCSS } from '../../../global_styling';
 import { highContrastModeStyles } from '../../../global_styling/functions/high_contrast';
 
 import { euiFormVariables } from '../form.styles';
 
 export const euiFormControlLayoutStyles = (euiThemeContext: UseEuiTheme) => {
   const { euiTheme } = euiThemeContext;
-  const isRefreshVariant = isEuiThemeRefreshVariant(
-    euiThemeContext,
-    'formVariant'
-  );
   const form = euiFormVariables(euiThemeContext);
 
-  const groupStyles = `
-      /* use pseudo element for borders to prevent dimension changes and support nested elements better */
-      &::after {
-        content: '';
-        position: absolute;
-        inset: 0;
-        z-index: 0;
-        border: ${euiTheme.border.width.thin} solid ${form.borderColor};
-        border-radius: inherit;
-        pointer-events: none;
-      }
-
-      /* the filter group will use the form layout border instead */
-      .euiFilterGroup {
-        border-radius: 0;
-        /* creating extra space to prevent the focus indicator being cut off */
-        ${logicalCSS('padding-right', euiTheme.border.width.thin)}
-
-        &::after {
-          display: none;
-        }
-      }
-
-      .euiFilterButton__wrapper:first-of-type::before,
-      .euiFilterButton__wrapper::after {
-        display: none;
-      }
-  `;
-
-  const wrapperGroupStyles = `
-      > :first-child {
-        border-radius: inherit;
-        ${logicalCSS('border-top-left-radius', '0')}
-        ${logicalCSS('border-bottom-left-radius', '0')}
-      }
-
-      > :last-child {
-        border-radius: inherit;
-        ${logicalCSS('border-top-right-radius', '0')}
-        ${logicalCSS('border-bottom-right-radius', '0')}
-      }
-  `;
-
-  const prependOnlyStyles = `
-      > :last-child {
-        ${logicalCSS('border-top-right-radius', 'inherit')}
-        ${logicalCSS('border-bottom-right-radius', 'inherit')}
-      }
-  `;
-
-  const appendOnlyStyles = `
-      > :first-child {
-        ${logicalCSS('border-top-left-radius', 'inherit')}
-        ${logicalCSS('border-bottom-left-radius', 'inherit')}
-      }
-  `;
-
   return {
     euiFormControlLayout: css`
       position: relative;
@@ -111,13 +46,36 @@ export const euiFormControlLayoutStyles = (euiThemeContext: UseEuiTheme) => {
         display: flex;
         align-items: stretch;
 
-        border: ${isRefreshVariant
-          ? 'none'
-          : `${euiTheme.border.width.thin} solid ${form.borderColor}`};
+        border: none;
         background-color: ${form.backgroundColor};
         overflow: hidden; /* Keep backgrounds inside border radius */
 
-        ${isRefreshVariant && groupStyles}
+        /* use pseudo element for borders to prevent dimension changes and support nested elements better */
+        &::after {
+          content: '';
+          position: absolute;
+          inset: 0;
+          z-index: 0;
+          border: ${euiTheme.border.width.thin} solid ${form.borderColor};
+          border-radius: inherit;
+          pointer-events: none;
+        }
+
+        /* the filter group will use the form layout border instead */
+        .euiFilterGroup {
+          border-radius: 0;
+          /* creating extra space to prevent the focus indicator being cut off */
+          ${logicalCSS('padding-right', euiTheme.border.width.thin)}
+
+          &::after {
+            display: none;
+          }
+        }
+
+        .euiFilterButton__wrapper:first-of-type::before,
+        .euiFilterButton__wrapper::after {
+          display: none;
+        }
 
         .euiFormControlButton {
           border-radius: inherit;
@@ -146,19 +104,35 @@ export const euiFormControlLayoutStyles = (euiThemeContext: UseEuiTheme) => {
         flex-grow: 1;
         overflow: hidden; /* Ensure truncation works in children elements */
 
-        ${isRefreshVariant && wrapperGroupStyles}
+        > :first-child {
+          border-radius: inherit;
+          ${logicalCSS('border-top-left-radius', '0')}
+          ${logicalCSS('border-bottom-left-radius', '0')}
+        }
+
+        > :last-child {
+          border-radius: inherit;
+          ${logicalCSS('border-top-right-radius', '0')}
+          ${logicalCSS('border-bottom-right-radius', '0')}
+        }
       `,
       prependOnly: css`
         ${logicalCSS('border-top-right-radius', 'inherit')}
         ${logicalCSS('border-bottom-right-radius', 'inherit')}
 
-        ${isRefreshVariant && prependOnlyStyles}
+        > :last-child {
+          ${logicalCSS('border-top-right-radius', 'inherit')}
+          ${logicalCSS('border-bottom-right-radius', 'inherit')}
+        }
       `,
       appendOnly: css`
         ${logicalCSS('border-top-left-radius', 'inherit')}
         ${logicalCSS('border-bottom-left-radius', 'inherit')}
 
-        ${isRefreshVariant && appendOnlyStyles}
+        > :first-child {
+          ${logicalCSS('border-top-left-radius', 'inherit')}
+          ${logicalCSS('border-bottom-left-radius', 'inherit')}
+        }
       `,
     },
   };
@@ -168,54 +142,15 @@ export const euiFormControlLayoutSideNodeStyles = (
   euiThemeContext: UseEuiTheme
 ) => {
   const { euiTheme } = euiThemeContext;
-  const isRefreshVariant = isEuiThemeRefreshVariant(
-    euiThemeContext,
-    'formVariant'
-  );
 
   const form = euiFormVariables(euiThemeContext);
 
-  const uncompressedHeight = mathWithUnits(
-    [form.controlHeight, euiTheme.border.width.thin],
-    (x, y) => (isRefreshVariant ? x : x - y * 2)
-  );
-  const compressedHeight = mathWithUnits(
-    [form.controlCompressedHeight, euiTheme.border.width.thin],
-    (x, y) => (isRefreshVariant ? x : x - y * 2)
-  );
+  const uncompressedHeight = form.controlHeight;
+  const compressedHeight = form.controlCompressedHeight;
 
   const buttons = '*:is(.euiButton, .euiButtonEmpty, .euiButtonIcon)';
   const text = '*:is(.euiFormLabel, .euiText)';
 
-  const appendStyles = `
-    position: relative;
-    ${logicalCSS('margin-left', `-${euiTheme.border.width.thin}`)}
-
-    &::before {
-      content: '';
-      position: absolute;
-      inset: 0;
-      pointer-events: none;
-      border-inline-start: 
-        ${euiTheme.border.width.thin} solid ${form.borderColor};
-    }
-  `;
-
-  const prependStyles = `
-    position: relative;
-    ${logicalCSS('margin-right', `-${euiTheme.border.width.thin}`)}
-
-    &::before {
-      content: '';
-      position: absolute;
-      inset: 0;
-      z-index: 1;
-      pointer-events: none;
-      border-inline-end: 
-        ${euiTheme.border.width.thin} solid ${form.borderColor};
-    }
-  `;
-
   return {
     euiFormControlLayout__side: css`
       ${logicalCSS('height', '100%')}
@@ -259,7 +194,17 @@ export const euiFormControlLayoutSideNodeStyles = (
     append: css(
       highContrastModeStyles(euiThemeContext, {
         none: `
-          ${isRefreshVariant && appendStyles}
+          position: relative;
+          ${logicalCSS('margin-left', `-${euiTheme.border.width.thin}`)}
+
+          &::before {
+            content: '';
+            position: absolute;
+            inset: 0;
+            pointer-events: none;
+            border-inline-start: 
+              ${euiTheme.border.width.thin} solid ${form.borderColor};
+          }
         `,
         preferred: logicalCSS('border-left', euiTheme.border.thin),
       })
@@ -267,7 +212,18 @@ export const euiFormControlLayoutSideNodeStyles = (
     prepend: css(
       highContrastModeStyles(euiThemeContext, {
         none: `
-          ${isRefreshVariant && prependStyles}
+          position: relative;
+          ${logicalCSS('margin-right', `-${euiTheme.border.width.thin}`)}
+
+          &::before {
+            content: '';
+            position: absolute;
+            inset: 0;
+            z-index: 1;
+            pointer-events: none;
+            border-inline-end: 
+              ${euiTheme.border.width.thin} solid ${form.borderColor};
+          }
         `,
         preferred: logicalCSS('border-right', euiTheme.border.thin),
       })
diff --git a/packages/eui/src/components/form/form_control_layout/form_control_layout_clear_button.styles.ts b/packages/eui/src/components/form/form_control_layout/form_control_layout_clear_button.styles.ts
index b5373bb2a54..0afdc459972 100644
--- a/packages/eui/src/components/form/form_control_layout/form_control_layout_clear_button.styles.ts
+++ b/packages/eui/src/components/form/form_control_layout/form_control_layout_clear_button.styles.ts
@@ -9,16 +9,12 @@
 import { css } from '@emotion/react';
 
 import { logicalSizeCSS, mathWithUnits } from '../../../global_styling';
-import { isEuiThemeRefreshVariant, UseEuiTheme } from '../../../services';
+import { UseEuiTheme } from '../../../services';
 
 export const EuiFormControlLayoutClearButtonStyles = (
   euiThemeContext: UseEuiTheme
 ) => {
   const { euiTheme, highContrastMode } = euiThemeContext;
-  const isRefreshVariant = isEuiThemeRefreshVariant(
-    euiThemeContext,
-    'formVariant'
-  );
 
   const backgroundColor = highContrastMode
     ? euiTheme.colors.darkShade
@@ -37,9 +33,7 @@ export const EuiFormControlLayoutClearButtonStyles = (
 
       &:disabled {
         cursor: not-allowed;
-        background-color: ${isRefreshVariant
-          ? euiTheme.colors.backgroundBaseDisabled
-          : euiTheme.colors.disabled};
+        background-color: ${euiTheme.colors.backgroundBaseDisabled};
       }
     `,
 
diff --git a/packages/eui/src/components/form/form_control_layout/form_control_layout_delimited.styles.ts b/packages/eui/src/components/form/form_control_layout/form_control_layout_delimited.styles.ts
index eeec43382ca..2ff845bf3b8 100644
--- a/packages/eui/src/components/form/form_control_layout/form_control_layout_delimited.styles.ts
+++ b/packages/eui/src/components/form/form_control_layout/form_control_layout_delimited.styles.ts
@@ -8,7 +8,7 @@
 
 import { css } from '@emotion/react';
 
-import { isEuiThemeRefreshVariant, UseEuiTheme } from '../../../services';
+import { UseEuiTheme } from '../../../services';
 import { logicalCSS, mathWithUnits } from '../../../global_styling';
 import {
   euiFormControlDisabledStyles,
@@ -23,86 +23,30 @@ export const euiFormControlLayoutDelimitedStyles = (
   euiThemeContext: UseEuiTheme
 ) => {
   const { highContrastMode } = euiThemeContext;
-  const isRefreshVariant = isEuiThemeRefreshVariant(
-    euiThemeContext,
-    'formVariant'
-  );
 
   const form = euiFormVariables(euiThemeContext);
 
-  const invalidStyles = isRefreshVariant
-    ? `
-    :not(.euiFormControlLayoutDelimited__input, .euiFormControlLayoutDelimited__delimiter) {
-      ${euiFormControlInvalidStyles(euiThemeContext)}
-    }
-
-    &:focus-within {
-      --euiFormControlStateColor: ${form.borderColor};
-      --euiFormControlStateHoverColor: ${form.borderHovered};
-    }
-
-    .euiFormControlLayoutDelimited__input {
-      background-color: transparent;
-    }
-  `
-    : `
-    ${euiFormControlInvalidStyles(euiThemeContext)};
-  `;
-
-  const readOnlyStyles = `
-      & .euiFormControlLayoutDelimited__input {
-        outline: none;  
-        box-shadow: none;
-        --euiFormControlStateColor: transparent;
-      }
-    `;
-
   const delimitedStyles = `
       /* Transition smoothly between disabled/readOnly background color changes */
       ${euiFormControlDefaultShadow(euiThemeContext, {
-        withBorder: isRefreshVariant && !highContrastMode ? true : false,
+        withBorder: !highContrastMode ? true : false,
         withBackground: false,
-        withBackgroundAnimation: isRefreshVariant ? false : true,
       })}
     `.trim();
 
-  const delimitedWrapperStyles = `
-    ${euiFormControlDefaultShadow(euiThemeContext, {
-      withBorder: !highContrastMode,
-      withBackground: false,
-      withBackgroundAnimation: true,
-    })}
-  
-    &:hover {
-      ${euiFormControlHoverStyles(euiThemeContext)}
-      box-shadow: none;
-
-      /* using hover styling on wrapper instead of the children inputs */
-      .euiFormControlLayoutDelimited__input:not(:focus) {
-        outline: none;
-        background-color: transparent;
-      }
-    }
-
-    /* adjust for delimited behavior differing from default form layout */
-    > :first-child {
-      ${logicalCSS('border-top-left-radius', 'inherit')}
-      ${logicalCSS('border-bottom-left-radius', 'inherit')}
-    }
-
-    > :last-child {
-      ${logicalCSS('border-top-right-radius', 'inherit')}
-      ${logicalCSS('border-bottom-right-radius', 'inherit')}
-    }
-  `;
-
   return {
     // Appended onto existing `euiFormControlLayout` styles
     delimited: css(delimitedStyles),
     disabled: css(euiFormControlDisabledStyles(euiThemeContext)),
     readOnly: css`
       ${euiFormControlReadOnlyStyles(euiThemeContext)}
-      ${isRefreshVariant && readOnlyStyles}
+
+      & .euiFormControlLayoutDelimited__input {
+        --euiFormControlStateColor: transparent;
+
+        outline: none;
+        box-shadow: none;
+      }
     `,
 
     // Appended onto existing `euiFormControlLayout__childrenWrapper` styles
@@ -110,16 +54,51 @@ export const euiFormControlLayoutDelimitedStyles = (
       delimited: css`
         display: flex;
 
-        ${isRefreshVariant && delimitedWrapperStyles}
+        ${euiFormControlDefaultShadow(euiThemeContext, {
+          withBorder: !highContrastMode,
+          withBackground: false,
+        })}
+
+        &:hover {
+          ${euiFormControlHoverStyles(euiThemeContext)}
+          box-shadow: none;
+
+          /* using hover styling on wrapper instead of the children inputs */
+          .euiFormControlLayoutDelimited__input:not(:focus) {
+            outline: none;
+            background-color: transparent;
+          }
+        }
+
+        /* adjust for delimited behavior differing from default form layout */
+        > :first-child {
+          ${logicalCSS('border-top-left-radius', 'inherit')}
+          ${logicalCSS('border-bottom-left-radius', 'inherit')}
+        }
+
+        > :last-child {
+          ${logicalCSS('border-top-right-radius', 'inherit')}
+          ${logicalCSS('border-bottom-right-radius', 'inherit')}
+        }
       `,
       invalid: css(
         euiFormControlDefaultShadow(euiThemeContext, {
           withBorder: false,
           withBackgroundColor: false,
-          withBackgroundAnimation: false,
         }),
         `
-          ${invalidStyles}
+          :not(.euiFormControlLayoutDelimited__input, .euiFormControlLayoutDelimited__delimiter) {
+            ${euiFormControlInvalidStyles(euiThemeContext)}
+          }
+
+          &:focus-within {
+            --euiFormControlStateColor: ${form.borderColor};
+            --euiFormControlStateHoverColor: ${form.borderHovered};
+          }
+
+          .euiFormControlLayoutDelimited__input {
+            background-color: transparent;
+          }
         `
       ),
       readOnly: css``,
@@ -131,19 +110,6 @@ export const euiFormControlLayoutDelimited__delimiter = (
   euiThemeContext: UseEuiTheme
 ) => {
   const { euiTheme } = euiThemeContext;
-  const isRefreshVariant = isEuiThemeRefreshVariant(
-    euiThemeContext,
-    'formVariant'
-  );
-
-  const experimentalStyles =
-    isRefreshVariant &&
-    `
-      ${logicalCSS(
-        'padding-horizontal',
-        mathWithUnits([euiTheme.size.xs, euiTheme.size.xxs], (x, y) => x + y)
-      )}
-  `;
 
   return css`
     display: flex;
@@ -152,23 +118,16 @@ export const euiFormControlLayoutDelimited__delimiter = (
     align-items: center;
     line-height: 1; /* Override EuiText line-height */
 
-    ${experimentalStyles}
+    ${logicalCSS(
+      'padding-horizontal',
+      mathWithUnits([euiTheme.size.xs, euiTheme.size.xxs], (x, y) => x + y)
+    )}
   `;
 };
 
-export const euiFormControlLayoutDelimited__input = (
-  euiThemeContext: UseEuiTheme
-) => {
-  const isRefreshVariant = isEuiThemeRefreshVariant(
-    euiThemeContext,
-    'formVariant'
-  );
-
-  return css`
-    box-shadow: none;
-    border: none; /* Account for high contrast mode borders */
-    border-radius: ${isRefreshVariant ? '' : '0'};
-    text-align: center;
-    ${logicalCSS('height', '100%')}
-  `;
-};
+export const euiFormControlLayoutDelimited__input = css`
+  box-shadow: none;
+  border: none; /* Account for high contrast mode borders */
+  text-align: center;
+  ${logicalCSS('height', '100%')}
+`;
diff --git a/packages/eui/src/components/form/form_control_layout/form_control_layout_delimited.tsx b/packages/eui/src/components/form/form_control_layout/form_control_layout_delimited.tsx
index bd39860167e..40f6dedf6f3 100644
--- a/packages/eui/src/components/form/form_control_layout/form_control_layout_delimited.tsx
+++ b/packages/eui/src/components/form/form_control_layout/form_control_layout_delimited.tsx
@@ -9,12 +9,10 @@
 import React, { FunctionComponent, ReactElement, ReactNode } from 'react';
 import classNames from 'classnames';
 
-import { UseEuiTheme } from '@elastic/eui-theme-common';
 import {
   useEuiMemoizedStyles,
   cloneElementWithCss,
   useEuiTheme,
-  useEuiThemeRefreshVariant,
 } from '../../../services';
 import { useEuiI18n } from '../../i18n';
 import { EuiIcon } from '../../icon';
@@ -59,9 +57,6 @@ export const EuiFormControlLayoutDelimited: FunctionComponent<
   fullWidth: _fullWidth,
   ...rest
 }) => {
-  const euiThemeContext = useEuiTheme();
-  const isRefreshVariant = useEuiThemeRefreshVariant('formVariant');
-
   const { defaultFullWidth } = useFormContext();
   const fullWidth = _fullWidth ?? defaultFullWidth;
 
@@ -82,7 +77,7 @@ export const EuiFormControlLayoutDelimited: FunctionComponent<
     styles.childrenWrapper.delimited,
     showInvalidState && styles.childrenWrapper.invalid,
     rest.wrapperProps?.css,
-    isRefreshVariant && rest.readOnly && styles.childrenWrapper.readOnly,
+    rest.readOnly && styles.childrenWrapper.readOnly,
   ];
 
   return (
@@ -96,25 +91,22 @@ export const EuiFormControlLayoutDelimited: FunctionComponent<
       wrapperProps={{ ...rest.wrapperProps, css: wrapperStyles }}
     >
       <FormContext.Provider value={{ defaultFullWidth: fullWidth }}>
-        {startControl && addClassesToControl(euiThemeContext, startControl)}
+        {startControl && addClassesToControl(startControl)}
         <EuiFormControlDelimiter
           delimiter={delimiter}
           isInvalid={showInvalidState}
         />
-        {endControl && addClassesToControl(euiThemeContext, endControl)}
+        {endControl && addClassesToControl(endControl)}
       </FormContext.Provider>
     </EuiFormControlLayout>
   );
 };
 
-const addClassesToControl = (
-  euiThemeContext: UseEuiTheme,
-  control: ReactElement
-) => {
+const addClassesToControl = (control: ReactElement) => {
   return cloneElementWithCss(
     control,
     {
-      css: euiFormControlLayoutDelimited__input(euiThemeContext),
+      css: euiFormControlLayoutDelimited__input,
       className: classNames(
         control.props.className,
         'euiFormControlLayoutDelimited__input'
diff --git a/packages/eui/src/components/form/form_control_layout/form_control_layout_icons.tsx b/packages/eui/src/components/form/form_control_layout/form_control_layout_icons.tsx
index 50ad4ecb30b..f08c03e5dae 100644
--- a/packages/eui/src/components/form/form_control_layout/form_control_layout_icons.tsx
+++ b/packages/eui/src/components/form/form_control_layout/form_control_layout_icons.tsx
@@ -8,11 +8,7 @@
 
 import React, { Component } from 'react';
 
-import {
-  isEuiThemeRefreshVariant,
-  RenderWithEuiStylesMemoizer,
-  RenderWithEuiTheme,
-} from '../../../services';
+import { RenderWithEuiStylesMemoizer } from '../../../services';
 import { DistributiveOmit } from '../../common';
 import { EuiIcon, IconColor, IconType } from '../../icon';
 import { EuiLoadingSpinner } from '../../loading';
@@ -109,7 +105,7 @@ export class EuiFormControlLayoutIcons extends Component<EuiFormControlLayoutIco
   }
 
   renderCustomIcon() {
-    const { icon, compressed, isDisabled } = this.props;
+    const { icon, isDisabled } = this.props;
 
     if (!icon) {
       return null;
@@ -124,127 +120,63 @@ export class EuiFormControlLayoutIcons extends Component<EuiFormControlLayoutIco
     const { ref: iconRef, side, ...iconRest } = iconProps;
 
     return (
-      <RenderWithEuiTheme>
-        {(euiThemeContext) => {
-          const isRefreshVariant = isEuiThemeRefreshVariant(
-            euiThemeContext,
-            'formVariant'
-          );
-
-          return (
-            <EuiFormControlLayoutCustomIcon
-              size={compressed && !isRefreshVariant ? 's' : 'm'}
-              disabled={isDisabled}
-              iconRef={iconRef}
-              {...iconRest}
-            />
-          );
-        }}
-      </RenderWithEuiTheme>
+      <EuiFormControlLayoutCustomIcon
+        size="m"
+        disabled={isDisabled}
+        iconRef={iconRef}
+        {...iconRest}
+      />
     );
   }
 
   renderDropdownIcon() {
-    const { isDropdown, compressed, isDisabled } = this.props;
+    const { isDropdown, isDisabled } = this.props;
 
     if (!isDropdown) {
       return null;
     }
 
     return (
-      <RenderWithEuiTheme>
-        {(euiThemeContext) => {
-          const isRefreshVariant = isEuiThemeRefreshVariant(
-            euiThemeContext,
-            'formVariant'
-          );
-
-          return (
-            <EuiFormControlLayoutCustomIcon
-              size={compressed && !isRefreshVariant ? 's' : 'm'}
-              disabled={isDisabled}
-              type="arrowDown"
-            />
-          );
-        }}
-      </RenderWithEuiTheme>
+      <EuiFormControlLayoutCustomIcon
+        size="m"
+        disabled={isDisabled}
+        type="arrowDown"
+      />
     );
   }
 
   renderLoadingSpinner() {
-    const { isLoading, compressed } = this.props;
+    const { isLoading } = this.props;
 
     if (!isLoading) {
       return null;
     }
 
-    return (
-      <RenderWithEuiTheme>
-        {(euiThemeContext) => {
-          const isRefreshVariant = isEuiThemeRefreshVariant(
-            euiThemeContext,
-            'formVariant'
-          );
-
-          return (
-            <EuiLoadingSpinner
-              size={compressed && !isRefreshVariant ? 's' : 'm'}
-            />
-          );
-        }}
-      </RenderWithEuiTheme>
-    );
+    return <EuiLoadingSpinner size="m" />;
   }
 
   renderClearButton() {
-    const { clear, compressed, isDisabled } = this.props;
+    const { clear, isDisabled } = this.props;
     if (!clear) {
       return null;
     }
 
     return (
-      <RenderWithEuiTheme>
-        {(euiThemeContext) => {
-          const isRefreshVariant = isEuiThemeRefreshVariant(
-            euiThemeContext,
-            'formVariant'
-          );
-
-          return (
-            <EuiFormControlLayoutClearButton
-              size={compressed && !isRefreshVariant ? 's' : 'm'}
-              disabled={isDisabled}
-              {...clear}
-            />
-          );
-        }}
-      </RenderWithEuiTheme>
+      <EuiFormControlLayoutClearButton
+        size="m"
+        disabled={isDisabled}
+        {...clear}
+      />
     );
   }
 
   renderInvalidIcon() {
-    const { isInvalid, compressed } = this.props;
+    const { isInvalid } = this.props;
+
     if (!isInvalid) {
       return null;
     }
 
-    return (
-      <RenderWithEuiTheme>
-        {(euiThemeContext) => {
-          const isRefreshVariant = isEuiThemeRefreshVariant(
-            euiThemeContext,
-            'formVariant'
-          );
-
-          return (
-            <EuiIcon
-              size={compressed && !isRefreshVariant ? 's' : 'm'}
-              color="danger"
-              type="warning"
-            />
-          );
-        }}
-      </RenderWithEuiTheme>
-    );
+    return <EuiIcon size="m" color="danger" type="warning" />;
   }
 }
diff --git a/packages/eui/src/components/form/form_error_text/form_error_text.styles.ts b/packages/eui/src/components/form/form_error_text/form_error_text.styles.ts
index 6e329faeba5..2b1c2e1a612 100644
--- a/packages/eui/src/components/form/form_error_text/form_error_text.styles.ts
+++ b/packages/eui/src/components/form/form_error_text/form_error_text.styles.ts
@@ -8,23 +8,17 @@
 
 import { css } from '@emotion/react';
 
-import { isEuiThemeRefreshVariant, UseEuiTheme } from '../../../services';
+import { UseEuiTheme } from '../../../services';
 import { euiFontSize, logicalCSS } from '../../../global_styling';
 
 export const euiFormErrorTextStyles = (euiThemeContext: UseEuiTheme) => {
   const { euiTheme } = euiThemeContext;
-  const isRefreshVariant = isEuiThemeRefreshVariant(
-    euiThemeContext,
-    'formVariant'
-  );
 
   return {
     euiFormErrorText: css`
       ${logicalCSS('padding-top', euiTheme.size.xs)}
       ${euiFontSize(euiThemeContext, 'xs')}
-      color: ${isRefreshVariant
-        ? euiTheme.colors.textDanger
-        : euiTheme.colors.danger};
+      color: ${euiTheme.colors.textDanger};
     `,
   };
 };
diff --git a/packages/eui/src/components/form/form_label/__snapshots__/form_label.test.tsx.snap b/packages/eui/src/components/form/form_label/__snapshots__/form_label.test.tsx.snap
index e8ca9716d41..de31e2b67d4 100644
--- a/packages/eui/src/components/form/form_label/__snapshots__/form_label.test.tsx.snap
+++ b/packages/eui/src/components/form/form_label/__snapshots__/form_label.test.tsx.snap
@@ -23,7 +23,7 @@ exports[`EuiFormLabel props isDisabled is still disabled with for attribute 1`]
 
 exports[`EuiFormLabel props isFocused is rendered 1`] = `
 <label
-  class="euiFormLabel euiFormLabel-isFocused emotion-euiFormLabel-focused"
+  class="euiFormLabel euiFormLabel-isFocused emotion-euiFormLabel"
 />
 `;
 
diff --git a/packages/eui/src/components/form/form_label/form_label.styles.ts b/packages/eui/src/components/form/form_label/form_label.styles.ts
index 5fce8b17c58..fff96cc6189 100644
--- a/packages/eui/src/components/form/form_label/form_label.styles.ts
+++ b/packages/eui/src/components/form/form_label/form_label.styles.ts
@@ -9,7 +9,7 @@
 import { css } from '@emotion/react';
 import { serializeStyles, type CSSObject } from '@emotion/serialize';
 
-import { isEuiThemeRefreshVariant, UseEuiTheme } from '../../../services';
+import { UseEuiTheme } from '../../../services';
 import { euiCanAnimate, euiTextBreakWord } from '../../../global_styling';
 import { euiTitle } from '../../title/title.styles';
 
@@ -30,10 +30,6 @@ export const euiFormLabel = (euiThemeContext: UseEuiTheme) => {
 
 export const euiFormLabelStyles = (euiThemeContext: UseEuiTheme) => {
   const { euiTheme } = euiThemeContext;
-  const isRefreshVariant = isEuiThemeRefreshVariant(
-    euiThemeContext,
-    'formVariant'
-  );
 
   return {
     euiFormLabel: css`
@@ -53,13 +49,7 @@ export const euiFormLabelStyles = (euiThemeContext: UseEuiTheme) => {
       }
     `,
     invalid: css`
-      color: ${isRefreshVariant
-        ? euiTheme.colors.textDanger
-        : euiTheme.colors.danger};
-    `,
-    // Focused state should override invalid state
-    focused: css`
-      color: ${isRefreshVariant ? '' : euiTheme.colors.primary};
+      color: ${euiTheme.colors.textDanger};
     `,
   };
 };
diff --git a/packages/eui/src/components/form/form_label/form_label.tsx b/packages/eui/src/components/form/form_label/form_label.tsx
index dff8e7bd401..71da15f4547 100644
--- a/packages/eui/src/components/form/form_label/form_label.tsx
+++ b/packages/eui/src/components/form/form_label/form_label.tsx
@@ -63,7 +63,6 @@ export const EuiFormLabel: FunctionComponent<EuiFormLabelProps> = ({
     styles.euiFormLabel,
     !isDisabled && styles.notDisabled,
     isInvalid && styles.invalid,
-    isFocused && styles.focused,
   ];
 
   const classes = classNames('euiFormLabel', className, {
diff --git a/packages/eui/src/components/form/range/range_input.styles.ts b/packages/eui/src/components/form/range/range_input.styles.ts
index ff9a8360755..6d610e4dfb8 100644
--- a/packages/eui/src/components/form/range/range_input.styles.ts
+++ b/packages/eui/src/components/form/range/range_input.styles.ts
@@ -7,18 +7,15 @@
  */
 
 import { css } from '@emotion/react';
-import { isEuiThemeRefreshVariant, UseEuiTheme } from '../../../services';
+import { UseEuiTheme } from '../../../services';
 
 export const euiRangeInputStyles = (euiThemeContext: UseEuiTheme) => {
   const { euiTheme } = euiThemeContext;
-  const isRefreshVariant = isEuiThemeRefreshVariant(
-    euiThemeContext,
-    'formVariant'
-  );
+
   return {
     euiRangeInput: css`
       inline-size: auto;
-      min-inline-size: ${euiTheme.base * (isRefreshVariant ? 3.5 : 4)}px;
+      min-inline-size: ${euiTheme.base * 3.5}px;
 
       .euiRange__popover &,
       .euiDualRange__popover & {
diff --git a/packages/eui/src/components/header/header.styles.ts b/packages/eui/src/components/header/header.styles.ts
index 83321229afa..9d35ca4875e 100644
--- a/packages/eui/src/components/header/header.styles.ts
+++ b/packages/eui/src/components/header/header.styles.ts
@@ -10,11 +10,7 @@ import { css } from '@emotion/react';
 import { euiShadowXSmall } from '@elastic/eui-theme-common';
 
 import { logicalCSS } from '../../global_styling';
-import {
-  UseEuiTheme,
-  isEuiThemeRefreshVariant,
-  makeHighContrastColor,
-} from '../../services';
+import { UseEuiTheme, makeHighContrastColor } from '../../services';
 
 export const euiHeaderVariables = (euiThemeContext: UseEuiTheme) => {
   const { euiTheme } = euiThemeContext;
@@ -76,83 +72,12 @@ export const euiHeaderStyles = (euiThemeContext: UseEuiTheme) => {
  * It's also possible that the dark header will go away or become unused
  * by Kibana in the near future, at which point we can remove this
  */
-import { euiFormVariables } from '../form/form.styles';
 
 const euiHeaderDarkStyles = (euiThemeContext: UseEuiTheme) => {
-  const { euiTheme, highContrastMode } = euiThemeContext;
-  const isRefreshVariant = isEuiThemeRefreshVariant(
-    euiThemeContext,
-    'formVariant'
-  );
-  const { controlPlaceholderText } = euiFormVariables(euiThemeContext);
+  const { euiTheme } = euiThemeContext;
 
   const backgroundColor = euiTheme.components.headerDarkBackground;
 
-  // Specific color overrides for EuiSelectableTemplateSitewide
-  const selectableSitewide = {
-    color: euiTheme.colors.ghost,
-    borderColor: euiTheme.components.headerDarkSearchBorderColor,
-    placeholderColor: makeHighContrastColor(
-      controlPlaceholderText,
-      8
-    )(backgroundColor),
-  };
-
-  const formLayoutStyles = `
-    .euiSelectableTemplateSitewide .euiFormControlLayout {
-      background-color: transparent;
-
-      input {
-        box-shadow: inset 0 0 0 ${euiTheme.border.width.thin} ${
-    selectableSitewide.borderColor
-  };
-      }
-
-      &--group {
-        border-color: ${
-          // the header is in a faux dark mode, we can't rely on color
-          // switch tokens as they'd be in the wrong color mode
-          highContrastMode
-            ? euiTheme.colors.plainLight
-            : euiTheme.components.headerDarkSearchBorderColor
-        };
-
-        input {
-          box-shadow: none;
-        }
-      }
-
-      &__append {
-        border-color: ${highContrastMode ? euiTheme.colors.plainLight : ''}
-      }
-
-      &:not(:focus-within) {
-        /* Increase contrast of filled text to be more than placeholder text */
-        color: ${selectableSitewide.color};
-
-        input {
-          /* Increase contrast of placeholder text */
-          &::placeholder {
-            color: ${selectableSitewide.placeholderColor};
-          }
-
-          /* Inherit color from form control layout */
-          color: inherit;
-          background-color: transparent;
-        }
-
-        .euiFormControlLayout__append,
-        .euiFormControlLayout__prepend {
-          background-color: transparent;
-        }
-
-        .euiFormLabel {
-          color: inherit;
-        }
-      }
-  }
-  `;
-
   return `
     background-color: ${backgroundColor};
 
@@ -183,7 +108,5 @@ const euiHeaderDarkStyles = (euiThemeContext: UseEuiTheme) => {
     .euiHeaderSectionItemButton__notification--dot {
       stroke: ${backgroundColor};
     }
-
-    ${!isRefreshVariant && formLayoutStyles} 
   `;
 };
diff --git a/packages/eui/src/components/header/header_section/header_section_item_button.styles.ts b/packages/eui/src/components/header/header_section/header_section_item_button.styles.ts
index 6e8ce91db08..f246ff16d37 100644
--- a/packages/eui/src/components/header/header_section/header_section_item_button.styles.ts
+++ b/packages/eui/src/components/header/header_section/header_section_item_button.styles.ts
@@ -8,7 +8,7 @@
 
 import { css } from '@emotion/react';
 
-import { isEuiThemeRefreshVariant, UseEuiTheme } from '../../../services';
+import { UseEuiTheme } from '../../../services';
 import {
   logicalCSS,
   logicalSizeCSS,
@@ -23,18 +23,10 @@ export const euiHeaderSectionItemButtonStyles = (
 ) => {
   const { childHeight } = euiHeaderVariables(euiThemeContext);
   const { euiTheme } = euiThemeContext;
-  const isRefreshVariant = isEuiThemeRefreshVariant(
-    euiThemeContext,
-    'buttonVariant'
-  );
 
   const dotSize = euiTheme.size.base;
-  const dotOffset = isRefreshVariant
-    ? mathWithUnits(dotSize, (x) => x * -0.5)
-    : 0;
-  const badgeOffset = isRefreshVariant
-    ? mathWithUnits(euiTheme.size.s, (x) => x * -0.5)
-    : '9%';
+  const dotOffset = mathWithUnits(dotSize, (x) => x * -0.5);
+  const badgeOffset = mathWithUnits(euiTheme.size.s, (x) => x * -0.5);
 
   return {
     euiHeaderSectionItemButton: css`
diff --git a/packages/eui/src/components/key_pad_menu/key_pad_menu_item.styles.ts b/packages/eui/src/components/key_pad_menu/key_pad_menu_item.styles.ts
index 4830e43a506..3719c844ed7 100644
--- a/packages/eui/src/components/key_pad_menu/key_pad_menu_item.styles.ts
+++ b/packages/eui/src/components/key_pad_menu/key_pad_menu_item.styles.ts
@@ -7,7 +7,6 @@
  */
 
 import { css } from '@emotion/react';
-import { euiShadow } from '@elastic/eui-theme-common';
 
 import { UseEuiTheme } from '../../services';
 import {
@@ -24,16 +23,6 @@ import { euiKeyPadMenuVariables } from './key_pad_menu.styles';
 export const euiKeyPadMenuItemStyles = (euiThemeContext: UseEuiTheme) => {
   const { euiTheme } = euiThemeContext;
   const { euiKeyPadMenuSize } = euiKeyPadMenuVariables(euiThemeContext);
-  const hasVisColorAdjustment = euiTheme.flags?.hasVisColorAdjustment;
-  const focusTransformStyles = `
-    ${euiShadow(euiThemeContext, 's')};
-
-    ${euiCanAnimate} {
-      .euiKeyPadMenuItem__icon {
-        transform: translateY(0);
-      }
-    }
-  `;
 
   return {
     euiKeyPadMenuItem: css`
@@ -53,37 +42,27 @@ export const euiKeyPadMenuItemStyles = (euiThemeContext: UseEuiTheme) => {
       &:is(:hover, :focus, :focus-within) {
         cursor: pointer;
         text-decoration: underline;
+        background-color: ${euiTheme.colors.backgroundBaseInteractiveHover};
 
         ${highContrastModeStyles(euiThemeContext, {
           // Use `outline` instead of border to avoid affecting absolutely positioned children
           preferred: `
             outline: ${euiTheme.border.width.thin} solid ${euiTheme.colors.primary};
           `,
-        })}
-
-        ${hasVisColorAdjustment
-          ? focusTransformStyles
-          : `background-color: ${euiTheme.colors.backgroundBaseInteractiveHover}`}
+        })};
       }
 
       &:focus {
         box-shadow: none;
-        background-color: ${hasVisColorAdjustment
-          ? euiTheme.focus.backgroundColor
-          : euiTheme.colors.backgroundBaseInteractiveHover};
+        background-color: ${euiTheme.colors.backgroundBaseInteractiveHover};
       }
     `,
     selected: css`
       color: ${euiTheme.colors.textHeading};
-      background-color: ${hasVisColorAdjustment
-        ? euiTheme.focus.backgroundColor
-        : ''};
 
       &:is(*, :hover, :focus, :focus-within) {
         color: ${euiTheme.colors.textPrimary};
-        background-color: ${!hasVisColorAdjustment
-          ? euiTheme.colors.backgroundBaseInteractiveSelect
-          : ''};
+        background-color: ${euiTheme.colors.backgroundBaseInteractiveSelect};
 
         ${highContrastModeStyles(euiThemeContext, {
           // Skip checkable items (which render a <label> instead of <button>/<a>),
@@ -105,8 +84,6 @@ export const euiKeyPadMenuItemStyles = (euiThemeContext: UseEuiTheme) => {
         ${highContrastModeStyles(euiThemeContext, {
           none: `
             .euiKeyPadMenuItem__icon {
-              filter: ${hasVisColorAdjustment ? 'grayscale(100%)' : ''};
-
               svg * {
                 fill: ${euiTheme.colors.textDisabled};
               }
@@ -116,9 +93,7 @@ export const euiKeyPadMenuItemStyles = (euiThemeContext: UseEuiTheme) => {
         })}
       `,
       selected: css`
-        background-color: ${hasVisColorAdjustment
-          ? euiTheme.components.keyPadMenuItemBackgroundDisabledSelect
-          : euiTheme.colors.backgroundBaseDisabled};
+        background-color: ${euiTheme.colors.backgroundBaseDisabled};
 
         ${highContrastModeStyles(euiThemeContext, {
           preferred: `
diff --git a/packages/eui/src/components/markdown_editor/markdown_editor_drop_zone.styles.ts b/packages/eui/src/components/markdown_editor/markdown_editor_drop_zone.styles.ts
index 60c193f8ebe..962f8e8b53d 100644
--- a/packages/eui/src/components/markdown_editor/markdown_editor_drop_zone.styles.ts
+++ b/packages/eui/src/components/markdown_editor/markdown_editor_drop_zone.styles.ts
@@ -8,7 +8,7 @@
 
 import { css } from '@emotion/react';
 
-import { isEuiThemeRefreshVariant, UseEuiTheme } from '../../services';
+import { UseEuiTheme } from '../../services';
 import { logicalCSS } from '../../global_styling';
 import { euiMarkdownEditorVariables } from './markdown_editor.styles';
 import { euiFormControlInvalidStyles } from '../form/form.styles';
@@ -17,10 +17,7 @@ export const euiMarkdownEditorDropZoneStyles = (
   euiThemeContext: UseEuiTheme
 ) => {
   const { euiTheme } = euiThemeContext;
-  const isRefreshVariant = isEuiThemeRefreshVariant(
-    euiThemeContext,
-    'formVariant'
-  );
+
   const { minHeight } = euiMarkdownEditorVariables(euiThemeContext);
 
   return {
@@ -33,19 +30,15 @@ export const euiMarkdownEditorDropZoneStyles = (
     isDragging: css`
       .euiMarkdownEditorFooter,
       .euiMarkdownEditorTextArea {
-        background-color: ${isRefreshVariant
-          ? euiTheme.colors.backgroundBasePrimary
-          : euiTheme.colors
-              .backgroundTransparentPrimary} !important; /* stylelint-disable-line declaration-no-important */
+        background-color: ${euiTheme.colors
+          .backgroundBasePrimary} !important; /* stylelint-disable-line declaration-no-important */
       }
     `,
     isDraggingError: css`
       .euiMarkdownEditorFooter,
       .euiMarkdownEditorTextArea {
-        background-color: ${isRefreshVariant
-          ? euiTheme.colors.backgroundBaseDanger
-          : euiTheme.colors
-              .backgroundTransparentDanger} !important; /* stylelint-disable-line declaration-no-important */
+        background-color: ${euiTheme.colors
+          .backgroundBaseDanger} !important; /* stylelint-disable-line declaration-no-important */
       }
     `,
     hasError: css`
@@ -54,7 +47,7 @@ export const euiMarkdownEditorDropZoneStyles = (
         --euiFormControlStateColor: ${euiTheme.colors.danger};
         background-size: 100% 100%;
 
-        ${isRefreshVariant && euiFormControlInvalidStyles(euiThemeContext)}
+        ${euiFormControlInvalidStyles(euiThemeContext)}
       }
     `,
     euiMarkdownEditorDropZone__input: css`
diff --git a/packages/eui/src/components/panel/panel.styles.ts b/packages/eui/src/components/panel/panel.styles.ts
index c5c48de4bd2..bbb60a9e466 100644
--- a/packages/eui/src/components/panel/panel.styles.ts
+++ b/packages/eui/src/components/panel/panel.styles.ts
@@ -25,15 +25,10 @@ export const euiPanelBorderStyles = (
   euiThemeContext: UseEuiTheme,
   options?: {
     borderColor?: string;
-    hasFloatingBorder?: boolean;
   }
 ) => {
-  const { euiTheme, colorMode } = euiThemeContext;
-  const { borderColor, hasFloatingBorder = true } = options ?? {};
-
-  /* TODO: remove `hasFloatingBorder` and `hasVisibleBorder` and once Amsterdam is removed
-   euiTheme.colors.borderBaseFloating is enough then */
-  const hasVisibleBorder = hasFloatingBorder && colorMode === 'DARK';
+  const { euiTheme } = euiThemeContext;
+  const { borderColor } = options ?? {};
 
   return highContrastModeStyles(euiThemeContext, {
     none: `
@@ -41,10 +36,7 @@ export const euiPanelBorderStyles = (
       because the transparent border might otherwise be visible with arbitrary
       full-width/height content in light mode. */
       ${euiBorderStyles(euiThemeContext, {
-        borderColor:
-          borderColor ?? hasVisibleBorder
-            ? euiTheme.border.color
-            : euiTheme.colors.borderBaseFloating,
+        borderColor: borderColor ?? euiTheme.colors.borderBaseFloating,
       })}
     `,
     preferred: `
@@ -74,7 +66,6 @@ export const euiPanelStyles = (euiThemeContext: UseEuiTheme) => {
     hasBorder: css`
       ${euiPanelBorderStyles(euiThemeContext, {
         borderColor: euiTheme.border.color,
-        hasFloatingBorder: false,
       })}
     `,
 
diff --git a/packages/eui/src/components/resizable_container/resizable_collapse_button.tsx b/packages/eui/src/components/resizable_container/resizable_collapse_button.tsx
index 35b9dbc82a0..5755e70aae3 100644
--- a/packages/eui/src/components/resizable_container/resizable_collapse_button.tsx
+++ b/packages/eui/src/components/resizable_container/resizable_collapse_button.tsx
@@ -9,10 +9,7 @@
 import React, { FunctionComponent } from 'react';
 import classNames from 'classnames';
 
-import {
-  useEuiMemoizedStyles,
-  useEuiThemeRefreshVariant,
-} from '../../services';
+import { useEuiMemoizedStyles } from '../../services';
 import { EuiButtonIcon, EuiButtonIconPropsForButton } from '../button';
 import { euiScreenReaderOnlyStyles } from '../accessibility/screen_reader_only/screen_reader_only.styles';
 
@@ -56,7 +53,6 @@ export const EuiResizableCollapseButton: FunctionComponent<
   const isHorizontal = direction === 'horizontal';
   const showOnFocus = !isCollapsed && !isVisible;
 
-  const isRefreshVariant = useEuiThemeRefreshVariant('buttonVariant');
   const styles = useEuiMemoizedStyles(euiResizableCollapseButtonStyles);
 
   const collapsedStyles = [
@@ -93,7 +89,7 @@ export const EuiResizableCollapseButton: FunctionComponent<
 
   return (
     <EuiButtonIcon
-      display={isRefreshVariant ? 'empty' : isCollapsed ? 'empty' : 'base'}
+      display="empty"
       color="text"
       className={classes}
       css={cssStyles}
diff --git a/packages/eui/src/components/search_bar/__snapshots__/search_bar.test.tsx.snap b/packages/eui/src/components/search_bar/__snapshots__/search_bar.test.tsx.snap
index 148114a41d9..e785da4c540 100644
--- a/packages/eui/src/components/search_bar/__snapshots__/search_bar.test.tsx.snap
+++ b/packages/eui/src/components/search_bar/__snapshots__/search_bar.test.tsx.snap
@@ -140,7 +140,7 @@ exports[`SearchBar render - provided query, filters 1`] = `
       class="euiFilterGroup emotion-euiFilterGroup-uncompressed"
     >
       <div
-        class="euiFilterButton__wrapper css-10m1aro-wrapper-hasToggle"
+        class="euiFilterButton__wrapper css-1nn8k4u-wrapper-hasToggle"
       >
         <button
           aria-pressed="false"
@@ -165,7 +165,7 @@ exports[`SearchBar render - provided query, filters 1`] = `
         class="euiPopover emotion-euiPopover-inline-block"
       >
         <div
-          class="euiFilterButton__wrapper css-72u45h-wrapper"
+          class="euiFilterButton__wrapper css-ln4f6z-wrapper"
         >
           <button
             aria-expanded="false"
diff --git a/packages/eui/src/components/search_bar/__snapshots__/search_filters.test.tsx.snap b/packages/eui/src/components/search_bar/__snapshots__/search_filters.test.tsx.snap
index cc689f4346c..a8406df15b8 100644
--- a/packages/eui/src/components/search_bar/__snapshots__/search_filters.test.tsx.snap
+++ b/packages/eui/src/components/search_bar/__snapshots__/search_filters.test.tsx.snap
@@ -11,7 +11,7 @@ exports[`EuiSearchBarFilters render - with filters 1`] = `
   class="euiFilterGroup emotion-euiFilterGroup-uncompressed"
 >
   <div
-    class="euiFilterButton__wrapper css-10m1aro-wrapper-hasToggle"
+    class="euiFilterButton__wrapper css-1nn8k4u-wrapper-hasToggle"
   >
     <button
       aria-pressed="false"
@@ -36,7 +36,7 @@ exports[`EuiSearchBarFilters render - with filters 1`] = `
     class="euiPopover emotion-euiPopover-inline-block"
   >
     <div
-      class="euiFilterButton__wrapper css-72u45h-wrapper"
+      class="euiFilterButton__wrapper css-ln4f6z-wrapper"
     >
       <button
         aria-expanded="false"
diff --git a/packages/eui/src/components/search_bar/filters/__snapshots__/field_value_toggle_filter.test.tsx.snap b/packages/eui/src/components/search_bar/filters/__snapshots__/field_value_toggle_filter.test.tsx.snap
index 3e6a8580ca5..40395baecaf 100644
--- a/packages/eui/src/components/search_bar/filters/__snapshots__/field_value_toggle_filter.test.tsx.snap
+++ b/packages/eui/src/components/search_bar/filters/__snapshots__/field_value_toggle_filter.test.tsx.snap
@@ -2,7 +2,7 @@
 
 exports[`FieldValueToggleFilter render - active 1`] = `
 <div
-  class="euiFilterButton__wrapper css-10m1aro-wrapper-hasToggle"
+  class="euiFilterButton__wrapper css-1nn8k4u-wrapper-hasToggle"
 >
   <button
     aria-pressed="true"
@@ -27,7 +27,7 @@ exports[`FieldValueToggleFilter render - active 1`] = `
 
 exports[`FieldValueToggleFilter render - active negated - custom negated name 1`] = `
 <div
-  class="euiFilterButton__wrapper css-10m1aro-wrapper-hasToggle"
+  class="euiFilterButton__wrapper css-1nn8k4u-wrapper-hasToggle"
 >
   <button
     aria-pressed="true"
@@ -52,7 +52,7 @@ exports[`FieldValueToggleFilter render - active negated - custom negated name 1`
 
 exports[`FieldValueToggleFilter render - active negated 1`] = `
 <div
-  class="euiFilterButton__wrapper css-10m1aro-wrapper-hasToggle"
+  class="euiFilterButton__wrapper css-1nn8k4u-wrapper-hasToggle"
 >
   <button
     aria-pressed="true"
@@ -77,7 +77,7 @@ exports[`FieldValueToggleFilter render - active negated 1`] = `
 
 exports[`FieldValueToggleFilter renders 1`] = `
 <div
-  class="euiFilterButton__wrapper css-10m1aro-wrapper-hasToggle"
+  class="euiFilterButton__wrapper css-1nn8k4u-wrapper-hasToggle"
 >
   <button
     aria-pressed="false"
diff --git a/packages/eui/src/components/search_bar/filters/__snapshots__/field_value_toggle_group_filter.test.tsx.snap b/packages/eui/src/components/search_bar/filters/__snapshots__/field_value_toggle_group_filter.test.tsx.snap
index dcba52df270..cf1a29a4e4a 100644
--- a/packages/eui/src/components/search_bar/filters/__snapshots__/field_value_toggle_group_filter.test.tsx.snap
+++ b/packages/eui/src/components/search_bar/filters/__snapshots__/field_value_toggle_group_filter.test.tsx.snap
@@ -2,7 +2,7 @@
 
 exports[`TermToggleGroupFilter render - active 1`] = `
 <div
-  class="euiFilterButton__wrapper css-nbqv3o-wrapper-withNext-hasToggle"
+  class="euiFilterButton__wrapper css-1anz60t-wrapper-withNext-hasToggle"
 >
   <button
     aria-pressed="true"
@@ -27,7 +27,7 @@ exports[`TermToggleGroupFilter render - active 1`] = `
 
 exports[`TermToggleGroupFilter render - active negated - custom negated name 1`] = `
 <div
-  class="euiFilterButton__wrapper css-nbqv3o-wrapper-withNext-hasToggle"
+  class="euiFilterButton__wrapper css-1anz60t-wrapper-withNext-hasToggle"
 >
   <button
     aria-pressed="true"
@@ -52,7 +52,7 @@ exports[`TermToggleGroupFilter render - active negated - custom negated name 1`]
 
 exports[`TermToggleGroupFilter render - active negated 1`] = `
 <div
-  class="euiFilterButton__wrapper css-nbqv3o-wrapper-withNext-hasToggle"
+  class="euiFilterButton__wrapper css-1anz60t-wrapper-withNext-hasToggle"
 >
   <button
     aria-pressed="true"
@@ -77,7 +77,7 @@ exports[`TermToggleGroupFilter render - active negated 1`] = `
 
 exports[`TermToggleGroupFilter renders 1`] = `
 <div
-  class="euiFilterButton__wrapper css-nbqv3o-wrapper-withNext-hasToggle"
+  class="euiFilterButton__wrapper css-1anz60t-wrapper-withNext-hasToggle"
 >
   <button
     aria-pressed="false"
diff --git a/packages/eui/src/components/search_bar/filters/__snapshots__/is_filter.test.tsx.snap b/packages/eui/src/components/search_bar/filters/__snapshots__/is_filter.test.tsx.snap
index 12555d6978f..4a3d25f142a 100644
--- a/packages/eui/src/components/search_bar/filters/__snapshots__/is_filter.test.tsx.snap
+++ b/packages/eui/src/components/search_bar/filters/__snapshots__/is_filter.test.tsx.snap
@@ -2,7 +2,7 @@
 
 exports[`IsFilter render 1`] = `
 <div
-  class="euiFilterButton__wrapper css-10m1aro-wrapper-hasToggle"
+  class="euiFilterButton__wrapper css-1nn8k4u-wrapper-hasToggle"
 >
   <button
     aria-pressed="false"
diff --git a/packages/eui/src/components/selectable/selectable_templates/selectable_template_sitewide.tsx b/packages/eui/src/components/selectable/selectable_templates/selectable_template_sitewide.tsx
index aa358ea506c..84c926d576e 100644
--- a/packages/eui/src/components/selectable/selectable_templates/selectable_template_sitewide.tsx
+++ b/packages/eui/src/components/selectable/selectable_templates/selectable_template_sitewide.tsx
@@ -28,7 +28,6 @@ import {
   useCurrentEuiBreakpoint,
   useEuiMemoizedStyles,
   useEuiTheme,
-  useEuiThemeRefreshVariant,
 } from '../../../services';
 import { EuiBreakpointSize } from '../../../services/breakpoint';
 import { ENTER } from '../../../services/keys';
@@ -113,7 +112,6 @@ export const EuiSelectableTemplateSitewide: FunctionComponent<
   ...rest
 }) => {
   const { colorMode } = useEuiTheme();
-  const isRefreshVariant = useEuiThemeRefreshVariant('formVariant');
 
   const { hasDifferentColorFromGlobalTheme } = useContext(
     EuiNestedThemeContext
@@ -334,14 +332,13 @@ export const EuiSelectableTemplateSitewide: FunctionComponent<
       searchable
     >
       {(list, search) => {
-        const _search =
-          isRefreshVariant && !popoverTrigger ? (
-            <EuiThemeProvider colorMode={searchColorMode}>
-              {search}
-            </EuiThemeProvider>
-          ) : (
-            search
-          );
+        const _search = !popoverTrigger ? (
+          <EuiThemeProvider colorMode={searchColorMode}>
+            {search}
+          </EuiThemeProvider>
+        ) : (
+          search
+        );
 
         // uses standalone subcomponent to ensure scoped style/theme context
         const popover = (
@@ -359,15 +356,13 @@ export const EuiSelectableTemplateSitewide: FunctionComponent<
           />
         );
 
-        return isRefreshVariant ? (
+        return (
           <EuiThemeProvider
             wrapperProps={{ cloneElement: true }}
             colorMode={popoverColorMode}
           >
             {popover}
           </EuiThemeProvider>
-        ) : (
-          popover
         );
       }}
     </EuiSelectable>
diff --git a/packages/eui/src/components/toast/toast.styles.ts b/packages/eui/src/components/toast/toast.styles.ts
index a329c69a5ad..bc4e9156003 100644
--- a/packages/eui/src/components/toast/toast.styles.ts
+++ b/packages/eui/src/components/toast/toast.styles.ts
@@ -52,7 +52,7 @@ export const euiToastStyles = (euiThemeContext: UseEuiTheme) => {
 
       ${euiTextBreakWord()} /* Prevent long lines from overflowing */
 
-      ${euiPanelBorderStyles(euiThemeContext, { hasFloatingBorder: false })}
+      ${euiPanelBorderStyles(euiThemeContext)}
 
       &:hover,
       &:focus {
diff --git a/packages/eui/src/components/token/token.styles.ts b/packages/eui/src/components/token/token.styles.ts
index e197342e0a4..4ae802be770 100644
--- a/packages/eui/src/components/token/token.styles.ts
+++ b/packages/eui/src/components/token/token.styles.ts
@@ -19,7 +19,6 @@ import {
   UseEuiTheme,
   euiPaletteColorBlind,
   euiPaletteColorBlindBehindText,
-  makeHighContrastColor,
   isColorDark,
   tint,
   shade,
@@ -33,7 +32,6 @@ const getTokenColor = (
   color: number | string
 ) => {
   const { euiTheme, colorMode, highContrastMode } = euiThemeContext;
-  const { hasVisColorAdjustment } = euiTheme.flags;
   // use inside function as they are not returning constants,
   // but internally depend on EUI_VIS_COLOR_STORE to update per theme
   const visColors = euiPaletteColorBlind();
@@ -66,9 +64,7 @@ const getTokenColor = (
     return euiTheme.colors.vis[iconColorToken];
   };
 
-  const lightColor = hasVisColorAdjustment
-    ? makeHighContrastColor(iconColor)(backgroundLightColor)
-    : isVizColor
+  const lightColor = isVizColor
     ? shade(getIconVisColor(euiTheme, color), 0.3)
     : iconColor;
 
diff --git a/packages/eui/src/components/token/token.test.tsx b/packages/eui/src/components/token/token.test.tsx
index 4f7da701bcf..115cc2e49e9 100644
--- a/packages/eui/src/components/token/token.test.tsx
+++ b/packages/eui/src/components/token/token.test.tsx
@@ -13,10 +13,10 @@ import { render } from '../../test/rtl';
 
 import { EuiToken } from './token';
 import { COLORS, SHAPES, SIZES, FILLS } from './token_types';
-import { TOKEN_MAP_AMSTERDAM } from './token_map';
+import { TOKEN_MAP } from './token_map';
 import { keysOf } from '../common';
 
-const tokenTypes = keysOf(TOKEN_MAP_AMSTERDAM);
+const tokenTypes = keysOf(TOKEN_MAP);
 const tokenColors = COLORS;
 
 describe('EuiToken', () => {
diff --git a/packages/eui/src/components/token/token.tsx b/packages/eui/src/components/token/token.tsx
index 48d7cdbd38b..4b3e476393e 100644
--- a/packages/eui/src/components/token/token.tsx
+++ b/packages/eui/src/components/token/token.tsx
@@ -11,11 +11,7 @@ import classNames from 'classnames';
 import { useEuiTheme, isColorDark, hexToRgb } from '../../services';
 
 import { EuiIcon, IconSize } from '../icon';
-import {
-  EuiTokenMapType,
-  TOKEN_MAP_AMSTERDAM,
-  TOKEN_MAP_BOREALIS,
-} from './token_map';
+import { EuiTokenMapType, TOKEN_MAP } from './token_map';
 import { COLORS } from './token_types';
 import type {
   EuiTokenProps,
@@ -58,11 +54,6 @@ export const EuiToken: FunctionComponent<EuiTokenProps> = ({
   }
 
   const euiTheme = useEuiTheme();
-  const { hasVisColorAdjustment } = euiTheme.euiTheme.flags;
-
-  const TOKEN_MAP = hasVisColorAdjustment
-    ? TOKEN_MAP_AMSTERDAM
-    : TOKEN_MAP_BOREALIS;
 
   // If the iconType passed is one of the prefab token types,
   // grab its properties
diff --git a/packages/eui/src/components/token/token_map.ts b/packages/eui/src/components/token/token_map.ts
index 1f319f796d2..b19a689ddcd 100644
--- a/packages/eui/src/components/token/token_map.ts
+++ b/packages/eui/src/components/token/token_map.ts
@@ -73,240 +73,7 @@ export type EuiTokenMapType =
  * circle shape for more uncommon token types so they grab attention.
  */
 
-export const TOKEN_MAP_AMSTERDAM: {
-  [mapType in EuiTokenMapType]: Omit<TokenProps, 'iconType'>;
-} = {
-  tokenAlias: {
-    shape: 'circle',
-    color: 'euiColorVis3',
-  },
-  tokenAnnotation: {
-    shape: 'square',
-    color: 'euiColorVis5',
-  },
-  tokenArray: {
-    shape: 'square',
-    color: 'euiColorVis7',
-  },
-  tokenBinary: {
-    shape: 'square',
-    color: 'euiColorVis4',
-  },
-  tokenBoolean: {
-    shape: 'square',
-    color: 'euiColorVis7',
-  },
-  tokenClass: {
-    shape: 'circle',
-    color: 'euiColorVis1',
-  },
-  tokenCompletionSuggester: {
-    shape: 'square',
-    color: 'euiColorVis1',
-  },
-  tokenConstant: {
-    shape: 'circle',
-    color: 'euiColorVis0',
-  },
-  tokenDate: {
-    shape: 'square',
-    color: 'euiColorVis6',
-  },
-  tokenDimension: {
-    shape: 'square',
-    color: 'euiColorVis1',
-  },
-  tokenElement: {
-    shape: 'square',
-    color: 'euiColorVis3',
-  },
-  tokenEnum: {
-    shape: 'circle',
-    color: 'euiColorVis3',
-  },
-  tokenEnumMember: {
-    shape: 'square',
-    color: 'euiColorVis7',
-  },
-  tokenEvent: {
-    shape: 'circle',
-    color: 'euiColorVis4',
-  },
-  tokenException: {
-    shape: 'circle',
-    color: 'euiColorVis0',
-  },
-  tokenField: {
-    shape: 'circle',
-    color: 'euiColorVis0',
-  },
-  tokenFile: {
-    shape: 'square',
-    color: 'euiColorVis2',
-  },
-  tokenFlattened: {
-    shape: 'square',
-    color: 'euiColorVis7',
-  },
-  tokenFunction: {
-    shape: 'circle',
-    color: 'euiColorVis2',
-  },
-  tokenGeo: {
-    shape: 'square',
-    color: 'euiColorVis5',
-  },
-  tokenHistogram: {
-    shape: 'square',
-    color: 'euiColorVis6',
-  },
-  tokenInterface: {
-    shape: 'circle',
-    color: 'euiColorVis9',
-  },
-  tokenIP: {
-    shape: 'square',
-    color: 'euiColorVis9',
-  },
-  tokenJoin: {
-    shape: 'square',
-    color: 'euiColorVis5',
-  },
-  tokenKey: {
-    shape: 'circle',
-    color: 'euiColorVis5',
-  },
-  tokenKeyword: {
-    shape: 'square',
-    color: 'euiColorVis1',
-  },
-  tokenMethod: {
-    shape: 'square',
-    color: 'euiColorVis2',
-  },
-  tokenMetricCounter: {
-    shape: 'square',
-    color: 'euiColorVis0',
-  },
-  tokenMetricGauge: {
-    shape: 'square',
-    color: 'euiColorVis0',
-  },
-  tokenModule: {
-    shape: 'square',
-    color: 'euiColorVis4',
-  },
-  tokenNamespace: {
-    shape: 'square',
-    color: 'euiColorVis1',
-  },
-  tokenNested: {
-    shape: 'circle',
-    color: 'euiColorVis2',
-  },
-  tokenNull: {
-    shape: 'square',
-    color: 'euiColorVis2',
-  },
-  tokenNumber: {
-    shape: 'square',
-    color: 'euiColorVis0',
-  },
-  tokenObject: {
-    shape: 'circle',
-    color: 'euiColorVis3',
-  },
-  tokenOperator: {
-    shape: 'circle',
-    color: 'euiColorVis4',
-  },
-  tokenPackage: {
-    shape: 'square',
-    color: 'euiColorVis0',
-  },
-  tokenParameter: {
-    shape: 'square',
-    color: 'euiColorVis4',
-  },
-  tokenPercolator: {
-    shape: 'square',
-    color: 'euiColorVis6',
-  },
-  tokenProperty: {
-    shape: 'circle',
-    color: 'euiColorVis2',
-  },
-  tokenRange: {
-    shape: 'circle',
-    color: 'euiColorVis4',
-  },
-  tokenRankFeature: {
-    shape: 'square',
-    color: 'euiColorVis8',
-  },
-  tokenRankFeatures: {
-    shape: 'square',
-    color: 'euiColorVis3',
-  },
-  tokenRepo: {
-    shape: 'square',
-    color: 'euiColorVis1',
-  },
-  tokenSearchType: {
-    shape: 'square',
-    color: 'euiColorVis5',
-  },
-  tokenSemanticText: {
-    shape: 'square',
-    color: 'euiColorVis0',
-  },
-  tokenShape: {
-    shape: 'circle',
-    color: 'euiColorVis8',
-  },
-  tokenString: {
-    shape: 'square',
-    color: 'euiColorVis1',
-  },
-  tokenStruct: {
-    shape: 'square',
-    color: 'euiColorVis0',
-  },
-  tokenSymbol: {
-    shape: 'square',
-    color: 'euiColorVis0',
-  },
-  tokenTag: {
-    shape: 'square',
-    color: 'euiColorVis9',
-  },
-  tokenText: {
-    shape: 'square',
-    color: 'euiColorVis3',
-  },
-  tokenTokenCount: {
-    shape: 'square',
-    color: 'euiColorVis4',
-  },
-  tokenVariable: {
-    shape: 'circle',
-    color: 'euiColorVis7',
-  },
-  tokenVectorDense: {
-    shape: 'square',
-    color: 'euiColorVis5',
-  },
-  tokenDenseVector: {
-    shape: 'square',
-    color: 'euiColorVis5',
-  },
-  tokenVectorSparse: {
-    shape: 'square',
-    color: 'euiColorVis1',
-  },
-};
-
-export const TOKEN_MAP_BOREALIS: {
+export const TOKEN_MAP: {
   [mapType in EuiTokenMapType]: Omit<TokenProps, 'iconType'>;
 } = {
   tokenAlias: {
diff --git a/packages/eui/src/global_styling/functions/_colors.scss b/packages/eui/src/global_styling/functions/_colors.scss
deleted file mode 100644
index e5ade788667..00000000000
--- a/packages/eui/src/global_styling/functions/_colors.scss
+++ /dev/null
@@ -1,138 +0,0 @@
-// Converting a normal hex color to RBG
-@function hexToRGB($color) {
-  @return 'rgb%28#{round(red($color))}, #{round(green($color))}, #{round(blue($color))}%29';
-}
-
-// Mixes a provided color with white.
-@function tint($color, $percent) {
-  @return mix($euiColorGhost, $color, $percent);
-}
-
-// Mixes a provided color with black.
-@function shade($color, $percent) {
-  @return mix($euiColorInk, $color, $percent);
-}
-
-// For theming. Checks the text color and tells us whether it's light or dark.
-// Based on that we either tint (add white) or shade (add black).
-@function tintOrShade($color, $tint, $shade) {
-  @if (lightness($euiColorTextParagraph) > 50) {
-    @return shade($color, $shade);
-  } @else {
-    @return tint($color, $tint);
-  }
-}
-
-// The reverse of the above
-@function shadeOrTint($color, $shade, $tint) {
-  @if (lightness($euiColorTextParagraph) < 50) {
-    @return shade($color, $shade);
-  } @else {
-    @return tint($color, $tint);
-  }
-}
-
-// Similar to above, but uses the light or dark color based
-// on whether it's the light or dark theme
-@function lightOrDarkTheme($lightColor, $darkColor) {
-  @if (lightness($euiColorTextParagraph) < 50) {
-    @return $lightColor;
-  } @else {
-    @return $darkColor;
-  }
-}
-
-// Calculates luminance, which is better than brightness for checking colors
-// pow, nth functions come from the _math.scss functions
-@function luminance($color) {
-  // Formula: http://www.w3.org/TR/2008/REC-WCAG20-20081211/#relativeluminancedef
-  $rgba: red($color), green($color), blue($color);
-  $rgba2: ();
-
-  @for $i from 1 through 3 {
-    $rgb: nth($rgba, $i);
-    $rgb: $rgb / 255;
-
-    $rgb: if($rgb < .03928, $rgb / 12.92, pow(($rgb + .055) / 1.055, 2.4));
-
-    $rgba2: append($rgba2, $rgb);
-  }
-
-  @return .2126 * nth($rgba2, 1) + .7152 * nth($rgba2, 2) + .0722 * nth($rgba2, 3);
-}
-
-// Calculate contrast
-@function contrastRatio($background, $foreground) {
-  $backgroundLum: luminance($background) + .05;
-  $foregroundLum: luminance($foreground) + .05;
-
-  @return max($backgroundLum, $foregroundLum) / min($backgroundLum, $foregroundLum);
-}
-
-// Given $color, decide whether $lightText or $darkText should be used as the text color
-// ex: chooseLightOrDarkText(#EEE, #FFF, #000) would return #000 because it has
-//     a higher contrast than #FFF against a #EEE background.
-@function chooseLightOrDarkText($background, $lightText: $euiColorGhost, $darkText: $euiColorInk) {
-  $lightContrast: contrastRatio($background, $lightText);
-  $darkContrast: contrastRatio($background, $darkText);
-
-  @if ($lightContrast > $darkContrast) {
-    @return $lightText;
-  } @else {
-    @return $darkText;
-  }
-}
-
-// Given a $foreground and a $background, make the $foreground AA accessibility by slightly
-// adjusting it till the contrast is high enough
-// By default it will compare against the page background color
-
-// ex: makeContrastColor($lightPink, #FFF) would continually shade the pink until
-//     it had higher than 4.5 contrast on a white background.
-$euiContrastRatioText: 4.5;
-@function makeHighContrastColor($foreground, $background: $euiPageBackgroundColor, $ratio: $euiContrastRatioText) {
-  $contrast: contrastRatio($foreground, $background);
-
-  // Determine the lightness factor of the background color first to
-  // determine whether to shade or tint the foreground.
-  $brightness: lightness($background);
-
-  $highContrastTextColor: $foreground;
-
-  @while ($contrast < $ratio) {
-    @if ($brightness > 50) {
-      $highContrastTextColor: shade($highContrastTextColor, 5%);
-    } @else {
-      $highContrastTextColor: tint($highContrastTextColor, 5%);
-    }
-
-    $contrast: contrastRatio($highContrastTextColor, $background);
-
-    @if (lightness($highContrastTextColor) < 5) {
-      @warn 'High enough contrast could not be determined. Most likely your background color does not adjust for light mode.';
-      @return $highContrastTextColor;
-    }
-
-    @if (lightness($highContrastTextColor) > 95) {
-      @warn 'High enough contrast could not be determined. Most likely your background color does not adjust for dark mode.';
-      @return $highContrastTextColor;
-    }
-  }
-
-  @return $highContrastTextColor;
-}
-
-// Graphics such as stand alone icons and pieces of a graph only need a minimum ratio of 3:1 with its background.
-// Therefore, we can reuse the `makeHighContrastColor()` function but only attain a min contrast of 3.0.
-// It is still recommended to use `makeHighContrastColor()` to attain a 4.5:1 ratio if the graphic is small or thinly stroked.
-// https://www.w3.org/WAI/GL/low-vision-a11y-tf/wiki/Informational_Graphic_Contrast_(Minimum)
-$euiContrastRatioGraphic: 3;
-@function makeGraphicContrastColor($color, $background: $euiPageBackgroundColor) {
-  @return makeHighContrastColor($color, $background, $euiContrastRatioGraphic);
-}
-
-// Disabled content only needs a contrast of at least 2 because there is no interaction available
-$euiContrastRatioDisabled: 2;
-@function makeDisabledContrastColor($color, $background: $euiPageBackgroundColor) {
-  @return makeHighContrastColor($color, $background, $euiContrastRatioDisabled);
-}
diff --git a/packages/eui/src/global_styling/functions/_index.scss b/packages/eui/src/global_styling/functions/_index.scss
deleted file mode 100644
index 7e1a8b1710d..00000000000
--- a/packages/eui/src/global_styling/functions/_index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import 'node_modules/@elastic/eui-theme-common/src/global_styling/functions/index';
diff --git a/packages/eui/src/global_styling/functions/_math.scss b/packages/eui/src/global_styling/functions/_math.scss
deleted file mode 100644
index cdec36f3e60..00000000000
--- a/packages/eui/src/global_styling/functions/_math.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import 'math_pow';
\ No newline at end of file
diff --git a/packages/eui/src/global_styling/functions/_math_pow.scss b/packages/eui/src/global_styling/functions/_math_pow.scss
deleted file mode 100644
index 2e2d784a845..00000000000
--- a/packages/eui/src/global_styling/functions/_math_pow.scss
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
-The MIT License (MIT)
-
-Copyright (c) 2015 strarsis https://github.com/strarsis/sass-math-pow
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
- */
-
-@function pow($number, $exp) {
-  $exp1: round($exp);
-  $result: powInt($number, $exp1);
-
-  @if ($exp1 != $exp) {
-    $result: $result * mathExp(($exp - $exp1) * mathLn($number));
-  }
-
-  @return $result;
-}
-
-@function powInt($number, $exp) {
-  @if $exp == 0 {
-    @return 1;
-  } @else if $exp < 0 {
-    @return 1 / powInt($number, -$exp);
-  } @else {
-    $e: floor($exp / 2);
-    $pow: pow($number, $e);
-    @if $e * 2 == $exp {
-      @return $pow * $pow;
-    } @else {
-      @return $pow * $pow * $number;
-    }
-  }
-}
-
-@function mathExp($value) {
-  $item: 1;
-  $result: 1;
-
-  @for $index from 1 to 100 {
-    $item: $item * $value / $index;
-    $result: $result + $item;
-  }
-
-  @return $result;
-}
-
-@function mathLn($value) {
-  $tenExp: 0;
-  $lnTen: 2.30258509;
-
-  @while ($value > 1) {
-    $tenExp: $tenExp + 1;
-    $value: $value / 10;
-  }
-
-  $item: -1;
-  $result: 0;
-
-  @for $index from 1 to 100 {
-    $item: $item * (1 - $value);
-    $result: $result + $item / $index;
-  }
-
-  @return $result + $tenExp * $lnTen;
-}
diff --git a/packages/eui/src/global_styling/index.scss b/packages/eui/src/global_styling/index.scss
deleted file mode 100644
index eadeca15647..00000000000
--- a/packages/eui/src/global_styling/index.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-// Core
-
-@import 'node_modules/@elastic/eui-theme-common/src/global_styling/index';
diff --git a/packages/eui/src/global_styling/mixins/__snapshots__/_button.test.ts.snap b/packages/eui/src/global_styling/mixins/__snapshots__/_button.test.ts.snap
index b913e8b0eef..6652e89635e 100644
--- a/packages/eui/src/global_styling/mixins/__snapshots__/_button.test.ts.snap
+++ b/packages/eui/src/global_styling/mixins/__snapshots__/_button.test.ts.snap
@@ -4,10 +4,9 @@ exports[`useEuiButtonColorCSS base 1`] = `
 {
   "accent": {
     "map": undefined,
-    "name": "t2u6im-displaysColorsMap-display-color",
+    "name": "1cy20me-displaysColorsMap-display-color",
     "next": undefined,
-    "styles": "color:#a11262;background-color:#FDDDE9; 
-                
+    "styles": "color:#a11262;background-color:#FDDDE9;     
     position: relative;
         overflow: hidden;
 
@@ -34,17 +33,14 @@ exports[`useEuiButtonColorCSS base 1`] = `
             background-color: rgba(229,74,145, 0.16);
           }
         }
-  
-            false
-          ;;label:base-accent;",
+   ;;label:base-accent;",
     "toString": [Function],
   },
   "accentSecondary": {
     "map": undefined,
-    "name": "q87o3e-displaysColorsMap-display-color",
+    "name": "1eo92ho-displaysColorsMap-display-color",
     "next": undefined,
-    "styles": "color:#046e6b;background-color:#C9F3F0; 
-                
+    "styles": "color:#046e6b;background-color:#C9F3F0;     
     position: relative;
         overflow: hidden;
 
@@ -71,17 +67,14 @@ exports[`useEuiButtonColorCSS base 1`] = `
             background-color: rgba(0,176,170, 0.16);
           }
         }
-  
-            false
-          ;;label:base-accentSecondary;",
+   ;;label:base-accentSecondary;",
     "toString": [Function],
   },
   "danger": {
     "map": undefined,
-    "name": "1g7pp6a-displaysColorsMap-display-color",
+    "name": "15rywaz-displaysColorsMap-display-color",
     "next": undefined,
-    "styles": "color:#a71627;background-color:#FDDDD8; 
-                
+    "styles": "color:#a71627;background-color:#FDDDD8;     
     position: relative;
         overflow: hidden;
 
@@ -108,17 +101,14 @@ exports[`useEuiButtonColorCSS base 1`] = `
             background-color: rgba(238,76,72, 0.16);
           }
         }
-  
-            false
-          ;;label:base-danger;",
+   ;;label:base-danger;",
     "toString": [Function],
   },
   "disabled": {
     "map": undefined,
-    "name": "up0w9g-displaysColorsMap-display-color",
+    "name": "14m2cmg-displaysColorsMap-display-color",
     "next": undefined,
-    "styles": "color:#798EAF;background-color:#ECF1F9; 
-                
+    "styles": "color:#798EAF;background-color:#ECF1F9;     
     position: relative;
         overflow: hidden;
 
@@ -145,17 +135,14 @@ exports[`useEuiButtonColorCSS base 1`] = `
             background-color: undefined;
           }
         }
-  
-            false
-          ;;label:base-disabled;",
+   ;;label:base-disabled;",
     "toString": [Function],
   },
   "neutral": {
     "map": undefined,
-    "name": "1uzxovy-displaysColorsMap-display-color",
+    "name": "1f7t73y-displaysColorsMap-display-color",
     "next": undefined,
-    "styles": "color:#0f658a;background-color:#CFEEF7; 
-                
+    "styles": "color:#0f658a;background-color:#CFEEF7;     
     position: relative;
         overflow: hidden;
 
@@ -182,17 +169,14 @@ exports[`useEuiButtonColorCSS base 1`] = `
             background-color: rgba(13,161,201, 0.16);
           }
         }
-  
-            false
-          ;;label:base-neutral;",
+   ;;label:base-neutral;",
     "toString": [Function],
   },
   "primary": {
     "map": undefined,
-    "name": "yk1sqq-displaysColorsMap-display-color",
+    "name": "cfeafn-displaysColorsMap-display-color",
     "next": undefined,
-    "styles": "color:#1750ba;background-color:#D9E8FF; 
-                
+    "styles": "color:#1750ba;background-color:#D9E8FF;     
     position: relative;
         overflow: hidden;
 
@@ -219,17 +203,14 @@ exports[`useEuiButtonColorCSS base 1`] = `
             background-color: rgba(55,136,255, 0.16);
           }
         }
-  
-            false
-          ;;label:base-primary;",
+   ;;label:base-primary;",
     "toString": [Function],
   },
   "risk": {
     "map": undefined,
-    "name": "gia4ur-displaysColorsMap-display-color",
+    "name": "1oj9mzt-displaysColorsMap-display-color",
     "next": undefined,
-    "styles": "color:#9e3a16;background-color:#FFDEBF; 
-                
+    "styles": "color:#9e3a16;background-color:#FFDEBF;     
     position: relative;
         overflow: hidden;
 
@@ -256,17 +237,14 @@ exports[`useEuiButtonColorCSS base 1`] = `
             background-color: rgba(252,133,68, 0.2);
           }
         }
-  
-            false
-          ;;label:base-risk;",
+   ;;label:base-risk;",
     "toString": [Function],
   },
   "success": {
     "map": undefined,
-    "name": "1wzbnhz-displaysColorsMap-display-color",
+    "name": "nsaw69-displaysColorsMap-display-color",
     "next": undefined,
-    "styles": "color:#09724d;background-color:#C9F3E3; 
-                
+    "styles": "color:#09724d;background-color:#C9F3E3;     
     position: relative;
         overflow: hidden;
 
@@ -293,17 +271,14 @@ exports[`useEuiButtonColorCSS base 1`] = `
             background-color: rgba(4,174,126, 0.16);
           }
         }
-  
-            false
-          ;;label:base-success;",
+   ;;label:base-success;",
     "toString": [Function],
   },
   "text": {
     "map": undefined,
-    "name": "4mvtb6-displaysColorsMap-display-color",
+    "name": "191u3ya-displaysColorsMap-display-color",
     "next": undefined,
-    "styles": "color:#1d2a3e;background-color:#FFFFFF; 
-                
+    "styles": "color:#1d2a3e;background-color:#FFFFFF;     
     position: relative;
         overflow: hidden;
 
@@ -330,19 +305,16 @@ exports[`useEuiButtonColorCSS base 1`] = `
             background-color: rgba(23,80,186, 0.12);
           }
         }
-  
-            
+   
               border: 1px solid #CAD3E2;
-            
-          ;;label:base-text;",
+            ;;label:base-text;",
     "toString": [Function],
   },
   "warning": {
     "map": undefined,
-    "name": "1h4obw6-displaysColorsMap-display-color",
+    "name": "17vaf7q-displaysColorsMap-display-color",
     "next": undefined,
-    "styles": "color:#825803;background-color:#FDE9B5; 
-                
+    "styles": "color:#825803;background-color:#FDE9B5;     
     position: relative;
         overflow: hidden;
 
@@ -369,9 +341,7 @@ exports[`useEuiButtonColorCSS base 1`] = `
             background-color: rgba(234,174,1, 0.2);
           }
         }
-  
-            false
-          ;;label:base-warning;",
+   ;;label:base-warning;",
     "toString": [Function],
   },
 }
@@ -381,9 +351,9 @@ exports[`useEuiButtonColorCSS empty 1`] = `
 {
   "accent": {
     "map": undefined,
-    "name": "acar8m-displaysColorsMap-display-color",
+    "name": "1swdk2b-displaysColorsMap-display-color",
     "next": undefined,
-    "styles": "color:#a11262;     
+    "styles": "color:#a11262;    
     position: relative;
         overflow: hidden;
 
@@ -415,9 +385,9 @@ exports[`useEuiButtonColorCSS empty 1`] = `
   },
   "accentSecondary": {
     "map": undefined,
-    "name": "ci2qqz-displaysColorsMap-display-color",
+    "name": "qsnv99-displaysColorsMap-display-color",
     "next": undefined,
-    "styles": "color:#046e6b;     
+    "styles": "color:#046e6b;    
     position: relative;
         overflow: hidden;
 
@@ -449,9 +419,9 @@ exports[`useEuiButtonColorCSS empty 1`] = `
   },
   "danger": {
     "map": undefined,
-    "name": "ttz2kz-displaysColorsMap-display-color",
+    "name": "yfmvxe-displaysColorsMap-display-color",
     "next": undefined,
-    "styles": "color:#a71627;     
+    "styles": "color:#a71627;    
     position: relative;
         overflow: hidden;
 
@@ -483,9 +453,9 @@ exports[`useEuiButtonColorCSS empty 1`] = `
   },
   "disabled": {
     "map": undefined,
-    "name": "ioqbxh-displaysColorsMap-display-color",
+    "name": "rz0wa2-displaysColorsMap-display-color",
     "next": undefined,
-    "styles": "color:#798EAF;     
+    "styles": "color:#798EAF;    
     position: relative;
         overflow: hidden;
 
@@ -517,9 +487,9 @@ exports[`useEuiButtonColorCSS empty 1`] = `
   },
   "neutral": {
     "map": undefined,
-    "name": "1muhyse-displaysColorsMap-display-color",
+    "name": "3o6zbn-displaysColorsMap-display-color",
     "next": undefined,
-    "styles": "color:#0f658a;     
+    "styles": "color:#0f658a;    
     position: relative;
         overflow: hidden;
 
@@ -551,9 +521,9 @@ exports[`useEuiButtonColorCSS empty 1`] = `
   },
   "primary": {
     "map": undefined,
-    "name": "8pznf8-displaysColorsMap-display-color",
+    "name": "ydku63-displaysColorsMap-display-color",
     "next": undefined,
-    "styles": "color:#1750ba;     
+    "styles": "color:#1750ba;    
     position: relative;
         overflow: hidden;
 
@@ -585,9 +555,9 @@ exports[`useEuiButtonColorCSS empty 1`] = `
   },
   "risk": {
     "map": undefined,
-    "name": "19334xv-displaysColorsMap-display-color",
+    "name": "mmlnx4-displaysColorsMap-display-color",
     "next": undefined,
-    "styles": "color:#9e3a16;     
+    "styles": "color:#9e3a16;    
     position: relative;
         overflow: hidden;
 
@@ -619,9 +589,9 @@ exports[`useEuiButtonColorCSS empty 1`] = `
   },
   "success": {
     "map": undefined,
-    "name": "1kafuaw-displaysColorsMap-display-color",
+    "name": "1brg8u3-displaysColorsMap-display-color",
     "next": undefined,
-    "styles": "color:#09724d;     
+    "styles": "color:#09724d;    
     position: relative;
         overflow: hidden;
 
@@ -653,9 +623,9 @@ exports[`useEuiButtonColorCSS empty 1`] = `
   },
   "text": {
     "map": undefined,
-    "name": "1j2ow8l-displaysColorsMap-display-color",
+    "name": "felx57-displaysColorsMap-display-color",
     "next": undefined,
-    "styles": "color:#1d2a3e;     
+    "styles": "color:#1d2a3e;    
     position: relative;
         overflow: hidden;
 
@@ -687,9 +657,9 @@ exports[`useEuiButtonColorCSS empty 1`] = `
   },
   "warning": {
     "map": undefined,
-    "name": "1qptzpp-displaysColorsMap-display-color",
+    "name": "ik90e-displaysColorsMap-display-color",
     "next": undefined,
-    "styles": "color:#825803;     
+    "styles": "color:#825803;    
     position: relative;
         overflow: hidden;
 
diff --git a/packages/eui/src/global_styling/mixins/_button.ts b/packages/eui/src/global_styling/mixins/_button.ts
index 68b82a03e9c..ed6f65edae9 100644
--- a/packages/eui/src/global_styling/mixins/_button.ts
+++ b/packages/eui/src/global_styling/mixins/_button.ts
@@ -6,11 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { css, keyframes, type SerializedStyles } from '@emotion/react';
+import { css, type SerializedStyles } from '@emotion/react';
 import {
   _EuiThemeButtonColors,
   getTokenName,
-  euiCanAnimate,
   mathWithUnits,
 } from '@elastic/eui-theme-common';
 
@@ -18,7 +17,6 @@ import {
   makeHighContrastColor,
   UseEuiTheme,
   useEuiMemoizedStyles,
-  isEuiThemeRefreshVariant,
 } from '../../services';
 import { highContrastModeStyles, logicalCSS } from '../functions';
 
@@ -219,10 +217,6 @@ export const useEuiButtonColorCSS = (options: _EuiButtonOptions = {}) => {
 
 const euiButtonDisplaysColors = (euiThemeContext: UseEuiTheme) => {
   const { euiTheme } = euiThemeContext;
-  const isRefreshVariant = isEuiThemeRefreshVariant(
-    euiThemeContext,
-    'buttonVariant'
-  );
 
   const COLORS = [...EXTENDED_BUTTON_COLORS, 'disabled'] as const;
   type Colors = (typeof COLORS)[number];
@@ -250,16 +244,10 @@ const euiButtonDisplaysColors = (euiThemeContext: UseEuiTheme) => {
               border: ${euiTheme.border.width.thin} solid ${euiTheme.colors.borderBasePlain};
             `;
 
-          const refreshVariantStyles =
-            isRefreshVariant &&
-            `
-            ${_interactionStyles(euiThemeContext, buttonColors, 'overlay')}
-            ${borderStyle}
-          `;
-
           displaysColorsMap[display][color] = css`
             ${euiButtonColor(euiThemeContext, color)}
-            ${refreshVariantStyles}
+            ${_interactionStyles(euiThemeContext, buttonColors, 'overlay')}
+            ${borderStyle}
           `;
           break;
         }
@@ -270,10 +258,6 @@ const euiButtonDisplaysColors = (euiThemeContext: UseEuiTheme) => {
             'filled'
           );
 
-          const refreshVariantStyles =
-            isRefreshVariant &&
-            _interactionStyles(euiThemeContext, buttonColors);
-
           displaysColorsMap[display][color] = css`
             ${euiButtonFillColor(euiThemeContext, color)}
 
@@ -283,7 +267,7 @@ const euiButtonDisplaysColors = (euiThemeContext: UseEuiTheme) => {
               ? 'currentColor'
               : euiThemeContext.euiTheme.colors.fullShade};
 
-            ${refreshVariantStyles}
+            ${_interactionStyles(euiThemeContext, buttonColors)}
           `;
           break;
         }
@@ -294,26 +278,10 @@ const euiButtonDisplaysColors = (euiThemeContext: UseEuiTheme) => {
             'empty'
           );
 
-          const classicVariantStyles =
-            !isRefreshVariant &&
-            `
-              &:focus,
-              &:active {
-                background-color: ${
-                  euiButtonEmptyColor(euiThemeContext, color).backgroundColor
-                };
-              }
-            `;
-
-          const refreshVariantStyles =
-            isRefreshVariant &&
-            _interactionStyles(euiThemeContext, buttonColors, 'overlay');
-
           displaysColorsMap[display][color] = css`
             color: ${euiButtonEmptyColor(euiThemeContext, color).color};
 
-            ${classicVariantStyles}
-            ${refreshVariantStyles}
+            ${_interactionStyles(euiThemeContext, buttonColors, 'overlay')}
           `;
           break;
         }
@@ -338,39 +306,10 @@ const euiButtonDisplaysColors = (euiThemeContext: UseEuiTheme) => {
 export const useEuiButtonFocusCSS = () =>
   useEuiMemoizedStyles(euiButtonFocusCSS);
 
-const euiButtonFocusAnimation = keyframes`
-  50% {
-    transform: translateY(1px);
-  }
-`;
-const euiButtonFocusCSS = (euiThemeContext: UseEuiTheme) => {
-  const { euiTheme } = euiThemeContext;
-  const isRefreshVariant = isEuiThemeRefreshVariant(
-    euiThemeContext,
-    'buttonVariant'
-  );
-
-  const focusCSS = isRefreshVariant
-    ? css``
-    : css`
-        ${euiCanAnimate} {
-          transition: transform ${euiTheme.animation.normal} ease-in-out,
-            background-color ${euiTheme.animation.normal} ease-in-out;
-
-          &:hover:not(:disabled) {
-            transform: translateY(-1px);
-          }
+// NOTE: keeping this as placeholder for now in case we need custom button focus styles for https://github.com/elastic/eui-private/issues/267
+const euiButtonFocusCSS = (_euiThemeContext: UseEuiTheme) => {
+  const focusCSS = css``;
 
-          &:focus {
-            animation: ${euiButtonFocusAnimation} ${euiTheme.animation.normal}
-              ${euiTheme.animation.bounce};
-          }
-
-          &:active:not(:disabled) {
-            transform: translateY(1px);
-          }
-        }
-      `;
   // Remove the auto-generated label.
   // We could typically avoid a label by using a plain string `` instead of css``,
   // but we need css`` for keyframes`` to work for the focus animation
@@ -384,20 +323,15 @@ const euiButtonFocusCSS = (euiThemeContext: UseEuiTheme) => {
  */
 export const euiButtonSizeMap = (euiThemeContext: UseEuiTheme) => {
   const { euiTheme } = euiThemeContext;
-  const isRefreshVariant = isEuiThemeRefreshVariant(
-    euiThemeContext,
-    'buttonVariant'
-  );
-
   return {
     xs: {
-      minWidth: euiTheme.base * (isRefreshVariant ? 6 : 7),
+      minWidth: euiTheme.base * 6,
       height: euiTheme.size.l,
       radius: euiTheme.border.radius.small,
       fontScale: 'xs' as const,
     },
     s: {
-      minWidth: euiTheme.base * (isRefreshVariant ? 6 : 7),
+      minWidth: euiTheme.base * 6,
       height: euiTheme.size.xl,
       radius: euiTheme.border.radius.small,
       fontScale: 's' as const,
@@ -405,9 +339,7 @@ export const euiButtonSizeMap = (euiThemeContext: UseEuiTheme) => {
     m: {
       minWidth: euiTheme.base * 7,
       height: euiTheme.size.xxl,
-      radius: isRefreshVariant
-        ? euiTheme.border.radius.small
-        : euiTheme.border.radius.medium,
+      radius: euiTheme.border.radius.small,
       fontScale: 's' as const,
     },
   };
@@ -421,13 +353,6 @@ const _interactionStyles = (
   buttonColors: ButtonVariantColors,
   type: 'fill' | 'overlay' = 'fill'
 ) => {
-  const isRefreshVariant = isEuiThemeRefreshVariant(
-    euiThemeContext,
-    'buttonVariant'
-  );
-
-  if (!isRefreshVariant) return ``;
-
   const baseStyles = () => {
     // button hover is applied as pseudo element with a transparent background-color
     if (type === 'overlay') {
diff --git a/packages/eui/src/global_styling/mixins/_helpers.scss b/packages/eui/src/global_styling/mixins/_helpers.scss
deleted file mode 100644
index 7de426d4a59..00000000000
--- a/packages/eui/src/global_styling/mixins/_helpers.scss
+++ /dev/null
@@ -1,117 +0,0 @@
-// Helper mixins
-
-// Set scroll bar appearance on Chrome (and firefox).
-@mixin euiScrollBar($thumbColor: $euiColorDarkShade, $trackBackgroundColor: transparent, $size: 'thin') {
-  // Firefox's scrollbar coloring cascades, but the sizing does not,
-  // so it's being added to this mixin for allowing support wherever custom scrollbars are
-  scrollbar-color: transparentize($thumbColor, .5) $trackBackgroundColor; // Firefox support
-
-  @if ($size == 'thin') {
-    scrollbar-width: thin;
-  }
-
-  // stylelint-disable selector-no-vendor-prefix
-  &::-webkit-scrollbar {
-    width: $euiScrollBar;
-    height: $euiScrollBar;
-  }
-
-  &::-webkit-scrollbar-thumb {
-    background-color: transparentize($thumbColor, .5);
-    background-clip: content-box;
-    border-radius: $euiScrollBar;
-
-    @if ($size == 'thin') {
-      border: $euiScrollBarCornerThin solid $trackBackgroundColor;
-    } @else {
-      border: $euiScrollBarCorner solid $trackBackgroundColor;
-    }
-  }
-
-  &::-webkit-scrollbar-corner,
-  &::-webkit-scrollbar-track {
-    background-color: $trackBackgroundColor;
-  }
-}
-
-/**
- * 1. Focus rings shouldn't be visible on scrollable regions, but a11y requires them to be focusable.
- *    Browser's supporting `:focus-visible` will still show outline on keyboard focus only.
- *    Others like Safari, won't show anything at all.
- * 2. Force the `:focus-visible` when the `tabindex=0` (is tabbable)
- */
-
-// Just overflow and scrollbars
-@mixin euiYScroll {
-  @include euiScrollBar;
-  height: 100%;
-  overflow-y: auto;
-  overflow-x: hidden;
-
-  &:focus {
-    outline: none; /* 1 */
-  }
-
-  &[tabindex='0']:focus:focus-visible {
-    outline-style: auto; /* 2 */
-  }
-}
-
-@mixin euiXScroll {
-  @include euiScrollBar;
-  overflow-x: auto;
-
-  &:focus {
-    outline: none; /* 1 */
-  }
-
-  &[tabindex='0']:focus:focus-visible {
-    outline-style: auto; /* 2 */
-  }
-}
-
-// The full overflow with shadow
-@mixin euiYScrollWithShadows {
-  @include euiYScroll;
-  @include euiOverflowShadow('y');
-}
-
-@mixin euiXScrollWithShadows {
-  @include euiXScroll;
-  @include euiOverflowShadow('x');
-}
-
-// Hiding elements offscreen to only be read by screen reader
-// See https://github.com/elastic/eui/pull/5130 and https://github.com/elastic/eui/pull/5152 for more info
-@mixin euiScreenReaderOnly {
-  // Take the element out of the layout
-  position: absolute;
-  // Keep it vertically inline
-  top: auto;
-  // Chrome requires a left value, and Selenium (used by Kibana's FTR) requires an off-screen position for its .getVisibleText() to not register SR-only text
-  left: -10000px;
-  // The element must have a size (for some screen readers)
-  width: 1px;
-  height: 1px;
-  // But reduce the visible size to nothing
-  clip: rect(0 0 0 0);
-  clip-path: inset(50%);
-  // And ensure no overflows occur
-  overflow: hidden;
-  // Chrome requires the negative margin to not cause overflows of parent containers
-  margin: -1px;
-}
-
-// Doesn't have reduced motion turned on
-@mixin euiCanAnimate {
-  @media screen and (prefers-reduced-motion: no-preference) {
-    @content;
-  }
-}
-
-// Does have reduced motion turned on
-@mixin euiCantAnimate {
-  @media screen and (prefers-reduced-motion: reduce) {
-    @content;
-  }
-}
diff --git a/packages/eui/src/global_styling/mixins/_index.scss b/packages/eui/src/global_styling/mixins/_index.scss
deleted file mode 100644
index dfec5a84f31..00000000000
--- a/packages/eui/src/global_styling/mixins/_index.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-@import 'responsive';
-@import 'shadow';
-@import 'size';
-@import 'typography';
-@import 'helpers';
-@import 'states';
-
-@import 'tool_tip'; // Needed by Elastic Charts
diff --git a/packages/eui/src/global_styling/mixins/_responsive.scss b/packages/eui/src/global_styling/mixins/_responsive.scss
deleted file mode 100644
index 0fa3a9b08a8..00000000000
--- a/packages/eui/src/global_styling/mixins/_responsive.scss
+++ /dev/null
@@ -1,44 +0,0 @@
-// A sem-complicated mixin for breakpoints, that takes any number of
-// named breakpoints that exists in $euiBreakpoints.
-
-@mixin euiBreakpoint($sizes...) {
-  // Loop through each size parameter
-  @each $size in $sizes {
-    // Store the location of the size in the list to check against
-    $index: index($euiBreakpointKeys, $size);
-
-    // Check to make sure it exists in the allowed breakpoint names
-    @if ( $index ) {
-
-      // Set the min size to the value of the size
-      $minSize: map-get($euiBreakpoints, $size);
-
-      // If it is the last item, don't give it a max-width
-      @if ( $index == length($euiBreakpointKeys) ) {
-        @media only screen and (min-width: $minSize) {
-          @content;
-        }
-        // If it's not the last item, add a max-width
-      } @else {
-
-        // Set the max size to the value of the next size (-1px as to not overlap)
-        $maxSize: map-get($euiBreakpoints, nth($euiBreakpointKeys, $index + 1)) - 1px;
-
-        // If it's the the first item, don't set a min-width
-        @if ( $index == 1 ) {
-          @media only screen and (max-width: $maxSize) {
-            @content;
-          }
-          // Otherwise it should have a min and max width
-        } @else {
-          @media only screen and (min-width: $minSize) and (max-width: $maxSize) {
-            @content;
-          }
-        }
-      }
-      // If it's not a known breakpoint, throw a warning
-    } @else {
-      @warn "euiBreakpoint(): '#{$size}' is not a valid size in $euiBreakpoints. Accepted values are '#{$euiBreakpointKeys}'";
-    }
-  }
-}
diff --git a/packages/eui/src/global_styling/mixins/_shadow.scss b/packages/eui/src/global_styling/mixins/_shadow.scss
deleted file mode 100644
index 71162d7978d..00000000000
--- a/packages/eui/src/global_styling/mixins/_shadow.scss
+++ /dev/null
@@ -1,100 +0,0 @@
-@function shadowOpacity($opacity) {
-  @if (lightness($euiColorTextParagraph) < 50) {
-    @return $opacity * 1;
-  } @else {
-    @return $opacity * 2.5;
-  }
-}
-
-@mixin euiSlightShadow($color: $euiShadowColor) {
-  box-shadow:
-    0 .8px .8px rgba($color, shadowOpacity(.04)),
-    0 2.3px 2px rgba($color, shadowOpacity(.03));
-}
-
-@mixin euiBottomShadowSmall($color: $euiShadowColor) {
-  box-shadow:
-    0 .7px 1.4px rgba($color, shadowOpacity(.07)),
-    0 1.9px 4px rgba($color, shadowOpacity(.05)),
-    0 4.5px 10px rgba($color, shadowOpacity(.05));
-}
-
-@mixin euiBottomShadowMedium($color: $euiShadowColor) {
-  box-shadow:
-    0 .9px 4px -1px rgba($color, shadowOpacity(.08)),
-    0 2.6px 8px -1px rgba($color, shadowOpacity(.06)),
-    0 5.7px 12px -1px rgba($color, shadowOpacity(.05)),
-    0 15px 15px -1px rgba($color, shadowOpacity(.04));
-}
-
-// Similar to shadow medium but without the bottom depth. Useful for popovers
-// that drop UP rather than DOWN.
-@mixin euiBottomShadowFlat($color: $euiShadowColor) {
-  box-shadow:
-    0 0 .8px rgba($color, shadowOpacity(.06)),
-    0 0 2px rgba($color, shadowOpacity(.04)),
-    0 0 5px rgba($color, shadowOpacity(.04)),
-    0 0 17px rgba($color, shadowOpacity(.03));
-}
-
-@mixin euiBottomShadow($color: $euiShadowColor) {
-  box-shadow:
-    0 1px 5px rgba($color, shadowOpacity(.1)),
-    0 3.6px 13px rgba($color, shadowOpacity(.07)),
-    0 8.4px 23px rgba($color, shadowOpacity(.06)),
-    0 23px 35px rgba($color, shadowOpacity(.05));
-}
-
-@mixin euiBottomShadowLarge(
-  $color: $euiShadowColor,
-  $opacity: 0,
-  $reverse: false
-) {
-  @if ($reverse) {
-    box-shadow:
-      0 -2.7px 9px rgba($color, shadowOpacity(.13)),
-      0 -9.4px 24px rgba($color, shadowOpacity(.09)),
-      0 -21.8px 43px rgba($color, shadowOpacity(.08));
-  } @else {
-    box-shadow:
-      0 2.7px 9px rgba($color, shadowOpacity(.13)),
-      0 9.4px 24px rgba($color, shadowOpacity(.09)),
-      0 21.8px 43px rgba($color, shadowOpacity(.08));
-  }
-}
-
-// stylelint-disable color-named
-@mixin euiOverflowShadow($direction: 'y', $side: 'both') {
-  $hideHeight: $euiScrollBarCornerThin * 1.25;
-  $gradient: null;
-  $gradientStart:
-    transparentize(red, .9) 0%,
-    transparentize(red, 0) $hideHeight;
-  $gradientEnd:
-    transparentize(red, 0) calc(100% - #{$hideHeight}),
-    transparentize(red, .9) 100%;
-  @if ($side == 'both' or $side == 'start' or $side == 'end') {
-    @if ($side == 'both') {
-      $gradient: $gradientStart, $gradientEnd;
-    } @else if ($side == 'start') {
-      $gradient: $gradientStart;
-    } @else {
-      $gradient: $gradientEnd;
-    }
-  } @else {
-    @warn "euiOverflowShadow() expects side to be 'both', 'start' or 'end' but got '#{$side}'";
-  }
-
-  @if ($direction == 'y') {
-    mask-image: linear-gradient(to bottom, #{$gradient});
-  } @else if ($direction == 'x') {
-    mask-image: linear-gradient(to right, #{$gradient});
-  } @else {
-    @warn "euiOverflowShadow() expects direction to be 'y' or 'x' but got '#{$direction}'";
-  }
-
-  // Chrome+Edge has a very bizarre edge case bug where `mask-image` stops working
-  // This workaround forces a stacking context on the scrolling container, which
-  // hopefully addresses the bug. @see https://github.com/elastic/eui/pull/7855
-  transform: translateZ(0);
-}
diff --git a/packages/eui/src/global_styling/mixins/_size.scss b/packages/eui/src/global_styling/mixins/_size.scss
deleted file mode 100644
index 809dc870bf8..00000000000
--- a/packages/eui/src/global_styling/mixins/_size.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-@mixin size($size) {
-  width: $size;
-  height: $size;
-}
diff --git a/packages/eui/src/global_styling/mixins/_states.scss b/packages/eui/src/global_styling/mixins/_states.scss
deleted file mode 100644
index 403660a41e5..00000000000
--- a/packages/eui/src/global_styling/mixins/_states.scss
+++ /dev/null
@@ -1,17 +0,0 @@
-@mixin euiFocusRing($size: 'small', $amsterdamOnlyProp: null) {
-  @if $size == 'large' {
-    // It's always OK to use the focus animation. This will take precedence over times we turn it off individually like EuiButtonEmpty
-    // stylelint-disable-next-line declaration-no-important
-    animation: $euiAnimSpeedSlow $euiAnimSlightResistance 1 normal forwards focusRingAnimateLarge !important;
-  } @else {
-    // stylelint-disable-next-line declaration-no-important
-    animation: $euiAnimSpeedSlow $euiAnimSlightResistance 1 normal forwards focusRingAnimate !important;
-  }
-}
-
-// Keyframe animation declarations can be found in
-// utility/animations.scss
-
-@mixin euiFocusBackground($color: $euiColorPrimary) {
-  background-color: tintOrShade($euiColorPrimary, ((1 - $euiFocusTransparency) * 100%), ((1 - $euiFocusTransparency) * 100%));
-}
diff --git a/packages/eui/src/global_styling/mixins/_tool_tip.scss b/packages/eui/src/global_styling/mixins/_tool_tip.scss
deleted file mode 100644
index f1223f5c1fe..00000000000
--- a/packages/eui/src/global_styling/mixins/_tool_tip.scss
+++ /dev/null
@@ -1,18 +0,0 @@
-@mixin euiToolTipStyle($size: null) {
-  @include euiBottomShadow($color: $euiColorInk);
-
-  $euiTooltipBackgroundColor: tintOrShade($euiColorFullShade, 25%, 100%) !default;
-  $euiTooltipBorderColor: tintOrShade($euiColorFullShade, 35%, 80%) !default;
-
-  border-radius: $euiBorderRadius;
-  background-color: $euiTooltipBackgroundColor;
-  color: $euiColorGhost;
-  z-index: $euiZLevel9;
-  max-width: 256px;
-  overflow-wrap: break-word;
-  padding: $euiSizeS;
-
-  .euiHorizontalRule {
-    background-color: $euiTooltipBorderColor;
-  }
-}
diff --git a/packages/eui/src/global_styling/mixins/_typography.scss b/packages/eui/src/global_styling/mixins/_typography.scss
deleted file mode 100644
index 61ffafe872a..00000000000
--- a/packages/eui/src/global_styling/mixins/_typography.scss
+++ /dev/null
@@ -1,166 +0,0 @@
-// stylelint-disable property-no-vendor-prefix
-// stylelint-disable declaration-no-important
-
-@function fontSizeToRemOrEm($size, $sizingMethod: 'rem') {
-  @if ($sizingMethod == 'rem') {
-    @return #{$size / $euiFontSize}rem;
-  } @else if ($sizingMethod == 'em') {
-    @return #{$size / $euiFontSize}em;
-  }
-}
-
-// It can also be applied to calculate paddings
-@function marginToRemOrEm($elementSize, $elementFontSize, $sizingMethod: 'rem') {
-  @if ($sizingMethod == 'rem') {
-    @return #{$elementSize / $euiFontSize}rem;
-  } @else if ($sizingMethod == 'em') {
-    @return #{$elementSize / $elementFontSize}em;
-  }
-}
-
-// Spit out rem and px
-@mixin fontSize($size: $euiFontSize, $sizingMethod: 'rem') {
-  @if ($sizingMethod == 'rem') {
-    font-size: $size;
-    font-size: fontSizeToRemOrEm($size, 'rem');
-  } @else if ($sizingMethod == 'em') {
-    font-size: fontSizeToRemOrEm($size, 'em');
-  }
-}
-
-@mixin lineHeightFromBaseline($multiplier: 3) {
-  line-height: lineHeightFromBaseline($multiplier);
-}
-
-// Some mixins that help us deal with browser scaling of text more consistently.
-// Essentially, fonts across eui should scale against the root html element, not
-// against parent inheritance.
-
-// Our base fonts
-
-@mixin euiFont {
-  font-family: $euiFontFamily;
-  font-weight: $euiFontWeightRegular;
-  letter-spacing: -.005em;
-  -webkit-text-size-adjust: 100%;
-  font-kerning: normal;
-}
-
-@mixin euiCodeFont {
-  font-family: $euiCodeFontFamily;
-  letter-spacing: normal;
-}
-
-@mixin euiText {
-  color: $euiColorTextParagraph;
-  font-weight: $euiFontWeightRegular;
-}
-
-@mixin euiTitle($size: 'm') {
-  @include euiTextBreakWord;
-  color: $euiColorTextHeading;
-
-  @if (map-has-key($euiTitles, $size)) {
-    @each $property, $value in map-get($euiTitles, $size) {
-      @if ($property == 'font-size') {
-        @include fontSize($value);
-      } @else {
-        #{$property}: $value;
-      }
-    }
-  } @else {
-    @include fontSize($size);
-    @include lineHeightFromBaseline(3);
-  }
-}
-
-// Font sizing extends, using rem mixin
-
-@mixin euiFontSizeXS {
-  @include fontSize($euiFontSizeXS);
-  line-height: $euiLineHeight;
-}
-
-@mixin euiFontSizeS {
-  @include fontSize($euiFontSizeS);
-  line-height: $euiLineHeight;
-}
-
-@mixin euiFontSize {
-  @include fontSize($euiFontSize);
-  line-height: $euiLineHeight;
-}
-
-@mixin euiFontSizeM {
-  @include fontSize($euiFontSizeM);
-  line-height: $euiLineHeight;
-}
-
-@mixin euiFontSizeL {
-  @include fontSize($euiFontSizeL);
-  line-height: $euiLineHeight;
-}
-
-@mixin euiFontSizeXL {
-  @each $property, $value in map-get($euiTitles, 'm') {
-    @if ($property == 'font-size') {
-      @include fontSize($value);
-    } @else {
-      #{$property}: $value;
-    }
-  }
-  line-height: 1.25;
-}
-
-@mixin euiFontSizeXXL {
-  @each $property, $value in map-get($euiTitles, 'l') {
-    @if ($property == 'font-size') {
-      @include fontSize($value);
-    } @else {
-      #{$property}: $value;
-    }
-  }
-  line-height: 1.25;
-}
-
-@mixin euiTextBreakWord {
-  // https://css-tricks.com/snippets/css/prevent-long-urls-from-breaking-out-of-container/
-  overflow-wrap: break-word !important; // makes sure the long string will wrap and not bust out of the container
-  word-break: break-word;
-}
-
-/**
- * Text truncation
- *
- * Prevent text from wrapping onto multiple lines, and truncate with an ellipsis.
- *
- * 1. Ensure that the node has a maximum width after which truncation can occur.
- */
-@mixin euiTextTruncate {
-  max-width: 100%; // 1
-  overflow: hidden !important;
-  text-overflow: ellipsis !important;
-  white-space: nowrap !important;
-}
-
-@mixin euiNumberFormat {
-  font-feature-settings: $euiFontFeatureSettings, 'tnum' 1; // Fixed-width numbers for tabular data
-}
-
-/**
- * Text weight shifting
- *
- * When changing the font-weight based the state of the component
- * this mixin will ensure that the sizing is dependent on the boldest
- * weight so it doesn't shifter sibling content.
- */
-@mixin euiTextShift($fontWeight: $euiFontWeightBold, $attr: 'data-text') {
-  &::after {
-    display: block;
-    content: attr(#{$attr});
-    font-weight: $fontWeight;
-    height: 0;
-    overflow: hidden;
-    visibility: hidden;
-  }
-}
diff --git a/packages/eui/src/global_styling/variables/_animations.scss b/packages/eui/src/global_styling/variables/_animations.scss
deleted file mode 100644
index b6e40a79f6d..00000000000
--- a/packages/eui/src/global_styling/variables/_animations.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-// Animations
-
-@import 'node_modules/@elastic/eui-theme-common/src/global_styling/variables/animations'
-
-// Keyframe animation declarations can be found in
-// utility/animations.scss
diff --git a/packages/eui/src/global_styling/variables/_borders.scss b/packages/eui/src/global_styling/variables/_borders.scss
deleted file mode 100644
index 818f5807e6f..00000000000
--- a/packages/eui/src/global_styling/variables/_borders.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-// Borders
-
-@import 'node_modules/@elastic/eui-theme-common/src/global_styling/variables/borders'
diff --git a/packages/eui/src/global_styling/variables/_buttons.scss b/packages/eui/src/global_styling/variables/_buttons.scss
deleted file mode 100644
index 288dca14d61..00000000000
--- a/packages/eui/src/global_styling/variables/_buttons.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import 'node_modules/@elastic/eui-theme-common/src/global_styling/variables/buttons'
diff --git a/packages/eui/src/global_styling/variables/_font_weight.scss b/packages/eui/src/global_styling/variables/_font_weight.scss
deleted file mode 100644
index 152c64d8358..00000000000
--- a/packages/eui/src/global_styling/variables/_font_weight.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-// Separated out to its own file for easy import into docs
-
-// Font weights
-@import 'node_modules/@elastic/eui-theme-common/src/global_styling/variables/font_weight'
diff --git a/packages/eui/src/global_styling/variables/_form.scss b/packages/eui/src/global_styling/variables/_form.scss
deleted file mode 100644
index cdf08ad78bf..00000000000
--- a/packages/eui/src/global_styling/variables/_form.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-// Form
-@import 'node_modules/@elastic/eui-theme-common/src/global_styling/variables/form'
diff --git a/packages/eui/src/global_styling/variables/_index.scss b/packages/eui/src/global_styling/variables/_index.scss
deleted file mode 100644
index 2397647bde9..00000000000
--- a/packages/eui/src/global_styling/variables/_index.scss
+++ /dev/null
@@ -1,22 +0,0 @@
-// --------------------------------------------------------------------------------------
-// EUI global variables
-// --------------------------------------------------------------------------------------
-// This module contains all global variables available within EUI. Every variable in this
-// document should be prefixed with $eui. This lets us know where the variable is
-// coming from when looking inside the individual component files. Any component local
-// variables should be declared at the top of those documents prefixed with $componentName.
-
-// Global colors are established and importer per theme, before this manifest
-// Import order is important. Size, vis colors, ...etc are used in other variables.
-@import 'size';
-@import 'animations';
-@import 'font_weight';
-@import 'typography';
-@import 'borders';
-@import 'responsive';
-@import 'shadows';
-@import 'states';
-@import 'z_index';
-
-@import 'buttons';
-@import 'form';
diff --git a/packages/eui/src/global_styling/variables/_responsive.scss b/packages/eui/src/global_styling/variables/_responsive.scss
deleted file mode 100644
index 45e7a7c4531..00000000000
--- a/packages/eui/src/global_styling/variables/_responsive.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import 'node_modules/@elastic/eui-theme-common/src/global_styling/variables/responsive'
diff --git a/packages/eui/src/global_styling/variables/_shadows.scss b/packages/eui/src/global_styling/variables/_shadows.scss
deleted file mode 100644
index 14237af776b..00000000000
--- a/packages/eui/src/global_styling/variables/_shadows.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-// Shadows
-@import 'node_modules/@elastic/eui-theme-common/src/global_styling/variables/shadows'
diff --git a/packages/eui/src/global_styling/variables/_size.scss b/packages/eui/src/global_styling/variables/_size.scss
deleted file mode 100644
index 987c03b80f6..00000000000
--- a/packages/eui/src/global_styling/variables/_size.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import 'node_modules/@elastic/eui-theme-common/src/global_styling/variables/size'
diff --git a/packages/eui/src/global_styling/variables/_states.scss b/packages/eui/src/global_styling/variables/_states.scss
deleted file mode 100644
index 581a81bb59b..00000000000
--- a/packages/eui/src/global_styling/variables/_states.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import 'node_modules/@elastic/eui-theme-common/src/global_styling/variables/states'
\ No newline at end of file
diff --git a/packages/eui/src/global_styling/variables/_typography.scss b/packages/eui/src/global_styling/variables/_typography.scss
deleted file mode 100644
index 70a15446af9..00000000000
--- a/packages/eui/src/global_styling/variables/_typography.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import 'node_modules/@elastic/eui-theme-common/src/global_styling/variables/typography'
\ No newline at end of file
diff --git a/packages/eui/src/global_styling/variables/_z_index.scss b/packages/eui/src/global_styling/variables/_z_index.scss
deleted file mode 100644
index 2c2769dbd85..00000000000
--- a/packages/eui/src/global_styling/variables/_z_index.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-// Z-Index
-@import 'node_modules/@elastic/eui-theme-common/src/global_styling/variables/z_index'
diff --git a/packages/eui/src/index.ts b/packages/eui/src/index.ts
index a52d87d4af5..ee8bd68adc4 100644
--- a/packages/eui/src/index.ts
+++ b/packages/eui/src/index.ts
@@ -9,5 +9,4 @@
 export * from './components';
 export * from './services';
 export * from './utils';
-export * from './themes';
 export * from './global_styling';
diff --git a/packages/eui/src/services/breakpoint/current_breakpoint_hook.testenv.tsx b/packages/eui/src/services/breakpoint/current_breakpoint_hook.testenv.tsx
index 2f5484da9ad..8eca3be194f 100644
--- a/packages/eui/src/services/breakpoint/current_breakpoint_hook.testenv.tsx
+++ b/packages/eui/src/services/breakpoint/current_breakpoint_hook.testenv.tsx
@@ -22,7 +22,7 @@ export const useCurrentEuiBreakpoint = () => {
 
   if (typeof window === 'undefined') return undefined; // SSR catch
 
-  // Use the default Amsterdam breakpoints (which are already ordered by largest first)
+  // Use the default breakpoints (which are already ordered by largest first)
   return keysOf(breakpoints).find(
     (key) => breakpoints[key] <= window.innerWidth
   );
diff --git a/packages/eui/src/services/color/eui_palettes.test.ts b/packages/eui/src/services/color/eui_palettes.test.ts
index 5450b528fe7..ef9aef119e8 100644
--- a/packages/eui/src/services/color/eui_palettes.test.ts
+++ b/packages/eui/src/services/color/eui_palettes.test.ts
@@ -53,7 +53,6 @@ describe('euiPaletteColorBlindBehindText', () => {
 
     const result = euiPaletteColorBlindBehindText({
       colors,
-      hasVisColorAdjustment: false,
     });
 
     expect(result[0]).toEqual(customColor);
diff --git a/packages/eui/src/services/color/eui_palettes.ts b/packages/eui/src/services/color/eui_palettes.ts
index 2a29e0e25eb..80b159a1f8c 100644
--- a/packages/eui/src/services/color/eui_palettes.ts
+++ b/packages/eui/src/services/color/eui_palettes.ts
@@ -38,11 +38,6 @@ export type EuiPaletteCommonProps = {
    * Use this to specify colors when you can't rely on the EuiProvider updates.
    */
   colors?: _EuiThemeVisColors;
-  /**
-   * Specifies if some color asdjustments for vis colors are required.
-   * Has to be passed when `colors` are set
-   */
-  hasVisColorAdjustment?: boolean;
 };
 
 export type EuiPaletteRotationProps = {
@@ -162,19 +157,9 @@ export const euiPaletteColorBlind = ({
 export const euiPaletteColorBlindBehindText = (
   paletteProps: EuiPaletteColorBlindProps = {}
 ) => {
-  const { hasVisColorAdjustment } = paletteProps;
-  const _hasVisColorAdjustment =
-    hasVisColorAdjustment ?? EUI_VIS_COLOR_STORE.hasVisColorAdjustment;
-
   const originalPalette = euiPaletteColorBlind(paletteProps);
 
-  // new theme palette has required contrast, we don't need to adjust them
-  if (!_hasVisColorAdjustment) return originalPalette;
-
-  const newPalette = originalPalette.map((color) =>
-    chroma(color).brighten(0.5).hex()
-  );
-  return newPalette;
+  return originalPalette;
 };
 
 const _getVisColorsAsText = (
@@ -268,11 +253,9 @@ export const euiPaletteForStatus = function (
  */
 export const euiPaletteForTemperature = function (
   steps: any,
-  { colors, hasVisColorAdjustment }: EuiPaletteCommonProps = {}
+  { colors }: EuiPaletteCommonProps = {}
 ): EuiPalette {
   const visColors = colors ?? EUI_VIS_COLOR_STORE.visColors;
-  const _hasVisColorAdjustment =
-    hasVisColorAdjustment ?? EUI_VIS_COLOR_STORE.hasVisColorAdjustment;
 
   if (steps === 1) {
     return [visColors.euiColorVisCool2];
@@ -301,9 +284,7 @@ export const euiPaletteForTemperature = function (
     3
   );
 
-  const paletteColors = _hasVisColorAdjustment
-    ? [...cools, ...warms]
-    : [...cools, visColors.euiColorVisBase0, ...warms];
+  const paletteColors = [...cools, visColors.euiColorVisBase0, ...warms];
 
   return euiPalette(paletteColors, steps, true);
 };
@@ -316,23 +297,19 @@ export const euiPaletteForTemperature = function (
  */
 export const euiPaletteComplementary = function (
   steps: number,
-  { colors, hasVisColorAdjustment }: EuiPaletteCommonProps = {}
+  { colors }: EuiPaletteCommonProps = {}
 ): EuiPalette {
   const visColors = colors ?? EUI_VIS_COLOR_STORE.visColors;
-  const _hasVisColorAdjustment =
-    hasVisColorAdjustment ?? EUI_VIS_COLOR_STORE.hasVisColorAdjustment;
 
   if (steps === 1) {
     return [visColors.euiColorVisComplementary0];
   }
 
-  const paletteColors = _hasVisColorAdjustment
-    ? [visColors.euiColorVisComplementary0, visColors.euiColorVisComplementary1]
-    : [
-        visColors.euiColorVisComplementary0,
-        visColors.euiColorVisBase0,
-        visColors.euiColorVisComplementary1,
-      ];
+  const paletteColors = [
+    visColors.euiColorVisComplementary0,
+    visColors.euiColorVisBase0,
+    visColors.euiColorVisComplementary1,
+  ];
 
   return euiPalette(paletteColors, steps, true);
 };
@@ -455,11 +432,9 @@ export const euiPaletteOrange = function (
  */
 export const euiPaletteCool = function (
   steps: number,
-  { colors, hasVisColorAdjustment }: EuiPaletteCommonProps = {}
+  { colors }: EuiPaletteCommonProps = {}
 ): EuiPalette {
   const visColors = colors ?? EUI_VIS_COLOR_STORE.visColors;
-  const _hasVisColorAdjustment =
-    hasVisColorAdjustment ?? EUI_VIS_COLOR_STORE.hasVisColorAdjustment;
 
   if (steps === 1) {
     return [visColors.euiColorVisCool1];
@@ -467,9 +442,7 @@ export const euiPaletteCool = function (
 
   return euiPalette(
     [
-      _hasVisColorAdjustment
-        ? visColors.euiColorVisBase0
-        : visColors.euiColorVisCool0,
+      visColors.euiColorVisCool0,
       visColors.euiColorVisCool1,
       visColors.euiColorVisCool2,
     ],
diff --git a/packages/eui/src/services/color/eui_palettes_hooks.ts b/packages/eui/src/services/color/eui_palettes_hooks.ts
index 29bc683ea38..98ff3a62033 100644
--- a/packages/eui/src/services/color/eui_palettes_hooks.ts
+++ b/packages/eui/src/services/color/eui_palettes_hooks.ts
@@ -89,15 +89,14 @@ const _useEuiPaletteFn = (
   args?: EuiPaletteRotationProps
 ) => {
   const { euiTheme } = useEuiTheme();
-  const { colors, flags } = euiTheme;
+  const { colors } = euiTheme;
 
   return useMemo(() => {
     return palleteFn({
       ...args,
       colors: colors.vis,
-      hasVisColorAdjustment: flags.hasVisColorAdjustment,
     });
-  }, [colors, flags, args, palleteFn]);
+  }, [colors, args, palleteFn]);
 };
 
 const _useEuiPaletteWithStepsFn = (
@@ -105,14 +104,13 @@ const _useEuiPaletteWithStepsFn = (
   steps: number
 ) => {
   const { euiTheme } = useEuiTheme();
-  const { colors, flags } = euiTheme;
+  const { colors } = euiTheme;
 
   return useMemo(
     () =>
       palleteFn(steps, {
         colors: colors.vis,
-        hasVisColorAdjustment: flags.hasVisColorAdjustment,
       }),
-    [colors, flags, steps, palleteFn]
+    [colors, steps, palleteFn]
   );
 };
diff --git a/packages/eui/src/services/color/vis_color_store.ts b/packages/eui/src/services/color/vis_color_store.ts
index 732022d8c9d..bd686a69f5d 100644
--- a/packages/eui/src/services/color/vis_color_store.ts
+++ b/packages/eui/src/services/color/vis_color_store.ts
@@ -9,6 +9,6 @@
 import { _EuiVisColorStore, EuiVisColorStore } from '@elastic/eui-theme-common';
 import { colorVis } from '@elastic/eui-theme-borealis';
 
-// initialsetup of Vis color storage with default colors
+// initial setup of vis color storage with default colors
 export const EUI_VIS_COLOR_STORE: _EuiVisColorStore =
-  EuiVisColorStore.getInstance(colorVis, false);
+  EuiVisColorStore.getInstance(colorVis);
diff --git a/packages/eui/src/services/theme/provider.tsx b/packages/eui/src/services/theme/provider.tsx
index 9ebd08deced..70a9d4b05ac 100644
--- a/packages/eui/src/services/theme/provider.tsx
+++ b/packages/eui/src/services/theme/provider.tsx
@@ -145,10 +145,7 @@ export const EuiThemeProvider = <T extends {} = {}>({
   const updateVisColorStore = useCallback(
     (theme: EuiThemeComputed, isGlobalTheme: boolean) => {
       if (isGlobalTheme) {
-        EUI_VIS_COLOR_STORE.setVisColors(
-          theme.colors.vis,
-          theme.flags?.hasVisColorAdjustment ?? true
-        );
+        EUI_VIS_COLOR_STORE.setVisColors(theme.colors.vis);
       }
     },
     []
@@ -219,15 +216,17 @@ export const EuiThemeProvider = <T extends {} = {}>({
     if (!isParentTheme.current) {
       /* Enables recomputation of component colors when flags are overridden on the provider
       by adding the respective key to modifications to trigger a recomputation. */
+      // NOTE: Keeping this as placeholder for potential future usage during Borealis changes
       // TODO: remove once visual refresh is completed and flags are obsolete
-      const flagsToRecompute = [
-        { flag: 'buttonVariant', componentKey: 'buttons' },
-        { flag: 'formVariant', componentKey: 'forms' },
-      ];
+      const flagsToRecompute:
+        | Array<{ flag: string; componentKey: string }>
+        | [] = [];
 
       const keys: { [key: string]: { LIGHT: {}; DARK: {} } } = {};
 
       const forceRecomputeComponents = flagsToRecompute.some((item) => {
+        if (!item) return false;
+
         if (
           Object.keys(modifications.flags ?? {}).includes(item.flag) &&
           !Object.keys(modifications.components ?? {}).includes(
diff --git a/packages/eui/src/themes/amsterdam/_colors_dark.scss b/packages/eui/src/themes/amsterdam/_colors_dark.scss
deleted file mode 100644
index f76c4a655e7..00000000000
--- a/packages/eui/src/themes/amsterdam/_colors_dark.scss
+++ /dev/null
@@ -1,139 +0,0 @@
-// stylelint-disable color-no-hex
-
-// This extra import allows any variables that are created via functions to work when loaded into JS
-@import 'node_modules/@elastic/eui-theme-common/src/global_styling/functions/index';
-@import './global_styling/variables/colors_severity';
-
-// Constants
-$euiColorGhost: #FFF !default;
-$euiColorInk: #000 !default;
-
-$euiColorPlainLight: $euiColorGhost;
-$euiColorPlainDark: $euiColorInk;
-
-// Brand
-$euiColorPrimary: #36A2EF !default;
-$euiColorAccent: #F68FBE !default;
-$euiColorAccentSecondary: #7DDED8 !default;
-$euiColorSuccess: #7DDED8 !default;
-$euiColorWarning: #F3D371 !default;
-$euiColorDanger: #F86B63 !default;
-
-// Shades
-$euiColorEmptyShade: #1D1E24 !default;
-$euiColorLightestShade: #25262E !default;
-$euiColorLightShade: #343741 !default;
-$euiColorMediumShade: #535966 !default;
-$euiColorDarkShade: #98A2B3 !default;
-$euiColorDarkestShade: #D4DAE5 !default;
-$euiColorFullShade: #FFF !default;
-
-// Backgrounds
-$euiPageBackgroundColor: shade($euiColorLightestShade, 45%) !default;
-$euiColorHighlight: #2E2D25 !default;
-
-$euiColorBackgroundBasePrimary: shade($euiColorPrimary, 80%) !default;
-$euiColorBackgroundBaseAccent: shade($euiColorAccent, 80%) !default;
-$euiColorBackgroundBaseAccentSecondary: shade($euiColorAccentSecondary, 80%) !default;
-$euiColorBackgroundBaseNeutral: shade($euiColorSeverityNeutral, 80%) !default;
-$euiColorBackgroundBaseSuccess: shade($euiColorSuccess, 80%) !default;
-$euiColorBackgroundBaseWarning: shade($euiColorWarning, 80%) !default;
-$euiColorBackgroundBaseRisk: shade($euiColorSeverityRisk, 80%) !default;
-$euiColorBackgroundBaseDanger: shade($euiColorDanger, 80%) !default;
-$euiColorBackgroundBaseSubdued: shade($euiPageBackgroundColor, 80%) !default;
-$euiColorBackgroundBaseDisabled: transparentize($euiColorLightShade, 0.15)!default;
-$euiColorBackgroundBasePlain: $euiColorEmptyShade !default;
-$euiColorBackgroundBaseFormsPrepend: shade($euiColorLightShade, 0.15) !default;
-$euiColorBackgroundBaseFormsControlDisabled: $euiColorLightShade !default;
-
-$euiColorBackgroundBaseInteractiveHover: transparentize($euiColorLightShade, 0.2) !default;
-$euiColorBackgroundBaseInteractiveSelect: shade($euiColorPrimary, 0.7) !default;
-$euiColorBackgroundBaseInteractiveSelectHover: shade($euiColorPrimary, 0.6) !default;
-$euiColorBackgroundBaseInteractiveOverlay: transparentize($euiColorInk, 0.5) !default;
-$euiColorBackgroundBaseSkeletonEdge: shade($euiColorLightShade, 0.12) !default;
-$euiColorBackgroundBaseSkeletonMiddle: shade($euiColorLightShade, 0.24) !default;
-
-$euiColorBackgroundLightPrimary: shade($euiColorPrimary, 0.7) !default;
-$euiColorBackgroundLightAccent: shade($euiColorAccent, 0.7) !default;
-$euiColorBackgroundLightAccentSecondary: shade($euiColorAccentSecondary, 0.7)  !default;
-$euiColorBackgroundLightNeutral: shade($euiColorSeverityNeutral, 0.7) !default;
-$euiColorBackgroundLightSuccess: shade($euiColorSuccess, 0.7)  !default;
-$euiColorBackgroundLightWarning: shade($euiColorWarning, 0.7)  !default;
-$euiColorBackgroundLightRisk: shade($euiColorSeverityRisk, 0.7)  !default;
-$euiColorBackgroundLightDanger: shade($euiColorDanger, 0.7)  !default;
-$euiColorBackgroundLightText: shade($euiColorLightShade, 0.2) !default;
-
-$euiColorBackgroundFilledPrimary: $euiColorPrimary !default;
-$euiColorBackgroundFilledAccent: $euiColorAccent !default;
-$euiColorBackgroundFilledAccentSecondary: $euiColorAccentSecondary !default;
-$euiColorBackgroundFilledNeutral: $euiColorSeverityNeutral !default;
-$euiColorBackgroundFilledSuccess: $euiColorSuccess !default;
-$euiColorBackgroundFilledWarning: $euiColorWarning !default;
-$euiColorBackgroundFilledRisk: $euiColorSeverityRisk !default;
-$euiColorBackgroundFilledDanger: $euiColorDanger !default;
-$euiColorBackgroundFilledText:  #DFE5EF !default;
-
-// Texts
-$euiTextColor: #DFE5EF !default;
-$euiTitleColor: $euiTextColor !default;
-$euiTextSubduedColor: makeHighContrastColor($euiColorMediumShade) !default;
-$euiColorDisabled: #515761 !default;
-
-$euiColorTextParagraph: $euiTextColor !default;
-$euiColorTextHeading: $euiTitleColor !default;
-$euiColorTextSubdued: $euiTextSubduedColor !default;
-$euiColorTextDisabled: #515761 !default;
-$euiColorTextInverse: $euiColorGhost !default;
-
-// Brand texts
-$euiColorPrimaryText: makeHighContrastColor($euiColorPrimary) !default;
-$euiColorSuccessText: makeHighContrastColor($euiColorSuccess) !default;
-$euiColorAccentText: makeHighContrastColor($euiColorAccent) !default;
-$euiColorWarningText: makeHighContrastColor($euiColorWarning) !default;
-$euiColorDangerText: makeHighContrastColor($euiColorDanger) !default;
-$euiColorDisabledText: makeDisabledContrastColor($euiColorDisabled) !default;
-
-$euiColorTextPrimary: $euiColorPrimaryText !default;
-$euiColorTextAccent: $euiColorAccentText !default;
-$euiColorTextAccentSecondary: $euiColorSuccessText !default;
-$euiColorTextNeutral: makeHighContrastColor($euiColorSeverityNeutral) !default;
-$euiColorTextSuccess: $euiColorSuccessText !default;
-$euiColorTextWarning: $euiColorWarningText !default;
-$euiColorTextRisk: makeHighContrastColor($euiColorSeverityRisk) !default;
-$euiColorTextDanger: $euiColorDangerText !default;
-
-$euiLinkColor: $euiColorPrimaryText !default;
-
-// Borders
-$euiColorBorderBasePrimary: shade($euiColorPrimary, 0.6) !default;
-$euiColorBorderBaseAccent: shade($euiColorAccent, 0.6) !default;
-$euiColorBorderBaseAccentSecondary: shade($euiColorAccentSecondary, 0.6) !default;
-$euiColorBorderBaseNeutral: shade($euiColorSeverityNeutral, 0.6) !default;
-$euiColorBorderBaseSuccess: shade($euiColorSuccess, 0.6) !default;
-$euiColorBorderBaseWarning: shade($euiColorWarning, 0.6) !default;
-$euiColorBorderBaseRisk: shade($euiColorSeverityRisk, 0.6) !default;
-$euiColorBorderBaseDanger: shade($euiColorDanger, 0.6) !default;
-
-$euiColorBorderBasePlain: $euiColorLightShade !default;
-$euiColorBorderBaseSubdued: $euiColorLightShade !default;
-$euiColorBorderBaseDisabled: transparentize($euiColorGhost, 0.1) !default;
-$euiColorBorderBaseFloating: $euiColorLightShade !default;
-$euiColorBorderBaseFormsColorSwatch: transparentize($euiColorFullShade, 0.1) !default;
-$euiColorBorderBaseFormsControl: tint($euiColorLightestShade, 0.31) !default;
-
-$euiColorBorderInteractiveFormsHoverPlain: transparent !default;
-$euiColorBorderInteractiveFormsHoverDanger: transparent !default;
-
-$euiColorBorderStrongPrimary: $euiColorPrimary !default;
-$euiColorBorderStrongAccent: $euiColorAccent !default;
-$euiColorBorderStrongAccentSecondary: $euiColorAccentSecondary !default;
-$euiColorBorderStrongNeutral: $euiColorSeverityNeutral !default;
-$euiColorBorderStrongSuccess: $euiColorSuccess !default;
-$euiColorBorderStrongWarning: $euiColorWarning !default;
-$euiColorBorderStrongRisk: tint($euiColorSeverityRisk, 0.2) !default;
-$euiColorBorderStrongDanger: $euiColorDanger !default;
-$euiColorBorderStrongText: $euiColorDarkShade !default;
-
-// Charts
-$euiColorChartLines: $euiColorLightShade !default;
-$euiColorChartBand: tint($euiColorLightestShade, 2.5%) !default;
diff --git a/packages/eui/src/themes/amsterdam/_colors_light.scss b/packages/eui/src/themes/amsterdam/_colors_light.scss
deleted file mode 100644
index f4ed2f9d667..00000000000
--- a/packages/eui/src/themes/amsterdam/_colors_light.scss
+++ /dev/null
@@ -1,139 +0,0 @@
-// stylelint-disable color-no-hex
-
-// This extra import allows any variables that are created via functions to work when loaded into JS
-@import 'node_modules/@elastic/eui-theme-common/src/global_styling/functions/index';
-@import './global_styling/variables/colors_severity';
-
-// Constants
-$euiColorGhost: #FFF !default;
-$euiColorInk: #000 !default;
-
-$euiColorPlainLight: $euiColorGhost;
-$euiColorPlainDark: $euiColorInk;
-
-// Brand
-$euiColorPrimary: #07C !default;
-$euiColorAccent: #F04E98 !default;
-$euiColorAccentSecondary: #00BFB3 !default;
-$euiColorSuccess: #00BFB3 !default;
-$euiColorWarning: #FEC514 !default;
-$euiColorDanger: #BD271E !default;
-
-// Shades
-$euiColorEmptyShade: #FFF !default;
-$euiColorLightestShade: #F5F7FA !default;
-$euiColorLightShade: #D3DAE6 !default;
-$euiColorMediumShade: #98A2B3 !default;
-$euiColorDarkShade: #69707D !default;
-$euiColorDarkestShade: #343741 !default;
-$euiColorFullShade: #000 !default;
-
-// Backgrounds
-$euiPageBackgroundColor: tint($euiColorLightestShade, 50%) !default;
-$euiColorHighlight: tint($euiColorWarning, 90%) !default;
-
-$euiColorBackgroundBasePrimary: tint($euiColorPrimary, 90%) !default;
-$euiColorBackgroundBaseAccent: tint($euiColorAccent, 90%) !default;
-$euiColorBackgroundBaseAccentSecondary: tint($euiColorAccentSecondary, 90%) !default;
-$euiColorBackgroundBaseNeutral: tint($euiColorSeverityNeutral, 90%) !default;
-$euiColorBackgroundBaseSuccess: tint($euiColorSuccess, 90%) !default;
-$euiColorBackgroundBaseWarning: tint($euiColorWarning, 90%) !default;
-$euiColorBackgroundBaseRisk: tint($euiColorSeverityRisk, 90%) !default;
-$euiColorBackgroundBaseDanger: tint($euiColorDanger, 90%) !default;
-$euiColorBackgroundBaseSubdued: $euiPageBackgroundColor !default;
-$euiColorBackgroundBaseDisabled: transparentize($euiColorLightShade, 0.15) !default;
-$euiColorBackgroundBasePlain: $euiColorEmptyShade !default;
-$euiColorBackgroundBaseFormsPrepend: tint($euiColorLightShade, 0.5) !default;
-$euiColorBackgroundBaseFormsControlDisabled: $euiColorLightShade !default;
-
-$euiColorBackgroundBaseInteractiveHover: transparentize($euiColorLightShade, 0.2) !default;
-$euiColorBackgroundBaseInteractiveSelect: tint($euiColorPrimary, 0.96) !default;
-$euiColorBackgroundBaseInteractiveSelectHover: tint($euiColorPrimary, 0.8) !default;
-$euiColorBackgroundBaseInteractiveOverlay: transparentize($euiColorInk, 0.5) !default;
-$euiColorBackgroundBaseSkeletonEdge: tint($euiColorLightShade, 0.65) !default;
-$euiColorBackgroundBaseSkeletonMiddle: tint($euiColorLightShade, 0.8) !default;
-
-$euiColorBackgroundLightPrimary: tint($euiColorPrimary, 0.8) !default;
-$euiColorBackgroundLightAccent: tint($euiColorAccent, 0.8) !default;
-$euiColorBackgroundLightAccentSecondary: tint($euiColorAccentSecondary, 0.8)  !default;
-$euiColorBackgroundLightNeutral: tint($euiColorSeverityNeutral, 0.8) !default;
-$euiColorBackgroundLightSuccess: tint($euiColorSuccess, 0.8)  !default;
-$euiColorBackgroundLightWarning: tint($euiColorWarning, 0.8)  !default;
-$euiColorBackgroundLightRisk: tint($euiColorSeverityRisk, 0.8)  !default;
-$euiColorBackgroundLightDanger: tint($euiColorDanger, 0.8)  !default;
-$euiColorBackgroundLightText: tint($euiColorLightShade, 0.5) !default;
-
-$euiColorBackgroundFilledPrimary: $euiColorPrimary !default;
-$euiColorBackgroundFilledAccent: tint($euiColorAccent, 0.3) !default;
-$euiColorBackgroundFilledAccentSecondary: tint($euiColorAccentSecondary, 0.3) !default;
-$euiColorBackgroundFilledNeutral: $euiColorSeverityNeutral !default;
-$euiColorBackgroundFilledSuccess: tint($euiColorSuccess, 0.3) !default;
-$euiColorBackgroundFilledWarning: $euiColorWarning !default;
-$euiColorBackgroundFilledRisk: $euiColorSeverityRisk !default;
-$euiColorBackgroundFilledDanger: $euiColorDanger !default;
-$euiColorBackgroundFilledText: $euiColorDarkShade !default;
-
-// Texts
-$euiTextColor: $euiColorDarkestShade !default;
-$euiTitleColor: shade($euiTextColor, 50%) !default;
-$euiTextSubduedColor: $euiColorDarkShade !default;
-$euiColorDisabled: #ABB4C4 !default;
-
-$euiColorTextParagraph: $euiTextColor !default;
-$euiColorTextHeading: $euiTitleColor !default;
-$euiColorTextSubdued: $euiTextSubduedColor !default;
-$euiColorTextDisabled: #A2ABBA !default;
-$euiColorTextInverse: $euiColorGhost !default;
-
-// Brand texts
-$euiColorPrimaryText: makeHighContrastColor($euiColorPrimary) !default;
-$euiColorSuccessText: makeHighContrastColor($euiColorSuccess) !default;
-$euiColorAccentText: makeHighContrastColor($euiColorAccent) !default;
-$euiColorWarningText: makeHighContrastColor($euiColorWarning) !default;
-$euiColorDangerText: makeHighContrastColor($euiColorDanger) !default;
-$euiColorDisabledText: makeDisabledContrastColor($euiColorDisabled) !default;
-
-$euiColorTextPrimary: $euiColorPrimaryText !default;
-$euiColorTextAccent: $euiColorAccentText !default;
-$euiColorTextAccentSecondary: $euiColorSuccessText !default;
-$euiColorTextNeutral: makeHighContrastColor($euiColorSeverityNeutral) !default;
-$euiColorTextSuccess: $euiColorSuccessText !default;
-$euiColorTextWarning: $euiColorWarningText !default;
-$euiColorTextRisk: makeHighContrastColor($euiColorSeverityRisk) !default;
-$euiColorTextDanger: $euiColorDangerText !default;
-
-$euiLinkColor: $euiColorPrimaryText !default;
-
-// Borders
-$euiColorBorderBasePrimary: tint($euiColorPrimary, 0.6) !default;
-$euiColorBorderBaseAccent: tint($euiColorAccent, 0.6) !default;
-$euiColorBorderBaseAccentSecondary: tint($euiColorAccentSecondary, 0.6) !default;
-$euiColorBorderBaseNeutral: tint($euiColorSeverityNeutral, 0.6) !default;
-$euiColorBorderBaseSuccess: tint($euiColorSuccess, 0.6) !default;
-$euiColorBorderBaseWarning: tint($euiColorWarning, 0.6) !default;
-$euiColorBorderBaseRisk: tint($euiColorSeverityRisk, 0.6) !default;
-$euiColorBorderBaseDanger: tint($euiColorDanger, 0.6) !default;
-
-$euiColorBorderBasePlain: $euiColorLightShade !default;
-$euiColorBorderBaseSubdued: $euiColorLightShade !default;
-$euiColorBorderBaseDisabled: transparentize(darken($euiColorLightShade, 40%), 0.1) !default;
-$euiColorBorderBaseFloating: transparent !default;
-$euiColorBorderBaseFormsColorSwatch: transparentize($euiColorFullShade, 0.1) !default;
-$euiColorBorderBaseFormsControl: shade($euiColorLightestShade, 0.4) !default;
-
-$euiColorBorderInteractiveFormsHoverPlain: transparent !default;
-$euiColorBorderInteractiveFormsHoverDanger: transparent !default;
-
-$euiColorBorderStrongPrimary: $euiColorPrimary !default;
-$euiColorBorderStrongAccent: $euiColorAccent !default;
-$euiColorBorderStrongAccentSecondary: $euiColorAccentSecondary !default;
-$euiColorBorderStrongNeutral: shade($euiColorSeverityNeutral, 0.2) !default;
-$euiColorBorderStrongSuccess: $euiColorSuccess !default;
-$euiColorBorderStrongWarning: $euiColorWarning !default;
-$euiColorBorderStrongRisk: $euiColorSeverityRisk !default;
-$euiColorBorderStrongDanger: $euiColorDanger !default;
-$euiColorBorderStrongText: $euiColorDarkShade !default;
-
-// Charts
-$euiColorChartLines: shade($euiColorLightestShade, 3%) !default;
-$euiColorChartBand: $euiColorLightestShade !default;
diff --git a/packages/eui/src/themes/amsterdam/_globals.scss b/packages/eui/src/themes/amsterdam/_globals.scss
deleted file mode 100644
index 496a0212d28..00000000000
--- a/packages/eui/src/themes/amsterdam/_globals.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-// Helper file for supplying EUI Amsterdam globals (invisibles only)
-// Must be imported AFTER a colors modifier file
-
-// Functions need to be first, since we use them in our variables and mixin definitions
-@import '../../global_styling/functions/index';
-
-// Variables come next, and are used in some mixins
-@import 'global_styling/variables/index';
-
-// Mixins provide generic code expansion through helpers
-@import 'global_styling/mixins/index';
diff --git a/packages/eui/src/themes/amsterdam/global_styling/functions/index.ts b/packages/eui/src/themes/amsterdam/global_styling/functions/index.ts
deleted file mode 100644
index aa98697ba6d..00000000000
--- a/packages/eui/src/themes/amsterdam/global_styling/functions/index.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-export * from './shadows';
diff --git a/packages/eui/src/themes/amsterdam/global_styling/functions/shadows.ts b/packages/eui/src/themes/amsterdam/global_styling/functions/shadows.ts
deleted file mode 100644
index 157ce7f57bd..00000000000
--- a/packages/eui/src/themes/amsterdam/global_styling/functions/shadows.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-export { getShadowColor } from '@elastic/eui-theme-common';
diff --git a/packages/eui/src/themes/amsterdam/global_styling/index.scss b/packages/eui/src/themes/amsterdam/global_styling/index.scss
deleted file mode 100644
index 9ec41f68836..00000000000
--- a/packages/eui/src/themes/amsterdam/global_styling/index.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-// Core
-
-// Functions need to be first, since we use them in our variables and mixin definitions
-@import '../../../global_styling/functions/index';
-
-// Variables come next, and are used in some mixins
-@import 'variables/index';
-
-// Mixins provide generic code expansion through helpers
-@import 'mixins/index';
-
-// The reset file has moved to global_styles.tsx
diff --git a/packages/eui/src/themes/amsterdam/global_styling/mixins/_index.scss b/packages/eui/src/themes/amsterdam/global_styling/mixins/_index.scss
deleted file mode 100644
index d310ff95d5b..00000000000
--- a/packages/eui/src/themes/amsterdam/global_styling/mixins/_index.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-// Import base theme first, then override
-@import '../../../../global_styling/mixins/responsive';
-@import '../../../../global_styling/mixins/size';
-@import '../../../../global_styling/mixins/typography';
-@import 'typography';
-@import 'shadow';
-@import '../../../../global_styling/mixins/helpers';
-@import 'states';
-
-@import '../../../../global_styling/mixins/tool_tip'; // Needed by Elastic Charts
diff --git a/packages/eui/src/themes/amsterdam/global_styling/mixins/_shadow.scss b/packages/eui/src/themes/amsterdam/global_styling/mixins/_shadow.scss
deleted file mode 100644
index 71162d7978d..00000000000
--- a/packages/eui/src/themes/amsterdam/global_styling/mixins/_shadow.scss
+++ /dev/null
@@ -1,100 +0,0 @@
-@function shadowOpacity($opacity) {
-  @if (lightness($euiColorTextParagraph) < 50) {
-    @return $opacity * 1;
-  } @else {
-    @return $opacity * 2.5;
-  }
-}
-
-@mixin euiSlightShadow($color: $euiShadowColor) {
-  box-shadow:
-    0 .8px .8px rgba($color, shadowOpacity(.04)),
-    0 2.3px 2px rgba($color, shadowOpacity(.03));
-}
-
-@mixin euiBottomShadowSmall($color: $euiShadowColor) {
-  box-shadow:
-    0 .7px 1.4px rgba($color, shadowOpacity(.07)),
-    0 1.9px 4px rgba($color, shadowOpacity(.05)),
-    0 4.5px 10px rgba($color, shadowOpacity(.05));
-}
-
-@mixin euiBottomShadowMedium($color: $euiShadowColor) {
-  box-shadow:
-    0 .9px 4px -1px rgba($color, shadowOpacity(.08)),
-    0 2.6px 8px -1px rgba($color, shadowOpacity(.06)),
-    0 5.7px 12px -1px rgba($color, shadowOpacity(.05)),
-    0 15px 15px -1px rgba($color, shadowOpacity(.04));
-}
-
-// Similar to shadow medium but without the bottom depth. Useful for popovers
-// that drop UP rather than DOWN.
-@mixin euiBottomShadowFlat($color: $euiShadowColor) {
-  box-shadow:
-    0 0 .8px rgba($color, shadowOpacity(.06)),
-    0 0 2px rgba($color, shadowOpacity(.04)),
-    0 0 5px rgba($color, shadowOpacity(.04)),
-    0 0 17px rgba($color, shadowOpacity(.03));
-}
-
-@mixin euiBottomShadow($color: $euiShadowColor) {
-  box-shadow:
-    0 1px 5px rgba($color, shadowOpacity(.1)),
-    0 3.6px 13px rgba($color, shadowOpacity(.07)),
-    0 8.4px 23px rgba($color, shadowOpacity(.06)),
-    0 23px 35px rgba($color, shadowOpacity(.05));
-}
-
-@mixin euiBottomShadowLarge(
-  $color: $euiShadowColor,
-  $opacity: 0,
-  $reverse: false
-) {
-  @if ($reverse) {
-    box-shadow:
-      0 -2.7px 9px rgba($color, shadowOpacity(.13)),
-      0 -9.4px 24px rgba($color, shadowOpacity(.09)),
-      0 -21.8px 43px rgba($color, shadowOpacity(.08));
-  } @else {
-    box-shadow:
-      0 2.7px 9px rgba($color, shadowOpacity(.13)),
-      0 9.4px 24px rgba($color, shadowOpacity(.09)),
-      0 21.8px 43px rgba($color, shadowOpacity(.08));
-  }
-}
-
-// stylelint-disable color-named
-@mixin euiOverflowShadow($direction: 'y', $side: 'both') {
-  $hideHeight: $euiScrollBarCornerThin * 1.25;
-  $gradient: null;
-  $gradientStart:
-    transparentize(red, .9) 0%,
-    transparentize(red, 0) $hideHeight;
-  $gradientEnd:
-    transparentize(red, 0) calc(100% - #{$hideHeight}),
-    transparentize(red, .9) 100%;
-  @if ($side == 'both' or $side == 'start' or $side == 'end') {
-    @if ($side == 'both') {
-      $gradient: $gradientStart, $gradientEnd;
-    } @else if ($side == 'start') {
-      $gradient: $gradientStart;
-    } @else {
-      $gradient: $gradientEnd;
-    }
-  } @else {
-    @warn "euiOverflowShadow() expects side to be 'both', 'start' or 'end' but got '#{$side}'";
-  }
-
-  @if ($direction == 'y') {
-    mask-image: linear-gradient(to bottom, #{$gradient});
-  } @else if ($direction == 'x') {
-    mask-image: linear-gradient(to right, #{$gradient});
-  } @else {
-    @warn "euiOverflowShadow() expects direction to be 'y' or 'x' but got '#{$direction}'";
-  }
-
-  // Chrome+Edge has a very bizarre edge case bug where `mask-image` stops working
-  // This workaround forces a stacking context on the scrolling container, which
-  // hopefully addresses the bug. @see https://github.com/elastic/eui/pull/7855
-  transform: translateZ(0);
-}
diff --git a/packages/eui/src/themes/amsterdam/global_styling/mixins/_states.scss b/packages/eui/src/themes/amsterdam/global_styling/mixins/_states.scss
deleted file mode 100644
index d9b6b3957a5..00000000000
--- a/packages/eui/src/themes/amsterdam/global_styling/mixins/_states.scss
+++ /dev/null
@@ -1,41 +0,0 @@
-// In Amsterdam, focus rings default to the browser's `outline`
-// However, some components need to be forced to have the same behavior
-// This re-uses the same faux focus ring mixin, but adjusts the outline instead
-// @param {size} Old param from default theme that won't be used, so it should always be `null`
-// @param {offset} Accepts a specific number or 'inner' or 'outer' to adjust outline position
-// @param {includeFocusVisible} Allows turning off :not:focus-visible selector (which can interfere with some manual usages)
-@mixin euiFocusRing($size: null, $offset: false, $focusVisibleSelectors: true) {
-  // Safari & Firefox
-  outline: $euiFocusRingSize solid currentColor;
-
-  @if ($focusVisibleSelectors) {
-    // Chrome
-    &:focus-visible {
-      outline-style: auto;
-    }
-
-    &:not(:focus-visible) {
-      outline: none;
-    }
-  } @else {
-    outline-style: auto;
-  }
-
-  // Adjusting position with offset
-  @if (type-of($offset) == number) {
-    @if (unitless($offset)) {
-      outline-offset: #{$offset}px;
-    } @else {
-      outline-offset: #{$offset};
-    }
-  } @else if ($offset == 'inner') {
-    outline-offset: -$euiFocusRingSize;
-  } @else if ($offset == 'outer') {
-    outline-offset: $euiFocusRingSize;
-  }
-}
-
-// Amsterdam uses transparency instead of shading/tinting
-@mixin euiFocusBackground($color: $euiColorPrimary) {
-  background-color: transparentize($color, $euiFocusTransparency);
-}
diff --git a/packages/eui/src/themes/amsterdam/global_styling/mixins/_typography.scss b/packages/eui/src/themes/amsterdam/global_styling/mixins/_typography.scss
deleted file mode 100644
index 247a59fb9a5..00000000000
--- a/packages/eui/src/themes/amsterdam/global_styling/mixins/_typography.scss
+++ /dev/null
@@ -1,81 +0,0 @@
-// Font sizing extends, using rem mixin
-// All line-heights are aligned to baseline grid
-// stylelint-disable property-no-vendor-prefix
-
-@function fontSizeToRemOrEm($size, $sizingMethod: 'rem') {
-  @if ($sizingMethod == 'rem') {
-    @return #{$size / $euiFontSize}rem;
-  } @else if ($sizingMethod == 'em') {
-    @return #{$size / $euiFontSize}em;
-  }
-}
-
-@function marginToRemOrEm($elementSize, $elementFontSize, $sizingMethod: 'rem') {
-  @if ($sizingMethod == 'rem') {
-    @return #{$elementSize / $euiFontSize}rem;
-  } @else if ($sizingMethod == 'em') {
-    @return #{$elementSize / $elementFontSize}em;
-  }
-}
-
-// Spit out rem and px
-@mixin fontSize($size: $euiFontSize, $sizingMethod: 'rem') {
-  @if ($sizingMethod == 'rem') {
-    font-size: $size;
-    font-size: fontSizeToRemOrEm($size, 'rem');
-  } @else if ($sizingMethod == 'em') {
-    font-size: fontSizeToRemOrEm($size, 'em');
-  }
-}
-
-@mixin lineHeightFromBaseline($multiplier: 3) {
-  line-height: lineHeightFromBaseline($multiplier);
-}
-
-// Some mixins that help us deal with browser scaling of text more consistently.
-// Essentially, fonts across eui should scale against the root html element, not
-// against parent inheritance.
-
-// Redoing this mixin mainly to remove the letter-spacing
-@mixin euiFont {
-  font-family: $euiFontFamily;
-  font-weight: $euiFontWeightRegular;
-  letter-spacing: normal;
-  -webkit-text-size-adjust: 100%;
-  font-kerning: normal;
-}
-
-@mixin euiFontSizeXS {
-  @include fontSize($euiFontSizeXS);
-  @include lineHeightFromBaseline(2);
-}
-
-@mixin euiFontSizeS {
-  @include fontSize($euiFontSizeS);
-  @include lineHeightFromBaseline(3);
-}
-
-@mixin euiFontSize {
-  @include fontSize($euiFontSize);
-  @include lineHeightFromBaseline(3);
-}
-
-@mixin euiFontSizeM {
-  @include fontSize($euiFontSizeM);
-  @include lineHeightFromBaseline(3);
-}
-
-@mixin euiFontSizeL {
-  @include fontSize($euiFontSizeL);
-  @include lineHeightFromBaseline(4);
-}
-
-@mixin euiFontSizeXL {
-  @include fontSize($euiFontSizeXL);
-  @include lineHeightFromBaseline(4);
-}
-
-@mixin euiFontSizeXXL {
-  @include fontSize($euiFontSizeXXL);
-  @include lineHeightFromBaseline(5);
-}
diff --git a/packages/eui/src/themes/amsterdam/global_styling/mixins/button.ts b/packages/eui/src/themes/amsterdam/global_styling/mixins/button.ts
deleted file mode 100644
index b3cb74d53fb..00000000000
--- a/packages/eui/src/themes/amsterdam/global_styling/mixins/button.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-export {
-  type _EuiButtonColor,
-  type _EuiButtonDisplay,
-  type _EuiButtonOptions,
-  BUTTON_COLORS,
-  BUTTON_DISPLAYS,
-  euiButtonColor,
-  euiButtonFillColor,
-  euiButtonEmptyColor,
-  useEuiButtonColorCSS,
-  useEuiButtonFocusCSS,
-  euiButtonSizeMap,
-} from '../../../../global_styling/mixins/_button';
diff --git a/packages/eui/src/themes/amsterdam/global_styling/mixins/index.ts b/packages/eui/src/themes/amsterdam/global_styling/mixins/index.ts
deleted file mode 100644
index 3f06ac1e73d..00000000000
--- a/packages/eui/src/themes/amsterdam/global_styling/mixins/index.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-export * from './button';
-export * from './shadow';
diff --git a/packages/eui/src/themes/amsterdam/global_styling/mixins/shadow.ts b/packages/eui/src/themes/amsterdam/global_styling/mixins/shadow.ts
deleted file mode 100644
index 2f40036f905..00000000000
--- a/packages/eui/src/themes/amsterdam/global_styling/mixins/shadow.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-export * from '../../../../global_styling/mixins/_shadow';
diff --git a/packages/eui/src/themes/amsterdam/global_styling/variables/_animation.ts b/packages/eui/src/themes/amsterdam/global_styling/variables/_animation.ts
deleted file mode 100644
index 32b1f08479e..00000000000
--- a/packages/eui/src/themes/amsterdam/global_styling/variables/_animation.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import {
-  _EuiThemeAnimationSpeeds,
-  _EuiThemeAnimationEasings,
-  _EuiThemeAnimation,
-} from '../../../../global_styling/variables/animations';
-
-export const animation_speed: _EuiThemeAnimationSpeeds = {
-  extraFast: '90ms',
-  fast: '150ms',
-  normal: '250ms',
-  slow: '350ms',
-  extraSlow: '500ms',
-};
-
-export const animation_ease: _EuiThemeAnimationEasings = {
-  bounce: 'cubic-bezier(.34, 1.61, .7, 1)',
-  resistance: 'cubic-bezier(.694, .0482, .335, 1)',
-};
-
-export const animation: _EuiThemeAnimation = {
-  ...animation_speed,
-  ...animation_ease,
-};
diff --git a/packages/eui/src/themes/amsterdam/global_styling/variables/_borders.ts b/packages/eui/src/themes/amsterdam/global_styling/variables/_borders.ts
deleted file mode 100644
index 240ac938ec7..00000000000
--- a/packages/eui/src/themes/amsterdam/global_styling/variables/_borders.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import { _EuiThemeBorder } from '../../../../global_styling/variables';
-import { sizeToPixel } from '../../../../global_styling/functions';
-
-import { computed } from '../../../../services/theme/utils';
-
-export const border: _EuiThemeBorder = {
-  color: computed(
-    ([borderBaseSubdued]) => borderBaseSubdued,
-    ['colors.borderBaseSubdued']
-  ),
-  width: {
-    thin: '1px',
-    thick: '2px',
-  },
-  radius: {
-    medium: computed(sizeToPixel(0.375)),
-    small: computed(sizeToPixel(0.25)),
-  },
-  thin: computed(
-    ([width, color]) => `${width.thin} solid ${color}`,
-    ['border.width', 'border.color']
-  ),
-  thick: computed(
-    ([width, color]) => `${width.thick} solid ${color}`,
-    ['border.width', 'border.color']
-  ),
-  editable: computed(
-    ([width, color]) => `${width.thick} dotted ${color}`,
-    ['border.width', 'border.color']
-  ),
-};
diff --git a/packages/eui/src/themes/amsterdam/global_styling/variables/_breakpoint.ts b/packages/eui/src/themes/amsterdam/global_styling/variables/_breakpoint.ts
deleted file mode 100644
index 206a40c02bd..00000000000
--- a/packages/eui/src/themes/amsterdam/global_styling/variables/_breakpoint.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-export { breakpoint } from '@elastic/eui-theme-common';
diff --git a/packages/eui/src/themes/amsterdam/global_styling/variables/_buttons.ts b/packages/eui/src/themes/amsterdam/global_styling/variables/_buttons.ts
deleted file mode 100644
index 042dee05974..00000000000
--- a/packages/eui/src/themes/amsterdam/global_styling/variables/_buttons.ts
+++ /dev/null
@@ -1,422 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import { _EuiThemeButton, computed } from '@elastic/eui-theme-common';
-
-import { hexToRgb } from '../../../../services/color/hex_to_rgb';
-import { isColorDark } from '../../../../services/color/is_color_dark';
-import { tint, transparentize } from '../../../../services/color/manipulation';
-import { severityColors } from './_colors_severity';
-
-const isDark = (background: string) =>
-  background ? isColorDark(...hexToRgb(background)) : false;
-
-const _buttons = {
-  backgroundPrimary: computed(
-    ([backgroundLightPrimary]) => backgroundLightPrimary,
-    ['colors.backgroundLightPrimary']
-  ),
-  backgroundAccent: computed(
-    ([backgroundLightAccent]) => backgroundLightAccent,
-    ['colors.backgroundLightAccent']
-  ),
-  backgroundAccentSecondary: computed(
-    ([backgroundLightAccentSecondary]) => backgroundLightAccentSecondary,
-    ['colors.backgroundLightAccentSecondary']
-  ),
-  backgroundNeutral: computed(
-    ([backgroundLightNeutral]) => backgroundLightNeutral,
-    ['colors.backgroundLightNeutral']
-  ),
-  backgroundSuccess: computed(
-    ([backgroundLightSuccess]) => backgroundLightSuccess,
-    ['colors.backgroundLightSuccess']
-  ),
-  backgroundWarning: computed(
-    ([backgroundLightWarning]) => backgroundLightWarning,
-    ['colors.backgroundLightWarning']
-  ),
-  backgroundRisk: computed(
-    ([backgroundLightRisk]) => backgroundLightRisk,
-    ['colors.backgroundLightRisk']
-  ),
-  backgroundDanger: computed(
-    ([backgroundLightDanger]) => backgroundLightDanger,
-    ['colors.backgroundLightDanger']
-  ),
-  backgroundText: computed(
-    ([backgroundLightText]) => backgroundLightText,
-    ['colors.backgroundLightText']
-  ),
-  backgroundDisabled: computed(
-    ([lightShade]) => transparentize(lightShade, 0.15),
-    ['colors.lightShade']
-  ),
-
-  backgroundPrimaryHover: computed(
-    ([primary]) => transparentize(primary, 0.1),
-    ['colors.primary']
-  ),
-  backgroundAccentHover: computed(
-    ([accent]) => transparentize(accent, 0.1),
-    ['colors.accent']
-  ),
-  backgroundAccentSecondaryHover: computed(
-    ([success]) => transparentize(success, 0.1),
-    ['colors.success']
-  ),
-  backgroundNeutralHover: transparentize(severityColors.neutral, 0.1),
-  backgroundSuccessHover: computed(
-    ([success]) => transparentize(success, 0.1),
-    ['colors.success']
-  ),
-  backgroundWarningHover: computed(
-    ([warning]) => transparentize(warning, 0.1),
-    ['colors.warning']
-  ),
-  backgroundRiskHover: transparentize(severityColors.risk, 0.1),
-  backgroundDangerHover: computed(
-    ([danger]) => transparentize(danger, 0.1),
-    ['colors.danger']
-  ),
-  backgroundTextHover: computed(
-    ([lightShade]) => transparentize(lightShade, 0.2),
-    ['colors.lightShade']
-  ),
-
-  backgroundPrimaryActive: computed(
-    ([primary]) => transparentize(primary, 0.1),
-    ['colors.primary']
-  ),
-  backgroundAccentActive: computed(
-    ([accent]) => transparentize(accent, 0.1),
-    ['colors.accent']
-  ),
-  backgroundAccentSecondaryActive: computed(
-    ([success]) => transparentize(success, 0.1),
-    ['colors.success']
-  ),
-  backgroundNeutralActive: transparentize(severityColors.neutral, 0.1),
-  backgroundSuccessActive: computed(
-    ([success]) => transparentize(success, 0.1),
-    ['colors.success']
-  ),
-  backgroundWarningActive: computed(
-    ([warning]) => transparentize(warning, 0.1),
-    ['colors.warning']
-  ),
-  backgroundRiskActive: transparentize(severityColors.risk, 0.1),
-  backgroundDangerActive: computed(
-    ([danger]) => transparentize(danger, 0.1),
-    ['colors.danger']
-  ),
-  backgroundTextActive: computed(
-    ([lightShade]) => transparentize(lightShade, 0.2),
-    ['colors.lightShade']
-  ),
-
-  backgroundFilledPrimary: computed(
-    ([backgroundFilledPrimary]) => backgroundFilledPrimary,
-    ['colors.backgroundFilledPrimary']
-  ),
-  backgroundFilledAccent: computed(
-    ([backgroundFilledAccent]) => backgroundFilledAccent,
-    ['colors.backgroundFilledAccent']
-  ),
-  backgroundFilledAccentSecondary: computed(
-    ([backgroundFilledAccent]) => backgroundFilledAccent,
-    ['colors.backgroundFilledAccent']
-  ),
-  backgroundFilledNeutral: computed(
-    ([backgroundFilledNeutral]) => backgroundFilledNeutral,
-    ['colors.backgroundFilledNeutral']
-  ),
-  backgroundFilledSuccess: computed(
-    ([backgroundFilledSuccess]) => backgroundFilledSuccess,
-    ['colors.backgroundFilledSuccess']
-  ),
-  backgroundFilledWarning: computed(
-    ([backgroundFilledWarning]) => backgroundFilledWarning,
-    ['colors.backgroundFilledWarning']
-  ),
-  backgroundFilledRisk: computed(
-    ([backgroundFilledRisk]) => backgroundFilledRisk,
-    ['colors.backgroundFilledRisk']
-  ),
-  backgroundFilledDanger: computed(
-    ([backgroundFilledDanger]) => backgroundFilledDanger,
-    ['colors.backgroundFilledDanger']
-  ),
-  backgroundFilledText: computed(
-    ([backgroundFilledText]) => backgroundFilledText,
-    ['colors.backgroundFilledText']
-  ),
-  backgroundFilledDisabled: computed(
-    ([lightShade]) => transparentize(lightShade, 0.15),
-    ['colors.lightShade']
-  ),
-
-  backgroundFilledPrimaryHover: computed(
-    ([backgroundFilledPrimary]) => backgroundFilledPrimary,
-    ['components.buttons.backgroundFilledPrimary']
-  ),
-  backgroundFilledAccentHover: computed(
-    ([backgroundFilledPrimary]) => backgroundFilledPrimary,
-    ['components.buttons.backgroundFilledAccent']
-  ),
-  backgroundFilledAccentSecondaryHover: computed(
-    ([backgroundFilledPrimary]) => backgroundFilledPrimary,
-    ['components.buttons.backgroundFilledAccentSecondary']
-  ),
-  backgroundFilledNeutralHover: computed(
-    ([backgroundFilledNeutral]) => backgroundFilledNeutral,
-    ['components.buttons.backgroundFilledNeutral']
-  ),
-  backgroundFilledSuccessHover: computed(
-    ([backgroundFilledPrimary]) => backgroundFilledPrimary,
-    ['components.buttons.backgroundFilledSuccess']
-  ),
-  backgroundFilledWarningHover: computed(
-    ([backgroundFilledPrimary]) => backgroundFilledPrimary,
-    ['components.buttons.backgroundFilledWarning']
-  ),
-  backgroundFilledRiskHover: computed(
-    ([backgroundFilledRisk]) => backgroundFilledRisk,
-    ['components.buttons.backgroundFilledRisk']
-  ),
-  backgroundFilledDangerHover: computed(
-    ([backgroundFilledPrimary]) => backgroundFilledPrimary,
-    ['components.buttons.backgroundFilledDanger']
-  ),
-  backgroundFilledTextHover: computed(
-    ([backgroundFilledPrimary]) => backgroundFilledPrimary,
-    ['components.buttons.backgroundFilledText']
-  ),
-
-  backgroundFilledPrimaryActive: computed(
-    ([backgroundFilledPrimary]) => backgroundFilledPrimary,
-    ['components.buttons.backgroundFilledPrimary']
-  ),
-  backgroundFilledAccentActive: computed(
-    ([backgroundFilledPrimary]) => backgroundFilledPrimary,
-    ['components.buttons.backgroundFilledAccent']
-  ),
-  backgroundFilledAccentSecondaryActive: computed(
-    ([backgroundFilledPrimary]) => backgroundFilledPrimary,
-    ['components.buttons.backgroundFilledAccentSecondary']
-  ),
-  backgroundFilledNeutralActive: computed(
-    ([backgroundFilledNeutral]) => backgroundFilledNeutral,
-    ['components.buttons.backgroundFilledNeutral']
-  ),
-  backgroundFilledSuccessActive: computed(
-    ([backgroundFilledPrimary]) => backgroundFilledPrimary,
-    ['components.buttons.backgroundFilledSuccess']
-  ),
-  backgroundFilledWarningActive: computed(
-    ([backgroundFilledPrimary]) => backgroundFilledPrimary,
-    ['components.buttons.backgroundFilledWarning']
-  ),
-  backgroundFilledRiskActive: computed(
-    ([backgroundFilledRisk]) => backgroundFilledRisk,
-    ['components.buttons.backgroundFilledRisk']
-  ),
-  backgroundFilledDangerActive: computed(
-    ([backgroundFilledPrimary]) => backgroundFilledPrimary,
-    ['components.buttons.backgroundFilledDanger']
-  ),
-  backgroundFilledTextActive: computed(
-    ([backgroundFilledPrimary]) => backgroundFilledPrimary,
-    ['components.buttons.backgroundFilledText']
-  ),
-
-  backgroundEmptyPrimaryHover: computed(
-    ([primary]) => transparentize(primary, 0.1),
-    ['colors.primary']
-  ),
-  backgroundEmptyAccentHover: computed(
-    ([accent]) => transparentize(accent, 0.1),
-    ['colors.accent']
-  ),
-  backgroundEmptyAccentSecondaryHover: computed(
-    ([success]) => transparentize(success, 0.1),
-    ['colors.success']
-  ),
-  backgroundEmptyNeutralHover: transparentize(severityColors.neutral, 0.1),
-  backgroundEmptySuccessHover: computed(
-    ([success]) => transparentize(success, 0.1),
-    ['colors.success']
-  ),
-  backgroundEmptyWarningHover: computed(
-    ([warning]) => transparentize(warning, 0.1),
-    ['colors.warning']
-  ),
-  backgroundEmptyRiskHover: transparentize(severityColors.risk, 0.1),
-  backgroundEmptyDangerHover: computed(
-    ([danger]) => transparentize(danger, 0.1),
-    ['colors.danger']
-  ),
-  backgroundEmptyTextHover: computed(
-    ([lightShade]) => transparentize(lightShade, 0.2),
-    ['colors.lightShade']
-  ),
-
-  backgroundEmptyPrimaryActive: computed(
-    ([primary]) => transparentize(primary, 0.1),
-    ['colors.primary']
-  ),
-  backgroundEmptyAccentActive: computed(
-    ([accent]) => transparentize(accent, 0.1),
-    ['colors.accent']
-  ),
-  backgroundEmptyAccentSecondaryActive: computed(
-    ([success]) => transparentize(success, 0.1),
-    ['colors.success']
-  ),
-  backgroundEmptyNeutralActive: transparentize(severityColors.neutral, 0.1),
-  backgroundEmptySuccessActive: computed(
-    ([success]) => transparentize(success, 0.1),
-    ['colors.success']
-  ),
-  backgroundEmptyWarningActive: computed(
-    ([warning]) => transparentize(warning, 0.1),
-    ['colors.warning']
-  ),
-  backgroundEmptyRiskActive: transparentize(severityColors.risk, 0.1),
-  backgroundEmptyDangerActive: computed(
-    ([danger]) => transparentize(danger, 0.1),
-    ['colors.danger']
-  ),
-  backgroundEmptyTextActive: computed(
-    ([lightShade]) => transparentize(lightShade, 0.2),
-    ['colors.lightShade']
-  ),
-
-  textColorPrimary: computed(
-    ([primaryText]) => primaryText,
-    ['colors.primaryText']
-  ),
-  textColorAccent: computed(
-    ([accentText]) => accentText,
-    ['colors.accentText']
-  ),
-  textColorAccentSecondary: computed(
-    ([successText]) => successText,
-    ['colors.successText']
-  ),
-  textColorNeutral: computed(
-    ([textNeutral]) => textNeutral,
-    ['colors.textNeutral']
-  ),
-  textColorSuccess: computed(
-    ([successText]) => successText,
-    ['colors.successText']
-  ),
-  textColorWarning: computed(
-    ([warningText]) => warningText,
-    ['colors.warningText']
-  ),
-  textColorRisk: computed(([textRisk]) => textRisk, ['colors.textRisk']),
-  textColorDanger: computed(
-    ([dangerText]) => dangerText,
-    ['colors.dangerText']
-  ),
-  textColorText: computed(([text]) => text, ['colors.text']),
-  textColorDisabled: computed(
-    ([disabledText]) => disabledText,
-    ['colors.disabledText']
-  ),
-
-  textColorFilledPrimary: computed(
-    ([primary, ghost, ink]) => (isDark(primary) ? ghost : ink),
-    ['colors.primary', 'colors.ghost', 'colors.ink']
-  ),
-  textColorFilledAccent: computed(
-    ([accent, ghost, ink]) => (isDark(accent) ? ghost : ink),
-    ['colors.accent', 'colors.ghost', 'colors.ink']
-  ),
-  textColorFilledAccentSecondary: computed(
-    ([success, ghost, ink]) => {
-      const background = tint(success, 0.3);
-
-      return isDark(background) ? ghost : ink;
-    },
-    ['colors.success', 'colors.ghost', 'colors.ink']
-  ),
-  textColorFilledNeutral: computed(
-    ([ghost, ink]) => {
-      const background = tint(severityColors.neutral, 0.3);
-
-      return isDark(background) ? ghost : ink;
-    },
-    ['colors.ghost', 'colors.ink']
-  ),
-  textColorFilledSuccess: computed(
-    ([success, ghost, ink]) => {
-      const background = tint(success, 0.3);
-
-      return isDark(background) ? ghost : ink;
-    },
-    ['colors.success', 'colors.ghost', 'colors.ink']
-  ),
-  textColorFilledWarning: computed(
-    ([warning, ghost, ink]) => (isDark(warning) ? ghost : ink),
-    ['colors.warning', 'colors.ghost', 'colors.ink']
-  ),
-  textColorFilledRisk: computed(
-    ([ghost, ink]) => {
-      const background = tint(severityColors.risk, 0.3);
-
-      return isDark(background) ? ghost : ink;
-    },
-    ['colors.ghost', 'colors.ink']
-  ),
-  textColorFilledDanger: computed(
-    ([danger, ghost, ink]) => (isDark(danger) ? ghost : ink),
-    ['colors.danger', 'colors.ghost', 'colors.ink']
-  ),
-  textColorFilledText: computed(
-    ([darkShade, ghost, ink]) => (isDark(darkShade) ? ghost : ink),
-    ['colors.darkShade', 'colors.ghost', 'colors.ink']
-  ),
-  textColorFilledDisabled: computed(
-    ([disabledText]) => disabledText,
-    ['colors.disabledText']
-  ),
-};
-
-const _dark_buttons = {
-  ..._buttons,
-  backgroundFilledDisabled: computed(
-    ([lightShade]) => transparentize(lightShade, 0.15),
-    ['colors.lightShade']
-  ),
-
-  backgroundEmptyTextHover: computed(
-    ([lightShade]) => transparentize(lightShade, 0.4),
-    ['colors.lightShade']
-  ),
-
-  textColorFilledAccent: computed(
-    ([accent, ghost, ink]) => (isDark(accent) ? ghost : ink),
-    ['colors.accent', 'colors.ghost', 'colors.ink']
-  ),
-  textColorFilledSuccess: computed(
-    ([success, ghost, ink]) => (isDark(success) ? ghost : ink),
-    ['colors.success', 'colors.ghost', 'colors.ink']
-  ),
-  textColorFilledText: computed(
-    ([text, ghost, ink]) => (isDark(text) ? ghost : ink),
-    ['colors.text', 'colors.ghost', 'colors.ink']
-  ),
-};
-
-export const buttons: _EuiThemeButton = {
-  LIGHT: _buttons,
-  DARK: _dark_buttons,
-};
diff --git a/packages/eui/src/themes/amsterdam/global_styling/variables/_colors.ts b/packages/eui/src/themes/amsterdam/global_styling/variables/_colors.ts
deleted file mode 100644
index 2d5494a3321..00000000000
--- a/packages/eui/src/themes/amsterdam/global_styling/variables/_colors.ts
+++ /dev/null
@@ -1,631 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import {
-  _EuiThemeColors,
-  _EuiThemeBrandColors,
-  _EuiThemeBrandTextColors,
-  _EuiThemeShadeColors,
-  _EuiThemeSpecialColors,
-  _EuiThemeTextColors,
-  _EuiThemeColorsMode,
-  _EuiThemeBackgroundColors,
-  _EuiThemeBorderColors,
-  _EuiThemeTransparentBackgroundColors,
-} from '@elastic/eui-theme-common';
-
-import {
-  darken,
-  shade,
-  tint,
-  transparentize,
-} from '../../../../services/color/manipulation';
-import { computed } from '../../../../services/theme/utils';
-import {
-  makeHighContrastColor,
-  makeDisabledContrastColor,
-} from '../../../../services/color/contrast';
-import { colorVisLight } from './_colors_vis_light';
-import { colorVisDark } from './_colors_vis_dark';
-import { severityColors } from './_colors_severity';
-
-/*
- * LIGHT THEME
- * Only split up in the light theme to access the keys by section in the docs
- */
-
-export const brand_colors: _EuiThemeBrandColors = {
-  primary: '#0077CC',
-  accent: '#F04E98',
-  accentSecondary: '#00BFB3',
-  success: '#00BFB3',
-  warning: '#FEC514',
-  danger: '#BD271E',
-};
-
-export const brand_text_colors: _EuiThemeBrandTextColors = {
-  primaryText: computed(makeHighContrastColor('colors.primary')),
-  accentText: computed(makeHighContrastColor('colors.accent')),
-  successText: computed(makeHighContrastColor('colors.success')),
-  warningText: computed(makeHighContrastColor('colors.warning')),
-  dangerText: computed(makeHighContrastColor('colors.danger')),
-
-  textPrimary: computed(makeHighContrastColor('colors.primary')),
-  textAccent: computed(makeHighContrastColor('colors.accent')),
-  textAccentSecondary: computed(makeHighContrastColor('colors.success')),
-  textNeutral: computed(makeHighContrastColor(severityColors.neutral)),
-  textSuccess: computed(makeHighContrastColor('colors.success')),
-  textWarning: computed(makeHighContrastColor('colors.warning')),
-  textRisk: computed(makeHighContrastColor(severityColors.risk)),
-  textDanger: computed(makeHighContrastColor('colors.danger')),
-};
-
-export const shade_colors: _EuiThemeShadeColors = {
-  emptyShade: '#FFFFFF',
-  lightestShade: '#F1F4FA',
-  lightShade: '#D3DAE6',
-  mediumShade: '#98A2B3',
-  darkShade: '#69707D',
-  darkestShade: '#343741',
-  fullShade: '#000000',
-};
-
-export const special_colors: _EuiThemeSpecialColors = {
-  body: computed(
-    ([lightestShade]) => tint(lightestShade, 0.4),
-    ['colors.lightestShade']
-  ),
-  highlight: computed(([warning]) => tint(warning, 0.9), ['colors.warning']),
-  disabled: '#ABB4C4',
-  disabledText: computed(makeDisabledContrastColor('colors.disabled')),
-  shadow: computed(({ colors }) => colors.ink),
-};
-
-export const text_colors: _EuiThemeTextColors = {
-  text: computed(([darkestShade]) => darkestShade, ['colors.darkestShade']),
-  title: computed(([text]) => shade(text, 0.5), ['colors.text']),
-  subduedText: computed(makeHighContrastColor('colors.darkShade')),
-  link: computed(([primaryText]) => primaryText, ['colors.primaryText']),
-
-  textParagraph: computed(
-    ([darkestShade]) => darkestShade,
-    ['colors.darkestShade']
-  ),
-  textHeading: computed(([text]) => shade(text, 0.5), ['colors.text']),
-  textSubdued: computed(makeHighContrastColor('colors.darkShade')),
-  textDisabled: computed(makeDisabledContrastColor('colors.disabled')),
-  textInverse: computed(([ghost]) => ghost, ['colors.ghost']),
-};
-
-export const background_colors: _EuiThemeBackgroundColors = {
-  backgroundBasePrimary: computed(
-    ([primary]) => tint(primary, 0.9),
-    ['colors.primary']
-  ),
-  backgroundBaseAccent: computed(
-    ([accent]) => tint(accent, 0.9),
-    ['colors.accent']
-  ),
-  backgroundBaseAccentSecondary: computed(
-    ([success]) => tint(success, 0.9),
-    ['colors.success']
-  ),
-  backgroundBaseNeutral: tint(severityColors.neutral, 0.9),
-  backgroundBaseSuccess: computed(
-    ([success]) => tint(success, 0.9),
-    ['colors.success']
-  ),
-  backgroundBaseWarning: computed(
-    ([warning]) => tint(warning, 0.9),
-    ['colors.warning']
-  ),
-  backgroundBaseRisk: tint(severityColors.risk, 0.9),
-  backgroundBaseDanger: computed(
-    ([danger]) => tint(danger, 0.9),
-    ['colors.danger']
-  ),
-  backgroundBaseSubdued: computed(([body]) => body, ['colors.body']),
-  backgroundBaseDisabled: computed(
-    ([disabled]) => disabled,
-    ['colors.disabled']
-  ),
-  backgroundBaseHighlighted: computed(
-    ([backgroundBaseSubdued]) => backgroundBaseSubdued,
-    ['colors.backgroundBaseSubdued']
-  ),
-  backgroundBasePlain: computed(
-    ([emptyShade]) => emptyShade,
-    ['colors.emptyShade']
-  ),
-
-  backgroundBaseFormsPrepend: computed(
-    ([lightShade]) => tint(lightShade, 0.5),
-    ['colors.lightShade']
-  ),
-  backgroundBaseFormsControlDisabled: computed(
-    ([mediumShade]) => mediumShade,
-    ['colors.mediumShade']
-  ),
-
-  backgroundBaseInteractiveHover: computed(
-    ([lightShade]) => transparentize(lightShade, 0.2),
-    ['colors.lightShade']
-  ),
-  backgroundBaseInteractiveSelect: computed(
-    ([primary]) => tint(primary, 0.96),
-    ['colors.primary']
-  ),
-  backgroundBaseInteractiveSelectHover: computed(
-    ([primary]) => tint(primary, 0.8),
-    ['colors.primary']
-  ),
-  backgroundBaseInteractiveOverlay: computed(
-    ([ink]) => transparentize(ink, 0.5),
-    ['colors.ink']
-  ),
-  backgroundBaseSkeletonEdge: computed(
-    ([lightShade]) => tint(lightShade, 0.65),
-    ['colors.lightShade']
-  ),
-  backgroundBaseSkeletonMiddle: computed(
-    ([lightShade]) => tint(lightShade, 0.8),
-    ['colors.lightShade']
-  ),
-
-  backgroundLightPrimary: computed(
-    ([primary]) => tint(primary, 0.8),
-    ['colors.primary']
-  ),
-  backgroundLightAccent: computed(
-    ([accent]) => tint(accent, 0.8),
-    ['colors.accent']
-  ),
-  backgroundLightAccentSecondary: computed(
-    ([success]) => tint(success, 0.8),
-    ['colors.success']
-  ),
-  backgroundLightNeutral: tint(severityColors.neutral, 0.8),
-  backgroundLightSuccess: computed(
-    ([success]) => tint(success, 0.8),
-    ['colors.success']
-  ),
-  backgroundLightWarning: computed(
-    ([warning]) => tint(warning, 0.8),
-    ['colors.warning']
-  ),
-  backgroundLightRisk: tint(severityColors.risk, 0.8),
-  backgroundLightDanger: computed(
-    ([danger]) => tint(danger, 0.8),
-    ['colors.danger']
-  ),
-  backgroundLightText: computed(
-    ([lightShade]) => tint(lightShade, 0.5),
-    ['colors.lightShade']
-  ),
-
-  backgroundFilledPrimary: computed(([primary]) => primary, ['colors.primary']),
-  backgroundFilledAccent: computed(
-    ([accent]) => tint(accent, 0.3),
-    ['colors.accent']
-  ),
-  backgroundFilledAccentSecondary: computed(
-    ([success]) => tint(success, 0.3),
-    ['colors.success']
-  ),
-  backgroundFilledNeutral: severityColors.neutral,
-  backgroundFilledSuccess: computed(
-    ([success]) => tint(success, 0.3),
-    ['colors.success']
-  ),
-  backgroundFilledWarning: computed(([warning]) => warning, ['colors.warning']),
-  backgroundFilledRisk: severityColors.risk,
-  backgroundFilledDanger: computed(([danger]) => danger, ['colors.danger']),
-  backgroundFilledText: computed(
-    ([darkShade]) => darkShade,
-    ['colors.darkShade']
-  ),
-};
-
-export const transparent_background_colors: _EuiThemeTransparentBackgroundColors =
-  {
-    backgroundTransparent: 'transparent',
-    backgroundTransparentPrimary: computed(
-      ([primary]) => transparentize(primary, 0.1),
-      ['colors.primary']
-    ),
-    backgroundTransparentAccent: computed(
-      ([accent]) => transparentize(accent, 0.1),
-      ['colors.accent']
-    ),
-    backgroundTransparentAccentSecondary: computed(
-      ([success]) => transparentize(success, 0.1),
-      ['colors.success']
-    ),
-    backgroundTransparentNeutral: transparentize(severityColors.neutral, 0.1),
-    backgroundTransparentSuccess: computed(
-      ([success]) => transparentize(success, 0.1),
-      ['colors.success']
-    ),
-    backgroundTransparentWarning: computed(
-      ([warning]) => transparentize(warning, 0.1),
-      ['colors.warning']
-    ),
-    backgroundTransparentRisk: transparentize(severityColors.risk, 0.1),
-    backgroundTransparentDanger: computed(
-      ([danger]) => transparentize(danger, 0.1),
-      ['colors.danger']
-    ),
-    backgroundTransparentSubdued: computed(
-      ([lightShade]) => transparentize(lightShade, 0.2),
-      ['colors.lightShade']
-    ),
-    backgroundTransparentHighlighted: computed(
-      ([backgroundTransparentSubdued]) => backgroundTransparentSubdued,
-      ['colors.backgroundTransparentSubdued']
-    ),
-    backgroundTransparentPlain: computed(
-      ([ghost]) => transparentize(ghost, 0.2),
-      ['colors.ghost']
-    ),
-  };
-
-export const border_colors: _EuiThemeBorderColors = {
-  borderBasePrimary: computed(
-    ([primary]) => tint(primary, 0.6),
-    ['colors.primary']
-  ),
-  borderBaseAccent: computed(
-    ([accent]) => tint(accent, 0.6),
-    ['colors.accent']
-  ),
-  borderBaseAccentSecondary: computed(
-    ([success]) => tint(success, 0.6),
-    ['colors.success']
-  ),
-  borderBaseNeutral: tint(severityColors.neutral, 0.6),
-  borderBaseSuccess: computed(
-    ([success]) => tint(success, 0.6),
-    ['colors.success']
-  ),
-  borderBaseWarning: computed(
-    ([warning]) => tint(warning, 0.4),
-    ['colors.warning']
-  ),
-  borderBaseRisk: tint(severityColors.risk, 0.4),
-  borderBaseDanger: computed(
-    ([danger]) => tint(danger, 0.6),
-    ['colors.danger']
-  ),
-
-  borderBaseSubdued: computed(
-    ([lightShade]) => lightShade,
-    ['colors.lightShade']
-  ),
-  borderBaseDisabled: computed(
-    ([lightShade]) => transparentize(darken(lightShade, 0.4), 0.1),
-    ['colors.lightShade']
-  ),
-  borderBasePlain: computed(
-    ([lightShade]) => lightShade,
-    ['colors.lightShade']
-  ),
-  borderBaseFloating: 'transparent',
-
-  borderBaseFormsColorSwatch: computed(
-    ([fullShade]) => transparentize(fullShade, 0.1),
-    ['colors.fullShade']
-  ),
-  borderBaseFormsControl: computed(
-    ([lightestShade]) => shade(lightestShade, 0.4),
-    ['colors.lightestShade']
-  ),
-  borderInteractiveFormsHoverPlain: 'transparent',
-  borderInteractiveFormsHoverDanger: 'transparent',
-
-  borderStrongPrimary: computed(([primary]) => primary, ['colors.primary']),
-  borderStrongAccent: computed(([accent]) => accent, ['colors.accent']),
-  borderStrongAccentSecondary: computed(
-    ([accentSecondary]) => accentSecondary,
-    ['colors.accentSecondary']
-  ),
-  borderStrongNeutral: shade(severityColors.neutral, 0.2).toUpperCase(),
-  borderStrongSuccess: computed(([success]) => success, ['colors.success']),
-  borderStrongWarning: computed(([warning]) => warning, ['colors.warning']),
-  borderStrongRisk: severityColors.risk,
-  borderStrongDanger: computed(([danger]) => danger, ['colors.danger']),
-  borderStrongText: computed(([darkShade]) => darkShade, ['colors.darkShade']),
-};
-
-export const light_colors: _EuiThemeColorsMode = {
-  ...brand_colors,
-  ...shade_colors,
-  ...special_colors,
-  // Need to come after special colors so they can react to `body`
-  ...brand_text_colors,
-  ...text_colors,
-  ...background_colors,
-  ...transparent_background_colors,
-  ...border_colors,
-};
-
-/*
- * DARK THEME
- */
-
-export const dark_shades: _EuiThemeShadeColors = {
-  emptyShade: '#1D1E24',
-  lightestShade: '#25262E',
-  lightShade: '#343741',
-  mediumShade: '#535966',
-  darkShade: '#98A2B3',
-  darkestShade: '#D4DAE5',
-  fullShade: '#FFFFFF',
-};
-
-export const dark_background_colors: _EuiThemeBackgroundColors = {
-  backgroundBasePrimary: computed(
-    ([primary]) => shade(primary, 0.8),
-    ['colors.primary']
-  ),
-  backgroundBaseAccent: computed(
-    ([accent]) => shade(accent, 0.8),
-    ['colors.accent']
-  ),
-  backgroundBaseAccentSecondary: computed(
-    ([success]) => shade(success, 0.8),
-    ['colors.success']
-  ),
-  backgroundBaseNeutral: shade(severityColors.neutral, 0.8),
-  backgroundBaseSuccess: computed(
-    ([success]) => shade(success, 0.8),
-    ['colors.success']
-  ),
-  backgroundBaseWarning: computed(
-    ([warning]) => shade(warning, 0.8),
-    ['colors.warning']
-  ),
-  backgroundBaseRisk: shade(severityColors.risk, 0.8),
-  backgroundBaseDanger: computed(
-    ([danger]) => shade(danger, 0.8),
-    ['colors.danger']
-  ),
-  backgroundBaseSubdued: computed(([body]) => body, ['colors.body']),
-  backgroundBaseDisabled: computed(
-    ([disabled]) => disabled,
-    ['colors.disabled']
-  ),
-  backgroundBaseHighlighted: computed(
-    ([backgroundBaseSubdued]) => backgroundBaseSubdued,
-    ['colors.backgroundBaseSubdued']
-  ),
-  backgroundBasePlain: computed(
-    ([emptyShade]) => emptyShade,
-    ['colors.emptyShade']
-  ),
-
-  backgroundBaseFormsPrepend: computed(
-    ([lightShade]) => shade(lightShade, 0.15),
-    ['colors.lightShade']
-  ),
-  backgroundBaseFormsControlDisabled: computed(
-    ([mediumShade]) => mediumShade,
-    ['colors.mediumShade']
-  ),
-
-  backgroundBaseInteractiveHover: computed(
-    ([lightShade]) => transparentize(lightShade, 0.2),
-    ['colors.lightShade']
-  ),
-  backgroundBaseInteractiveSelect: computed(
-    ([primary]) => shade(primary, 0.7),
-    ['colors.primary']
-  ),
-  backgroundBaseInteractiveSelectHover: computed(
-    ([primary]) => shade(primary, 0.6),
-    ['colors.primary']
-  ),
-  backgroundBaseInteractiveOverlay: computed(
-    ([ink]) => transparentize(ink, 0.5),
-    ['colors.ink']
-  ),
-  backgroundBaseSkeletonEdge: computed(
-    ([lightShade]) => shade(lightShade, 0.12),
-    ['colors.lightShade']
-  ),
-  backgroundBaseSkeletonMiddle: computed(
-    ([lightShade]) => shade(lightShade, 0.24),
-    ['colors.lightShade']
-  ),
-
-  backgroundLightPrimary: computed(
-    ([primary]) => shade(primary, 0.7),
-    ['colors.primary']
-  ),
-  backgroundLightAccent: computed(
-    ([accent]) => shade(accent, 0.7),
-    ['colors.accent']
-  ),
-  backgroundLightAccentSecondary: computed(
-    ([success]) => shade(success, 0.7),
-    ['colors.success']
-  ),
-  backgroundLightNeutral: shade(severityColors.neutral, 0.7),
-  backgroundLightSuccess: computed(
-    ([success]) => shade(success, 0.7),
-    ['colors.success']
-  ),
-  backgroundLightWarning: computed(
-    ([warning]) => shade(warning, 0.7),
-    ['colors.warning']
-  ),
-  backgroundLightRisk: shade(severityColors.risk, 0.7),
-  backgroundLightDanger: computed(
-    ([danger]) => shade(danger, 0.7),
-    ['colors.danger']
-  ),
-  backgroundLightText: computed(
-    ([lightShade]) => shade(lightShade, 0.2),
-    ['colors.lightShade']
-  ),
-
-  backgroundFilledPrimary: computed(([primary]) => primary, ['colors.primary']),
-  backgroundFilledAccent: computed(([accent]) => accent, ['colors.accent']),
-  backgroundFilledAccentSecondary: computed(
-    ([success]) => success,
-    ['colors.success']
-  ),
-  backgroundFilledNeutral: severityColors.neutral,
-  backgroundFilledSuccess: computed(([success]) => success, ['colors.success']),
-  backgroundFilledWarning: computed(([warning]) => warning, ['colors.warning']),
-  backgroundFilledRisk: severityColors.risk,
-  backgroundFilledDanger: computed(([danger]) => danger, ['colors.danger']),
-  backgroundFilledText: computed(([text]) => text, ['colors.text']),
-};
-
-export const dark_transparent_background_colors: _EuiThemeTransparentBackgroundColors =
-  {
-    ...transparent_background_colors,
-    backgroundTransparentSubdued: computed(
-      ([lightShade]) => transparentize(lightShade, 0.4),
-      ['colors.lightShade']
-    ),
-    backgroundTransparentHighlighted: computed(
-      ([backgroundTransparentSubdued]) => backgroundTransparentSubdued,
-      ['colors.backgroundTransparentSubdued']
-    ),
-  };
-
-export const dark_border_colors: _EuiThemeBorderColors = {
-  borderBasePrimary: computed(
-    ([primary]) => shade(primary, 0.6),
-    ['colors.primary']
-  ),
-  borderBaseAccent: computed(
-    ([accent]) => shade(accent, 0.6),
-    ['colors.accent']
-  ),
-  borderBaseAccentSecondary: computed(
-    ([success]) => shade(success, 0.6),
-    ['colors.success']
-  ),
-  borderBaseNeutral: shade(severityColors.neutral, 0.6),
-  borderBaseSuccess: computed(
-    ([success]) => shade(success, 0.6),
-    ['colors.success']
-  ),
-  borderBaseWarning: computed(
-    ([warning]) => shade(warning, 0.4),
-    ['colors.warning']
-  ),
-  borderBaseRisk: shade(severityColors.risk, 0.4),
-  borderBaseDanger: computed(
-    ([danger]) => shade(danger, 0.6),
-    ['colors.danger']
-  ),
-
-  borderBaseSubdued: computed(
-    ([lightShade]) => lightShade,
-    ['colors.lightShade']
-  ),
-  borderBaseDisabled: computed(
-    ([ghost]) => transparentize(ghost, 0.1),
-    ['colors.ghost']
-  ),
-  borderBasePlain: computed(
-    ([lightShade]) => lightShade,
-    ['colors.lightShade']
-  ),
-  borderBaseFloating: 'transparent',
-
-  borderBaseFormsColorSwatch: computed(
-    ([fullShade]) => transparentize(fullShade, 0.1),
-    ['colors.fullShade']
-  ),
-  borderBaseFormsControl: computed(
-    ([lightestShade]) => tint(lightestShade, 0.31),
-    ['colors.lightestShade']
-  ),
-  borderInteractiveFormsHoverPlain: 'transparent',
-  borderInteractiveFormsHoverDanger: 'transparent',
-
-  borderStrongPrimary: computed(([primary]) => primary, ['colors.primary']),
-  borderStrongAccent: computed(([accent]) => accent, ['colors.accent']),
-  borderStrongAccentSecondary: computed(
-    ([accentSecondary]) => accentSecondary,
-    ['colors.accentSecondary']
-  ),
-  borderStrongNeutral: severityColors.neutral,
-  borderStrongSuccess: computed(([success]) => success, ['colors.success']),
-  borderStrongWarning: computed(([warning]) => warning, ['colors.warning']),
-  borderStrongRisk: tint(severityColors.risk, 0.2).toUpperCase(),
-  borderStrongDanger: computed(([danger]) => danger, ['colors.danger']),
-  borderStrongText: computed(([darkShade]) => darkShade, ['colors.darkShade']),
-};
-
-export const dark_colors_ams: _EuiThemeColorsMode = {
-  // Brand
-  primary: '#36A2EF',
-  accent: '#F68FBE',
-  accentSecondary: '#7DDED8',
-  success: '#7DDED8',
-  warning: '#F3D371',
-  danger: '#F86B63',
-
-  // Shades
-  ...dark_shades,
-
-  // Special
-  body: computed(
-    ([lightestShade]) => shade(lightestShade, 0.45),
-    ['colors.lightestShade']
-  ),
-  highlight: '#2E2D25',
-  disabled: '#515761',
-  disabledText: computed(makeDisabledContrastColor('colors.disabled')),
-  shadow: computed(({ colors }) => colors.ink),
-
-  // Need to come after special colors so they can react to `body`
-  ...brand_text_colors,
-
-  // Text
-  text: '#DFE5EF',
-  title: computed(([text]) => text, ['colors.text']),
-  subduedText: computed(makeHighContrastColor('colors.mediumShade')),
-  link: computed(([primaryText]) => primaryText, ['colors.primaryText']),
-
-  textParagraph: '#DFE5EF',
-  textHeading: computed(([text]) => text, ['colors.text']),
-  textSubdued: computed(makeHighContrastColor('colors.mediumShade')),
-  textDisabled: computed(makeDisabledContrastColor('colors.disabled')),
-  textInverse: computed(([ink]) => ink, ['colors.ink']),
-
-  ...dark_background_colors,
-  ...dark_transparent_background_colors,
-  ...dark_border_colors,
-};
-
-/*
- * FULL
- */
-
-export const colors: _EuiThemeColors = {
-  ghost: '#FFFFFF',
-  ink: '#000000',
-  plainLight: '#FFFFFF',
-  plainDark: '#000000',
-  LIGHT: {
-    ...light_colors,
-    vis: colorVisLight,
-    severity: severityColors,
-  },
-  DARK: {
-    ...dark_colors_ams,
-    vis: colorVisDark,
-    severity: severityColors,
-  },
-};
diff --git a/packages/eui/src/themes/amsterdam/global_styling/variables/_colors_severity.scss b/packages/eui/src/themes/amsterdam/global_styling/variables/_colors_severity.scss
deleted file mode 100644
index 679f1b9805a..00000000000
--- a/packages/eui/src/themes/amsterdam/global_styling/variables/_colors_severity.scss
+++ /dev/null
@@ -1,9 +0,0 @@
-// Severity colors
-// stylelint-disable color-no-hex
-
-$euiColorSeverityUnknown: #D3DAE6 !default;
-$euiColorSeverityNeutral: #BECFE3 !default;
-$euiColorSeveritySuccess: #54B399 !default;
-$euiColorSeverityWarning: #D6BF57 !default;
-$euiColorSeverityRisk: #DA8B45 !default;
-$euiColorSeverityDanger: #E7664C !default;
\ No newline at end of file
diff --git a/packages/eui/src/themes/amsterdam/global_styling/variables/_colors_severity.ts b/packages/eui/src/themes/amsterdam/global_styling/variables/_colors_severity.ts
deleted file mode 100644
index 423502a2099..00000000000
--- a/packages/eui/src/themes/amsterdam/global_styling/variables/_colors_severity.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-/**
- * These are not actually used, but we map them to ensure token parity.
- * They are mapped to other vis colors
- */
-export const severityColors = {
-  unknown: '#D3DAE6',
-  neutral: '#B9CFE3', // tint(euiColorVis1, 0.56)
-  success: '#54B399',
-  warning: '#D6BF57',
-  risk: '#DA8B45',
-  danger: '#E7664C',
-};
diff --git a/packages/eui/src/themes/amsterdam/global_styling/variables/_colors_vis.scss b/packages/eui/src/themes/amsterdam/global_styling/variables/_colors_vis.scss
deleted file mode 100644
index cfffdf5e55d..00000000000
--- a/packages/eui/src/themes/amsterdam/global_styling/variables/_colors_vis.scss
+++ /dev/null
@@ -1,72 +0,0 @@
-// Visualization colors
-// stylelint-disable color-no-hex
-
-// Maps allow for easier JSON usage
-// Use map_merge($euiColorVisColors, $yourMap) to change individual colors after importing ths file
-// The `behindText` variant is a direct copy of the hex output by the JS euiPaletteColorBlindBehindText() function
-$euiPaletteColorBlind: (
-  euiColorVis0: (
-    graphic: #54B399,
-    behindText: #6DCCB1,
-  ),
-  euiColorVis1: (
-    graphic: #6092C0,
-    behindText: #79AAD9,
-  ),
-  euiColorVis2: (
-    graphic: #D36086,
-    behindText: #EE789D,
-  ),
-  euiColorVis3: (
-    graphic: #9170B8,
-    behindText: #A987D1,
-  ),
-  euiColorVis4: (
-    graphic: #CA8EAE,
-    behindText: #E4A6C7,
-  ),
-  euiColorVis5: (
-    graphic: #D6BF57,
-    behindText: #F1D86F,
-  ),
-  euiColorVis6: (
-    graphic: #B9A888,
-    behindText: #D2C0A0,
-  ),
-  euiColorVis7: (
-    graphic: #DA8B45,
-    behindText: #F5A35C,
-  ),
-  euiColorVis8: (
-    graphic: #AA6556,
-    behindText: #C47C6C,
-  ),
-  euiColorVis9: (
-    graphic: #E7664C,
-    behindText: #FF7E62,
-  )
-) !default;
-
-$euiPaletteColorBlindKeys: map-keys($euiPaletteColorBlind);
-
-$euiColorVis0: map-get(map-get($euiPaletteColorBlind, 'euiColorVis0'), 'graphic') !default;
-$euiColorVis1: map-get(map-get($euiPaletteColorBlind, 'euiColorVis1'), 'graphic') !default;
-$euiColorVis2: map-get(map-get($euiPaletteColorBlind, 'euiColorVis2'), 'graphic') !default;
-$euiColorVis3: map-get(map-get($euiPaletteColorBlind, 'euiColorVis3'), 'graphic') !default;
-$euiColorVis4: map-get(map-get($euiPaletteColorBlind, 'euiColorVis4'), 'graphic') !default;
-$euiColorVis5: map-get(map-get($euiPaletteColorBlind, 'euiColorVis5'), 'graphic') !default;
-$euiColorVis6: map-get(map-get($euiPaletteColorBlind, 'euiColorVis6'), 'graphic') !default;
-$euiColorVis7: map-get(map-get($euiPaletteColorBlind, 'euiColorVis7'), 'graphic') !default;
-$euiColorVis8: map-get(map-get($euiPaletteColorBlind, 'euiColorVis8'), 'graphic') !default;
-$euiColorVis9: map-get(map-get($euiPaletteColorBlind, 'euiColorVis9'), 'graphic') !default;
-
-$euiColorVis0_behindText: map-get(map-get($euiPaletteColorBlind, 'euiColorVis0'), 'behindText') !default;
-$euiColorVis1_behindText: map-get(map-get($euiPaletteColorBlind, 'euiColorVis1'), 'behindText') !default;
-$euiColorVis2_behindText: map-get(map-get($euiPaletteColorBlind, 'euiColorVis2'), 'behindText') !default;
-$euiColorVis3_behindText: map-get(map-get($euiPaletteColorBlind, 'euiColorVis3'), 'behindText') !default;
-$euiColorVis4_behindText: map-get(map-get($euiPaletteColorBlind, 'euiColorVis4'), 'behindText') !default;
-$euiColorVis5_behindText: map-get(map-get($euiPaletteColorBlind, 'euiColorVis5'), 'behindText') !default;
-$euiColorVis6_behindText: map-get(map-get($euiPaletteColorBlind, 'euiColorVis6'), 'behindText') !default;
-$euiColorVis7_behindText: map-get(map-get($euiPaletteColorBlind, 'euiColorVis7'), 'behindText') !default;
-$euiColorVis8_behindText: map-get(map-get($euiPaletteColorBlind, 'euiColorVis8'), 'behindText') !default;
-$euiColorVis9_behindText: map-get(map-get($euiPaletteColorBlind, 'euiColorVis9'), 'behindText') !default;
diff --git a/packages/eui/src/themes/amsterdam/global_styling/variables/_colors_vis_dark.scss b/packages/eui/src/themes/amsterdam/global_styling/variables/_colors_vis_dark.scss
deleted file mode 100644
index 7dc10784890..00000000000
--- a/packages/eui/src/themes/amsterdam/global_styling/variables/_colors_vis_dark.scss
+++ /dev/null
@@ -1,14 +0,0 @@
-// stylelint-disable color-no-hex
-
-@import './colors_vis';
-
-$euiColorVisText0: #7DE2D1 !default;
-$euiColorVisText1: #1BA9F5 !default;
-$euiColorVisText2: #F990C0 !default;
-$euiColorVisText3: #BA9FDA !default;
-$euiColorVisText4: #E9B8D2 !default;
-$euiColorVisText5: #F4E08C !default;
-$euiColorVisText6: #DBCDB3 !default;
-$euiColorVisText7: #FFCE7A !default;
-$euiColorVisText8: #D09689 !default;
-$euiColorVisText9: #F66 !default;
\ No newline at end of file
diff --git a/packages/eui/src/themes/amsterdam/global_styling/variables/_colors_vis_dark.ts b/packages/eui/src/themes/amsterdam/global_styling/variables/_colors_vis_dark.ts
deleted file mode 100644
index 4e2a320d4fe..00000000000
--- a/packages/eui/src/themes/amsterdam/global_styling/variables/_colors_vis_dark.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import { _EuiThemeVisColors } from '@elastic/eui-theme-common';
-
-import { tint } from '../../../../services/color/manipulation';
-import { colorVisLight } from './_colors_vis_light';
-
-export const colorVisDark: _EuiThemeVisColors = {
-  ...colorVisLight,
-
-  euiColorVisText0: '#7DE2D1',
-  euiColorVisText1: '#1BA9F5',
-  euiColorVisText2: '#F990C0',
-  euiColorVisText3: tint(
-    colorVisLight.euiColorVisBehindText3,
-    0.2
-  ).toUpperCase(), // '#BA9FDA',
-  euiColorVisText4: tint(
-    colorVisLight.euiColorVisBehindText4,
-    0.2
-  ).toUpperCase(), // '#E9B8D2',
-  euiColorVisText5: tint(
-    colorVisLight.euiColorVisBehindText5,
-    0.2
-  ).toUpperCase(), // '#F4E08C',
-  euiColorVisText6: tint(
-    colorVisLight.euiColorVisBehindText6,
-    0.2
-  ).toUpperCase(), // '#DBCDB3',
-  euiColorVisText7: '#FFCE7A',
-  euiColorVisText8: tint(
-    colorVisLight.euiColorVisBehindText8,
-    0.2
-  ).toUpperCase(), // '#D09689',
-  euiColorVisText9: '#F66',
-};
diff --git a/packages/eui/src/themes/amsterdam/global_styling/variables/_colors_vis_light.scss b/packages/eui/src/themes/amsterdam/global_styling/variables/_colors_vis_light.scss
deleted file mode 100644
index b855792c63d..00000000000
--- a/packages/eui/src/themes/amsterdam/global_styling/variables/_colors_vis_light.scss
+++ /dev/null
@@ -1,14 +0,0 @@
-// stylelint-disable color-no-hex
-
-@import './colors_vis';
-
-$euiColorVisText0: #017D73 !default;
-$euiColorVisText1: #006BB4 !default;
-$euiColorVisText2: #DD0A73 !default;
-$euiColorVisText3: #745A93 !default;
-$euiColorVisText4: #A2728B !default;
-$euiColorVisText5: #AB9946 !default;
-$euiColorVisText6: #94866D !default;
-$euiColorVisText7: #F5A700 !default;
-$euiColorVisText8: #885145 !default;
-$euiColorVisText9: #BD271E !default;
\ No newline at end of file
diff --git a/packages/eui/src/themes/amsterdam/global_styling/variables/_colors_vis_light.ts b/packages/eui/src/themes/amsterdam/global_styling/variables/_colors_vis_light.ts
deleted file mode 100644
index 25e98f548e3..00000000000
--- a/packages/eui/src/themes/amsterdam/global_styling/variables/_colors_vis_light.ts
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import { _EuiThemeVisColors } from '@elastic/eui-theme-common';
-
-import { shade, tint } from '../../../../services/color/manipulation';
-
-/**
- * NOTE: These were quick conversions of their Sass counterparts.
- *       They have yet to be used/tested.
- * TODO: Make the graphic version available from `euiPaletteColorBlind()`
- */
-
-// Maps allow for easier JSON usage
-// Use map_merge(euiColorVisColors, $yourMap) to change individual colors after importing ths file
-// The `behindText` variant is a direct copy of the hex output by the JS euiPaletteColorBlindBehindText() function
-const euiPaletteColorBlind = {
-  euiColorVis0: {
-    graphic: '#54B399',
-    behindText: '#6DCCB1',
-  },
-  euiColorVis1: {
-    graphic: '#6092C0',
-    behindText: '#79AAD9',
-  },
-  euiColorVis2: {
-    graphic: '#D36086',
-    behindText: '#EE789D',
-  },
-  euiColorVis3: {
-    graphic: '#9170B8',
-    behindText: '#A987D1',
-  },
-  euiColorVis4: {
-    graphic: '#CA8EAE',
-    behindText: '#E4A6C7',
-  },
-  euiColorVis5: {
-    graphic: '#D6BF57',
-    behindText: '#F1D86F',
-  },
-  euiColorVis6: {
-    graphic: '#B9A888',
-    behindText: '#D2C0A0',
-  },
-  euiColorVis7: {
-    graphic: '#DA8B45',
-    behindText: '#F5A35C',
-  },
-  euiColorVis8: {
-    graphic: '#AA6556',
-    behindText: '#C47C6C',
-  },
-  euiColorVis9: {
-    graphic: '#E7664C',
-    behindText: '#FF7E62',
-  },
-};
-
-export const colorVisLight: _EuiThemeVisColors = {
-  euiColorVis0: euiPaletteColorBlind.euiColorVis0.graphic,
-  euiColorVis1: euiPaletteColorBlind.euiColorVis1.graphic,
-  euiColorVis2: euiPaletteColorBlind.euiColorVis2.graphic,
-  euiColorVis3: euiPaletteColorBlind.euiColorVis3.graphic,
-  euiColorVis4: euiPaletteColorBlind.euiColorVis4.graphic,
-  euiColorVis5: euiPaletteColorBlind.euiColorVis5.graphic,
-  euiColorVis6: euiPaletteColorBlind.euiColorVis6.graphic,
-  euiColorVis7: euiPaletteColorBlind.euiColorVis7.graphic,
-  euiColorVis8: euiPaletteColorBlind.euiColorVis8.graphic,
-  euiColorVis9: euiPaletteColorBlind.euiColorVis9.graphic,
-
-  /**
-   * behindText variables are temp tokens; used only during theme migration.
-   * TODO: remove once Amsterdam is fully migrated
-   */
-  euiColorVisBehindText0: euiPaletteColorBlind.euiColorVis0.behindText,
-  euiColorVisBehindText1: euiPaletteColorBlind.euiColorVis1.behindText,
-  euiColorVisBehindText2: euiPaletteColorBlind.euiColorVis2.behindText,
-  euiColorVisBehindText3: euiPaletteColorBlind.euiColorVis3.behindText,
-  euiColorVisBehindText4: euiPaletteColorBlind.euiColorVis4.behindText,
-  euiColorVisBehindText5: euiPaletteColorBlind.euiColorVis5.behindText,
-  euiColorVisBehindText6: euiPaletteColorBlind.euiColorVis6.behindText,
-  euiColorVisBehindText7: euiPaletteColorBlind.euiColorVis7.behindText,
-  euiColorVisBehindText8: euiPaletteColorBlind.euiColorVis8.behindText,
-  euiColorVisBehindText9: euiPaletteColorBlind.euiColorVis9.behindText,
-
-  euiColorVisText0: '#017D73',
-  euiColorVisText1: '#006BB4',
-  euiColorVisText2: '#DD0A73',
-  euiColorVisText3: shade(
-    euiPaletteColorBlind.euiColorVis3.graphic,
-    0.2
-  ).toUpperCase(), // #745A93
-  euiColorVisText4: shade(
-    euiPaletteColorBlind.euiColorVis4.graphic,
-    0.2
-  ).toUpperCase(), // #A2728B
-  euiColorVisText5: shade(
-    euiPaletteColorBlind.euiColorVis5.graphic,
-    0.2
-  ).toUpperCase(), // #AB9946
-  euiColorVisText6: shade(
-    euiPaletteColorBlind.euiColorVis6.graphic,
-    0.2
-  ).toUpperCase(), // #94866D
-  euiColorVisText7: '#F5A700',
-  euiColorVisText8: shade(
-    euiPaletteColorBlind.euiColorVis8.graphic,
-    0.2
-  ).toUpperCase(), // #885145
-  euiColorVisText9: '#BD271E',
-
-  euiColorVisNeutral0: tint(euiPaletteColorBlind.euiColorVis1.graphic, 0.3),
-  euiColorVisNeutral1: tint(euiPaletteColorBlind.euiColorVis1.graphic, 0.56),
-  euiColorVisSuccess0: '#209280',
-  euiColorVisSuccess1: euiPaletteColorBlind.euiColorVis0.graphic,
-  euiColorVisWarning0: shade(euiPaletteColorBlind.euiColorVis5.graphic, 0.15),
-  euiColorVisWarning1: euiPaletteColorBlind.euiColorVis5.graphic,
-  euiColorVisRisk0: euiPaletteColorBlind.euiColorVis7.graphic,
-  euiColorVisRisk1: tint(euiPaletteColorBlind.euiColorVis7.graphic, 0.5),
-  euiColorVisDanger0: '#CC5642',
-  euiColorVisDanger1: euiPaletteColorBlind.euiColorVis9.graphic,
-
-  euiColorVisBase0: '#FFFFFF',
-
-  euiColorVisGrey0: '#d3dae6',
-  euiColorVisGrey1: '#98a2b3',
-  euiColorVisGrey2: '#69707d',
-  euiColorVisGrey3: '#343741',
-
-  euiColorVisWarm0: '#FBFBDC',
-  euiColorVisWarm1: euiPaletteColorBlind.euiColorVis7.graphic,
-  euiColorVisWarm2: euiPaletteColorBlind.euiColorVis9.graphic,
-
-  euiColorVisCool0: '#EBEFF5',
-  euiColorVisCool1: euiPaletteColorBlind.euiColorVis1.graphic,
-  euiColorVisCool2: '#6092C0',
-
-  euiColorVisComplementary0: euiPaletteColorBlind.euiColorVis1.graphic,
-  euiColorVisComplementary1: euiPaletteColorBlind.euiColorVis7.graphic,
-};
diff --git a/packages/eui/src/themes/amsterdam/global_styling/variables/_components.ts b/packages/eui/src/themes/amsterdam/global_styling/variables/_components.ts
deleted file mode 100644
index d4ac080a3bd..00000000000
--- a/packages/eui/src/themes/amsterdam/global_styling/variables/_components.ts
+++ /dev/null
@@ -1,631 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import {
-  _EuiThemeComponentColors,
-  _EuiThemeComponents,
-} from '@elastic/eui-theme-common';
-
-import { computed } from '../../../../services/theme/utils';
-import {
-  shade,
-  tint,
-  transparentize,
-} from '../../../../services/color/manipulation';
-import { makeHighContrastColor } from '../../../../services/color/contrast';
-
-import { buttons } from './_buttons';
-import { forms } from './_forms';
-import { colorVisLight as colorVis } from './_colors_vis_light';
-
-const component_colors: _EuiThemeComponentColors = {
-  badgeBackground: computed(
-    ([lightShade]) => lightShade,
-    ['colors.lightShade']
-  ),
-  badgeBackgroundSubdued: computed(
-    ([lightShade]) => tint(lightShade, 0.3),
-    ['colors.lightShade']
-  ),
-  badgeBorderColorHollow: computed(([color]) => color, ['border.color']),
-  badgeIconButtonBackgroundHover: computed(
-    ([ghost]) => transparentize(ghost, 0.8),
-    ['colors.ghost']
-  ),
-
-  breadcrumbsApplicationBackground: computed(
-    ([darkestShade]) => tint(darkestShade, 0.85),
-    ['colors.darkestShade']
-  ),
-  breadcrumbsApplicationColor: computed(
-    ([darkestShade]) => tint(darkestShade, 0.2),
-    ['colors.darkestShade']
-  ),
-
-  buttonGroupBackgroundDisabledSelected: computed(
-    ([disabled]) => disabled,
-    ['colors.disabled']
-  ),
-  buttonGroupBorderColor: computed(
-    ([fullShade]) => transparentize(fullShade, 0.1),
-    ['colors.fullShade']
-  ),
-  buttonGroupBorderColorSelected: computed(
-    ([emptyShade]) => transparentize(emptyShade, 0.2),
-    ['colors.emptyShade']
-  ),
-  buttonGroupFocusColor: computed(
-    ([fullShade]) => fullShade,
-    ['colors.fullShade']
-  ),
-
-  bottomBarBackground: computed(
-    ([lightestShade]) => shade(lightestShade, 0.5),
-    ['colors.lightestShade']
-  ),
-
-  codeBackground: computed(
-    ([lightestShade]) => lightestShade,
-    ['colors.lightestShade']
-  ),
-  codeBackgroundSelected: 'inherit',
-  codeColor: computed(
-    ([lightestShade, text]) => makeHighContrastColor(text)(lightestShade),
-    ['colors.lightestShade', 'colors.text']
-  ),
-  codeInlineBackground: computed(
-    ([lightestShade]) => lightestShade,
-    ['colors.lightestShade']
-  ),
-  codeInlineColor: computed(
-    ([lightestShade]) =>
-      makeHighContrastColor(colorVis.euiColorVis3)(lightestShade),
-    ['colors.lightestShade']
-  ),
-  codeCommentColor: computed(
-    ([lightestShade, subduedText]) =>
-      makeHighContrastColor(subduedText)(lightestShade),
-    ['colors.lightestShade', 'colors.subduedText']
-  ),
-  codeSelectorColor: 'inherit',
-  codeStringColor: computed(
-    ([lightestShade]) =>
-      makeHighContrastColor(colorVis.euiColorVis2)(lightestShade),
-    ['colors.lightestShade']
-  ),
-  codeTagColor: computed(
-    ([lightestShade]) =>
-      makeHighContrastColor(colorVis.euiColorVis1)(lightestShade),
-    ['colors.lightestShade']
-  ),
-  codeNameColor: computed(
-    ([lightestShade]) =>
-      makeHighContrastColor(colorVis.euiColorVis1)(lightestShade),
-    ['colors.lightestShade']
-  ),
-  codeNumberColor: computed(
-    ([lightestShade]) =>
-      makeHighContrastColor(colorVis.euiColorVis0)(lightestShade),
-    ['colors.lightestShade']
-  ),
-  codeInlineCodeKeywordColor: computed(
-    ([lightestShade]) =>
-      makeHighContrastColor(colorVis.euiColorVis6)(lightestShade),
-    ['colors.lightestShade']
-  ),
-  codeKeywordColor: computed(
-    ([lightestShade]) =>
-      makeHighContrastColor(colorVis.euiColorVis3)(lightestShade),
-    ['colors.lightestShade']
-  ),
-  codeFunctionTitleColor: 'inherit',
-  codeTypeColor: computed(
-    ([lightestShade]) =>
-      makeHighContrastColor(colorVis.euiColorVis1)(lightestShade),
-    ['colors.lightestShade']
-  ),
-  codeAttributeColor: 'inherit',
-  codeSymbolColor: computed(
-    ([lightestShade]) =>
-      makeHighContrastColor(colorVis.euiColorVis9)(lightestShade),
-    ['colors.lightestShade']
-  ),
-  codeParamsColor: 'inherit',
-  codeMetaColor: computed(
-    ([lightestShade, subduedText]) =>
-      makeHighContrastColor(subduedText)(lightestShade),
-    ['colors.lightestShade', 'colors.subduedText']
-  ),
-  codeTitleColor: computed(
-    ([lightestShade]) =>
-      makeHighContrastColor(colorVis.euiColorVis7)(lightestShade),
-    ['colors.lightestShade']
-  ),
-  codeSectionColor: computed(
-    ([lightestShade]) =>
-      makeHighContrastColor(colorVis.euiColorVis9)(lightestShade),
-    ['colors.lightestShade']
-  ),
-  codeAdditionColor: computed(
-    ([lightestShade]) =>
-      makeHighContrastColor(colorVis.euiColorVis0)(lightestShade),
-    ['colors.lightestShade']
-  ),
-  codeDeletionColor: computed(
-    ([lightestShade, danger]) => makeHighContrastColor(danger)(lightestShade),
-    ['colors.lightestShade', 'colors.danger']
-  ),
-  codeSelectorClassColor: 'inherit',
-  codeSelectorIdColor: 'inherit',
-
-  collapsibleNavGroupBackground: computed(([body]) => body, ['colors.body']),
-  collapsibleNavGroupBackgroundDark: computed(
-    ([darkestShade]) => shade(darkestShade, 0.2),
-    ['colors.darkestShade']
-  ),
-
-  dataGridBorderColor: computed(([color]) => color, ['border.color']),
-  dataGridVerticalLineBorderColor: computed(
-    ([color]) => tint(color, 0.3),
-    ['border.color']
-  ),
-
-  dataGridRowBackground: computed(
-    ([emptyShade]) => emptyShade,
-    ['colors.emptyShade']
-  ),
-  dataGridRowBackgroundHover: computed(
-    ([highlight]) => highlight,
-    ['colors.highlight']
-  ),
-  dataGridRowBackgroundSelect: computed(
-    ([highlight]) => highlight,
-    ['colors.highlight']
-  ),
-  dataGridRowBackgroundSelectHover: computed(
-    ([highlight]) => highlight,
-    ['colors.highlight']
-  ),
-  dataGridRowBackgroundMarked: computed(
-    ([highlight]) => highlight,
-    ['colors.highlight']
-  ),
-  dataGridRowBackgroundMarkedHover: computed(
-    ([highlight]) => highlight,
-    ['colors.highlight']
-  ),
-  dataGridRowBorderActive: computed(
-    ([borderStrongPrimary]) => borderStrongPrimary,
-    ['colors.borderStrongPrimary']
-  ),
-  dataGridRowBorderHover: computed(
-    ([borderStrongText]) => borderStrongText,
-    ['colors.borderStrongText']
-  ),
-  dataGridRowBorderMarked: computed(
-    ([borderStrongPrimary]) => borderStrongPrimary,
-    ['colors.borderStrongPrimary']
-  ),
-  dataGridRowStripesBackground: computed(
-    ([emptyShade]) => emptyShade,
-    ['colors.emptyShade']
-  ),
-  dataGridRowStripesBackgroundHover: computed(
-    ([highlight]) => highlight,
-    ['colors.highlight']
-  ),
-  dataGridRowStripesBackgroundStriped: computed(
-    ([lightestShade]) => lightestShade,
-    ['colors.lightestShade']
-  ),
-  dataGridRowStripesBackgroundStripedHover: computed(
-    ([highlight]) => highlight,
-    ['colors.highlight']
-  ),
-  dataGridRowStripesBackgroundSelect: computed(
-    ([highlight]) => highlight,
-    ['colors.highlight']
-  ),
-  dataGridRowStripesBackgroundSelectHover: computed(
-    ([highlight]) => highlight,
-    ['colors.highlight']
-  ),
-
-  dragDropDraggingBackground: computed(
-    ([success]) => transparentize(success, 0.1),
-    ['colors.success']
-  ),
-  dragDropDraggingOverBackground: computed(
-    ([success]) => transparentize(success, 0.25),
-    ['colors.success']
-  ),
-
-  filterButtonBadgeBackgroundHover: computed(
-    ([lightShade]) => tint(lightShade, 0.3),
-    ['colors.lightShade']
-  ),
-
-  filterSelectItemBackgroundFocusDisabled: computed(
-    ([disabled]) => transparentize(disabled, 0.1),
-    ['colors.disabled']
-  ),
-
-  flyoutFooterBackground: computed(
-    ([lightestShade]) => lightestShade,
-    ['colors.lightestShade']
-  ),
-  flyoutCloseButtonInsideBackground: computed(
-    ([emptyShade]) => transparentize(emptyShade, 0.9),
-    ['colors.emptyShade']
-  ),
-
-  headerBackground: computed(
-    ([emptyShade]) => emptyShade,
-    ['colors.emptyShade']
-  ),
-  headerDarkBackground: computed(
-    ([darkestShade]) => shade(darkestShade, 0.28),
-    ['colors.darkestShade']
-  ),
-  headerDarkSearchBorderColor: computed(
-    ([ghost]) => transparentize(ghost, 0.3),
-    ['colors.ghost']
-  ),
-  headerDarkSectionItemBackgroundFocus: computed(
-    ([primary]) => shade(primary, 0.5),
-    ['colors.primary']
-  ),
-
-  keyPadMenuItemBackgroundDisabledSelect: computed(
-    ([disabled]) => transparentize(disabled, 0.1),
-    ['colors.disabled']
-  ),
-
-  listGroupItemBackgroundPrimaryActive: computed(
-    ([lightShade]) => transparentize(lightShade, 0.2),
-    ['colors.lightShade']
-  ),
-  listGroupItemBackgroundSubduedActive: computed(
-    ([primary]) => transparentize(primary, 0.1),
-    ['colors.primary']
-  ),
-  listGroupItemBackgroundHover: computed(
-    ([lightShade]) => transparentize(lightShade, 0.2),
-    ['colors.lightShade']
-  ),
-  listGroupItemBackgroundPrimaryHover: computed(
-    ([primary]) => transparentize(primary, 0.1),
-    ['colors.primary']
-  ),
-
-  loadingSpinnerBorder: computed(
-    ([lightShade]) => lightShade,
-    ['colors.lightShade']
-  ),
-  loadingSpinnerHighlight: computed(([primary]) => primary, ['colors.primary']),
-
-  loadingChartMonoBackground0: computed(
-    ([lightShade]) => lightShade,
-    ['colors.lightShade']
-  ),
-  loadingChartMonoBackground1: computed(
-    ([lightShade]) => shade(lightShade, 0.04),
-    ['colors.lightShade']
-  ),
-  loadingChartMonoBackground2: computed(
-    ([lightShade]) => shade(lightShade, 0.08),
-    ['colors.lightShade']
-  ),
-  loadingChartMonoBackground3: computed(
-    ([lightShade]) => shade(lightShade, 0.12),
-    ['colors.lightShade']
-  ),
-
-  markBackground: computed(
-    ([primary]) => transparentize(primary, 0.1),
-    ['colors.primary']
-  ),
-
-  markdownFormatTableBorderColor: computed(
-    ([fullShade]) => transparentize(fullShade, 0.15),
-    ['colors.fullShade']
-  ),
-
-  overlayMaskBackground: computed(
-    ([backgroundBaseInteractiveOverlay]) => backgroundBaseInteractiveOverlay,
-    ['colors.backgroundBaseInteractiveOverlay']
-  ),
-  overlayMaskBackgroundHighContrast: computed(
-    ([ink]) => transparentize(ink, 0.85),
-    ['colors.ink']
-  ),
-
-  popoverPanelBackground: computed(
-    ([emptyShade]) => emptyShade,
-    ['colors.emptyShade']
-  ),
-  popoverFooterBorderColor: computed(([color]) => color, ['border.color']),
-
-  scrollbarTrackColor: computed(([body]) => shade(body, 0.03), ['colors.body']),
-
-  sideNavItemEmphasizedBackground: computed(
-    ([lightShade]) => transparentize(lightShade, 0.3),
-    ['colors.lightShade']
-  ),
-
-  selectableListItemBorderColor: computed(
-    ([color]) => transparentize(color, 0.4),
-    ['border.color']
-  ),
-
-  skeletonBackgroundSkeletonMiddleHighContrast: computed(
-    ([emptyShade]) => emptyShade,
-    ['colors.emptyShade']
-  ),
-
-  superDatePickerBackgroundSuccees: computed(
-    ([success]) => tint(success, 0.9),
-    ['colors.success']
-  ),
-
-  switchBackgroundOn: computed(([primary]) => primary, ['colors.primary']),
-  switchBackgroundOff: computed(
-    ([lightestShade]) => shade(lightestShade, 0.4),
-    ['colors.lightestShade']
-  ),
-  switchUncompressedBackgroundDisabled: computed(
-    ([lightShade]) => tint(lightShade, 0.5),
-    ['colors.lightShade']
-  ),
-  switchCompressedBackgroundDisabled: computed(
-    ([lightShade]) => tint(lightShade, 0.25),
-    ['colors.lightShade']
-  ),
-  switchMiniBackgroundDisabled: computed(
-    ([lightShade]) => tint(lightShade, 0),
-    ['colors.lightShade']
-  ),
-  switchThumbBackgroundDisabled: 'transparent',
-  switchThumbBorderOn: computed(
-    ([lightestShade]) => shade(lightestShade, 0.4),
-    ['colors.lightestShade']
-  ),
-  switchThumbBorderOff: computed(
-    ([lightestShade]) => shade(lightestShade, 0.4),
-    ['colors.lightestShade']
-  ),
-  switchIconDisabled: computed(
-    ([lightestShade]) => shade(lightestShade, 0.4),
-    ['colors.lightestShade']
-  ),
-
-  tableRowBackgroundHover: computed(
-    ([lightestShade]) => tint(lightestShade, 0.5),
-    ['colors.lightestShade']
-  ),
-  tableRowBackgroundSelected: computed(
-    ([primary]) => tint(primary, 0.96),
-    ['colors.primary']
-  ),
-  tableRowBackgroundSelectedHover: computed(
-    ([primary]) => tint(primary, 0.9),
-    ['colors.primary']
-  ),
-  tableRowInteractiveBackgroundHover: computed(
-    ([primary]) => transparentize(primary, 0.05),
-    ['colors.primary']
-  ),
-  tableRowInteractiveBackgroundFocus: computed(
-    ([primary]) => transparentize(primary, 0.1),
-    ['colors.primary']
-  ),
-  tableRowBackgroundMarked: computed(
-    ([highlight]) => highlight,
-    ['colors.highlight']
-  ),
-  tableRowBackgroundMarkedHover: computed(
-    ([highlight]) => highlight,
-    ['colors.highlight']
-  ),
-  tableCellSortableIconColor: computed(
-    ([emptyShade, subduedText]) => {
-      const color = tint(subduedText, 0.9);
-      return makeHighContrastColor(
-        // Tint it arbitrarily high, the contrast util will take care of lowering back down to WCAG
-        color,
-        3 // 3:1 ratio from https://www.w3.org/WAI/WCAG22/Understanding/non-text-contrast.html
-      )(emptyShade);
-    },
-    ['colors.emptyShade', 'colors.subduedText']
-  ),
-
-  tooltipBackground: computed(
-    ([fullShade]) => tint(fullShade, 0.25),
-    ['colors.fullShade']
-  ),
-  tooltipBorder: computed(
-    ([fullShade]) => tint(fullShade, 0.35),
-    ['colors.fullShade']
-  ),
-  tooltipBorderFloating: computed(
-    ([borderBaseFloating]) => borderBaseFloating,
-    ['colors.borderBaseFloating']
-  ),
-
-  tourFooterBackground: computed(
-    ([lightestShade]) => tint(lightestShade, 0.5),
-    ['colors.lightestShade']
-  ),
-
-  treeViewItemBackgroundHover: computed(
-    ([text]) => transparentize(text, 0.1),
-    ['colors.text']
-  ),
-};
-
-export const components: _EuiThemeComponents = {
-  buttons,
-  forms,
-  LIGHT: component_colors,
-  DARK: {
-    ...component_colors,
-
-    badgeBorderColorHollow: computed(
-      ([color]) => tint(color, 0.15),
-      ['border.color']
-    ),
-
-    breadcrumbsApplicationBackground: computed(
-      ([darkestShade]) => shade(darkestShade, 0.7),
-      ['colors.darkestShade']
-    ),
-    breadcrumbsApplicationColor: computed(
-      ([darkestShade]) => shade(darkestShade, 0.2),
-      ['colors.darkestShade']
-    ),
-
-    collapsibleNavGroupBackground: computed(
-      ([lightestShade]) => shade(lightestShade, 0.5),
-      ['colors.lightestShade']
-    ),
-    collapsibleNavGroupBackgroundDark: computed(
-      ([lightestShade]) => shade(lightestShade, 0.5),
-      ['colors.lightestShade']
-    ),
-
-    dataGridVerticalLineBorderColor: computed(
-      ([color]) => shade(color, 0.3),
-      ['border.color']
-    ),
-
-    headerDarkBackground: computed(
-      ([lightestShade]) => shade(lightestShade, 0.5),
-      ['colors.lightestShade']
-    ),
-
-    keyPadMenuItemBackgroundDisabledSelect: computed(
-      ([disabled]) => transparentize(disabled, 0.2),
-      ['colors.disabled']
-    ),
-
-    listGroupItemBackgroundSubduedActive: computed(
-      ([lightShade]) => transparentize(lightShade, 0.4),
-      ['colors.lightShade']
-    ),
-
-    loadingChartMonoBackground0: computed(
-      ([lightShade]) => lightShade,
-      ['colors.lightShade']
-    ),
-    loadingChartMonoBackground1: computed(
-      ([lightShade]) => tint(lightShade, 0.04),
-      ['colors.lightShade']
-    ),
-    loadingChartMonoBackground2: computed(
-      ([lightShade]) => tint(lightShade, 0.08),
-      ['colors.lightShade']
-    ),
-    loadingChartMonoBackground3: computed(
-      ([lightShade]) => tint(lightShade, 0.12),
-      ['colors.lightShade']
-    ),
-
-    markBackground: computed(
-      ([primary]) => transparentize(primary, 0.3),
-      ['colors.primary']
-    ),
-
-    popoverPanelBackground: computed(
-      ([emptyShade]) => tint(emptyShade, 0.025),
-      ['colors.emptyShade']
-    ),
-
-    scrollbarTrackColor: computed(
-      ([body]) => tint(body, 0.07),
-      ['colors.body']
-    ),
-
-    skeletonBackgroundSkeletonMiddleHighContrast: computed(
-      ([lightShade]) => tint(lightShade, 0.12),
-      ['colors.lightShade']
-    ),
-
-    superDatePickerBackgroundSuccees: computed(
-      ([success]) => shade(success, 0.7),
-      ['colors.success']
-    ),
-
-    switchBackgroundOff: computed(
-      ([lightestShade]) => tint(lightestShade, 0.31),
-      ['colors.lightestShade']
-    ),
-    switchUncompressedBackgroundDisabled: computed(
-      ([lightShade]) => lightShade,
-      ['colors.lightShade']
-    ),
-    switchCompressedBackgroundDisabled: computed(
-      ([lightShade]) => lightShade,
-      ['colors.lightShade']
-    ),
-    switchMiniBackgroundDisabled: computed(
-      ([lightShade]) => lightShade,
-      ['colors.lightShade']
-    ),
-    switchThumbBorderOn: computed(
-      ([lightestShade]) => tint(lightestShade, 0.31),
-      ['colors.lightestShade']
-    ),
-    switchThumbBorderOff: computed(
-      ([lightestShade]) => tint(lightestShade, 0.31),
-      ['colors.lightestShade']
-    ),
-    switchIconDisabled: computed(
-      ([lightestShade]) => tint(lightestShade, 0.31),
-      ['colors.lightestShade']
-    ),
-
-    tableRowBackgroundHover: computed(
-      ([lightestShade]) => lightestShade,
-      ['colors.lightestShade']
-    ),
-    tableRowBackgroundSelected: computed(
-      ([primary]) => shade(primary, 0.7),
-      ['colors.primary']
-    ),
-    tableRowBackgroundSelectedHover: computed(
-      ([primary]) => shade(primary, 0.75),
-      ['colors.primary']
-    ),
-    tableCellSortableIconColor: computed(
-      ([emptyShade, subduedText]) => {
-        const color = shade(subduedText, 0.9);
-        return makeHighContrastColor(color, 3)(emptyShade);
-      },
-      ['colors.emptyShade', 'colors.subduedText']
-    ),
-
-    tooltipBackground: computed(
-      ([emptyShade]) => shade(emptyShade, 1),
-      ['colors.emptyShade']
-    ),
-    tooltipBorder: computed(
-      ([fullShade]) => shade(fullShade, 0.8),
-      ['colors.fullShade']
-    ),
-
-    tourFooterBackground: computed(
-      ([lightestShade]) => shade(lightestShade, 0.45),
-      ['colors.lightestShade']
-    ),
-
-    treeViewItemBackgroundHover: computed(
-      ([text]) => transparentize(text, 0.2),
-      ['colors.text']
-    ),
-  },
-};
diff --git a/packages/eui/src/themes/amsterdam/global_styling/variables/_forms.scss b/packages/eui/src/themes/amsterdam/global_styling/variables/_forms.scss
deleted file mode 100644
index 3d8674cb568..00000000000
--- a/packages/eui/src/themes/amsterdam/global_styling/variables/_forms.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-// Coloring
-$euiFormBackgroundColor: tintOrShade($euiColorLightestShade, 60%, 40%) !default;
-$euiFormBackgroundDisabledColor: darken($euiColorLightestShade, 2%) !default;
-$euiFormBackgroundReadOnlyColor: $euiColorEmptyShade !default;
-$euiFormBorderOpaqueColor: shadeOrTint(desaturate(adjust-hue($euiColorPrimary, 22), 22.95), 26%, 100%) !default;
-$euiFormBorderColor: transparentize($euiFormBorderOpaqueColor, .9) !default;
-$euiFormBorderDisabledColor: transparentize($euiFormBorderOpaqueColor, .9) !default;
-$euiFormControlDisabledColor: $euiColorMediumShade !default;
-$euiFormControlBoxShadow: 0 0 transparent !default;
-$euiFormControlPlaceholderText: makeHighContrastColor($euiTextSubduedColor, $euiFormBackgroundColor) !default;
-$euiFormInputGroupLabelBackground: tintOrShade($euiColorLightShade, 50%, 15%) !default;
-$euiFormInputGroupBorder: none !default;
\ No newline at end of file
diff --git a/packages/eui/src/themes/amsterdam/global_styling/variables/_forms.ts b/packages/eui/src/themes/amsterdam/global_styling/variables/_forms.ts
deleted file mode 100644
index 1840bda557b..00000000000
--- a/packages/eui/src/themes/amsterdam/global_styling/variables/_forms.ts
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import { mathWithUnits } from '@elastic/eui-theme-common';
-
-import { computed } from '../../../../services/theme/utils';
-import {
-  darken,
-  shade,
-  tint,
-  transparentize,
-} from '../../../../services/color/manipulation';
-
-const _forms = {
-  background: computed(
-    ([lightestShade]) => tint(lightestShade, 0.6),
-    ['colors.lightestShade']
-  ),
-  backgroundDisabled: computed(
-    ([lightestShade]) => darken(lightestShade, 0.05),
-    ['colors.lightestShade']
-  ),
-  backgroundReadOnly: computed(
-    ([emptyShade]) => emptyShade,
-    ['colors.emptyShade']
-  ),
-  backgroundFocused: computed(
-    ([emptyShade]) => emptyShade,
-    ['colors.emptyShade']
-  ),
-  backgroundAutofilled: computed(
-    ([primary]) => {
-      const background = tint(primary, 0.8);
-      return tint(background, 0.7);
-    },
-    ['colors.primary']
-  ),
-  backgroundDropping: 'transparent',
-  prependBackground: computed(
-    ([lightShade]) => tint(lightShade, 0.5),
-    ['colors.lightShade']
-  ),
-  border: computed(
-    ([lightShade]) => {
-      const color = darken(lightShade, 4);
-      return transparentize(color, 0.1);
-    },
-    ['colors.lightShade']
-  ),
-  borderDisabled: computed(
-    ([lightShade]) => {
-      const color = darken(lightShade, 4);
-      return transparentize(color, 0.1);
-    },
-    ['colors.lightShade']
-  ),
-  borderFocused: computed(([primary]) => primary, ['colors.primary']),
-  borderInvalid: computed(([danger]) => danger, ['colors.danger']),
-  borderHovered: computed(
-    ([lightShade]) => {
-      const color = darken(lightShade, 4);
-      return transparentize(color, 0.1);
-    },
-    ['colors.lightShade']
-  ),
-  borderInvalidHovered: computed(([danger]) => danger, ['colors.danger']),
-  borderAutofilled: computed(
-    ([primaryText]) => transparentize(primaryText, 0.2),
-    ['colors.primaryText']
-  ),
-  borderAutofilledHovered: computed(
-    ([primaryText]) => transparentize(primaryText, 0.2),
-    ['colors.primaryText']
-  ),
-  clearButtonBackground: computed(
-    ([mediumShade]) => mediumShade,
-    ['colors.mediumShade']
-  ),
-  controlBorder: computed(
-    ([lightestShade]) => shade(lightestShade, 0.4),
-    ['colors.lightestShade']
-  ),
-  controlBorderSelected: computed(
-    ([lightestShade]) => shade(lightestShade, 0.4),
-    ['colors.lightestShade']
-  ),
-  controlBorderDisabled: computed(
-    ([lightestShade]) => shade(lightestShade, 0.4),
-    ['colors.lightestShade']
-  ),
-  controlBackgroundUnselected: computed(
-    ([emptyShade]) => emptyShade,
-    ['colors.emptyShade']
-  ),
-  controlBackgroundDisabled: computed(
-    ([lightShade]) => lightShade,
-    ['colors.lightShade']
-  ),
-
-  colorHasPlaceholder: computed(
-    ([subduedText]) => tint(subduedText, 0.08),
-    ['colors.subduedText']
-  ),
-  colorDisabled: computed(
-    ([mediumShade]) => mediumShade,
-    ['colors.mediumShade']
-  ),
-  iconDisabled: computed(([darkShade]) => darkShade, ['colors.darkShade']),
-};
-
-const _dark_forms = {
-  ..._forms,
-  background: computed(
-    ([lightestShade]) => shade(lightestShade, 0.4),
-    ['colors.lightestShade']
-  ),
-  backgroundFocused: computed(
-    ([emptyShade]) => shade(emptyShade, 0.4),
-    ['colors.emptyShade']
-  ),
-  backgroundAutofilled: computed(
-    ([primary]) => {
-      const background = shade(primary, 0.7);
-      return shade(background, 0.5);
-    },
-    ['colors.primary']
-  ),
-  prependBackground: computed(
-    ([lightShade]) => shade(lightShade, 0.15),
-    ['colors.lightShade']
-  ),
-  border: computed(([ghost]) => transparentize(ghost, 0.1), ['colors.ghost']),
-  clearButtonBackground: computed(
-    ([darkShade]) => darkShade,
-    ['colors.darkShade']
-  ),
-  controlBorder: computed(
-    ([lightestShade]) => tint(lightestShade, 0.31),
-    ['colors.lightestShade']
-  ),
-  controlBorderSelected: computed(
-    ([lightestShade]) => tint(lightestShade, 0.31),
-    ['colors.lightestShade']
-  ),
-  controlBorderDisabled: computed(
-    ([lightestShade]) => tint(lightestShade, 0.31),
-    ['colors.lightestShade']
-  ),
-};
-
-export const forms = {
-  maxWidth: computed(
-    ([base]) => mathWithUnits(base, (x) => x * 25),
-    ['size.base']
-  ),
-  LIGHT: _forms,
-  DARK: _dark_forms,
-};
diff --git a/packages/eui/src/themes/amsterdam/global_styling/variables/_index.scss b/packages/eui/src/themes/amsterdam/global_styling/variables/_index.scss
deleted file mode 100644
index 921eec39606..00000000000
--- a/packages/eui/src/themes/amsterdam/global_styling/variables/_index.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-// Import base theme first, then override
-@import '../../../../global_styling/variables/index';
-@import 'states';
-
-@import 'colors_vis';
-@import 'typography';
-@import 'shadows';
-@import 'forms';
diff --git a/packages/eui/src/themes/amsterdam/global_styling/variables/_levels.ts b/packages/eui/src/themes/amsterdam/global_styling/variables/_levels.ts
deleted file mode 100644
index 455bd877103..00000000000
--- a/packages/eui/src/themes/amsterdam/global_styling/variables/_levels.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import { _EuiThemeLevels } from '../../../../global_styling/variables';
-
-export const levels: _EuiThemeLevels = {
-  toast: 9000,
-  modal: 8000,
-  mask: 6000,
-  navigation: 6000,
-  menu: 2000,
-  header: 1000,
-  flyout: 1000,
-  maskBelowHeader: 1000,
-  content: 0,
-};
diff --git a/packages/eui/src/themes/amsterdam/global_styling/variables/_shadows.scss b/packages/eui/src/themes/amsterdam/global_styling/variables/_shadows.scss
deleted file mode 100644
index 020b522fe2f..00000000000
--- a/packages/eui/src/themes/amsterdam/global_styling/variables/_shadows.scss
+++ /dev/null
@@ -1,20 +0,0 @@
-// Shadows
-$euiShadowColor: $euiColorInk !default;
-
-$euiShadowDownXS: 0 0.8px 0.8px 0 hsla(from $euiShadowColor h s l / 0.04), 0 2.3px 2px 0 hsla(from $euiShadowColor h s l / 0.03);
-$euiShadowDownS: 0 0.7px 1.4px 0 hsla(from $euiShadowColor h s l / 0.07), 0 1.9px 4px 0 hsla(from $euiShadowColor h s l / 0.05), 0 4.5px 10 0 hsla(from $euiShadowColor h s l / 0.05);
-$euiShadowDownM: 0 0.9px 4px 0 hsla(from $euiShadowColor h s l / 0.08), 0 2.6px 8px 0 hsla(from $euiShadowColor h s l / 0.06), 0 5.7px 12px 0 hsla(from $euiShadowColor h s l / 0.05), 0 15px 15px 0 hsla(from $euiShadowColor h s l / 0.04);
-$euiShadowDownL: 0 1px 5px 0 hsla(from $euiShadowColor h s l / 0.1), 0 3.6px 13px 0 hsla(from $euiShadowColor h s l / 0.07), 0 8.4px 23px 0 hsla(from $euiShadowColor h s l / 0.06), 0 23px 35px 0 hsla(from $euiShadowColor h s l / 0.05);
-$euiShadowDownXL: 0 2.7px 9px 0 hsla(from $euiShadowColor h s l / 0.13), 0 9.4px 24px 0 hsla(from $euiShadowColor h s l / 0.09), 0 21.8px 43px 0 hsla(from $euiShadowColor h s l / 0.08);
-
-$euiShadowUpXS: 0 0.8px 0.8px 0 hsla(from $euiShadowColor h s l / 0.04), 0 -2.3px 2px 0 hsla(from $euiShadowColor h s l / 0.03);
-$euiShadowUpS: 0 0.7px 1.4px 0 hsla(from $euiShadowColor h s l / 0.07), 0 -1.9px 4px 0 hsla(from $euiShadowColor h s l / 0.05), 0 -4.5px 10 0 hsla(from $euiShadowColor h s l / 0.05);
-$euiShadowUpM: 0 0.9px 4px 0 hsla(from $euiShadowColor h s l / 0.08), 0 -2.6px 8px 0 hsla(from $euiShadowColor h s l / 0.06), 0 -5.7px 12px 0 hsla(from $euiShadowColor h s l / 0.05), 0 -15px 15px 0 hsla(from $euiShadowColor h s l / 0.04);
-$euiShadowUpL: 0 1px 5px 0 hsla(from $euiShadowColor h s l / 0.1), 0 -3.6px 13px 0 hsla(from $euiShadowColor h s l / 0.07), 0 -8.4px 23px 0 hsla(from $euiShadowColor h s l / 0.06), 0 -23px 35px 0 hsla(from $euiShadowColor h s l / 0.05);
-$euiShadowUpXL: 0 2.7px 9px 0 hsla(from $euiShadowColor h s l / 0.13), 0 -9.4px 24px 0 hsla(from $euiShadowColor h s l / 0.09), 0 -21.8px 43px 0 hsla(from $euiShadowColor h s l / 0.08);
-
-$euiShadowHoverDown: 0 1.9px 4px 0 hsla(from $euiShadowColor h s l / 0.05), 0 4.5px 10 0 hsla(from $euiShadowColor h s l / 0.05);
-$euiShadowHoverXLDown: none;
-
-$euiShadowHoverUp: 0 1.9px 4px 0 hsla(from $euiShadowColor h s l / 0.05), 0 -4.5px 10 0 hsla(from $euiShadowColor h s l / 0.05);
-$euiShadowHoverXLUp: none;
\ No newline at end of file
diff --git a/packages/eui/src/themes/amsterdam/global_styling/variables/_shadows.ts b/packages/eui/src/themes/amsterdam/global_styling/variables/_shadows.ts
deleted file mode 100644
index f88df7cc722..00000000000
--- a/packages/eui/src/themes/amsterdam/global_styling/variables/_shadows.ts
+++ /dev/null
@@ -1,496 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import {
-  formatMultipleBoxShadow,
-  _EuiThemeShadows,
-  type _EuiThemeShadowPrimitives,
-} from '@elastic/eui-theme-common';
-
-// in Amsterdam this is `color.shadow`, which computes to `ink` (#000)
-const SHADOW_COLOR = '#000000';
-
-export const shadowPrimitives: _EuiThemeShadowPrimitives = {
-  xs: {
-    light: [
-      {
-        opacity: 0.04 * 1,
-        x: 0,
-        y: 0.8,
-        blur: 0.8,
-        spread: 0,
-      },
-      {
-        opacity: 0.03 * 1,
-        x: 0,
-        y: 2.3,
-        blur: 2,
-        spread: 0,
-      },
-    ],
-    dark: [
-      {
-        opacity: 0.04 * 3.5,
-        x: 0,
-        y: 0.8,
-        blur: 0.8,
-        spread: 0,
-      },
-      {
-        opacity: 0.03 * 3.5,
-        x: 0,
-        y: 2.3,
-        blur: 2,
-        spread: 0,
-      },
-    ],
-  },
-  s: {
-    light: [
-      {
-        opacity: 0.07 * 1,
-        x: 0,
-        y: 0.7,
-        blur: 1.4,
-        spread: 0,
-      },
-      {
-        opacity: 0.05 * 1,
-        x: 0,
-        y: 1.9,
-        blur: 4,
-        spread: 0,
-      },
-      {
-        opacity: 0.05 * 1,
-        x: 0,
-        y: 4.5,
-        blur: 10,
-        spread: 0,
-      },
-    ],
-    dark: [
-      {
-        opacity: 0.07 * 3.5,
-        x: 0,
-        y: 0.7,
-        blur: 1.4,
-        spread: 0,
-      },
-      {
-        opacity: 0.05 * 3.5,
-        x: 0,
-        y: 1.9,
-        blur: 4,
-        spread: 0,
-      },
-      {
-        opacity: 0.05 * 3.5,
-        x: 0,
-        y: 4.5,
-        blur: 10,
-        spread: 0,
-      },
-    ],
-  },
-  m: {
-    light: [
-      {
-        opacity: 0.08 * 1,
-        x: 0,
-        y: 0.9,
-        blur: 4,
-        spread: 0,
-      },
-      {
-        opacity: 0.06 * 1,
-        x: 0,
-        y: 2.6,
-        blur: 8,
-        spread: 0,
-      },
-      {
-        opacity: 0.05 * 1,
-        x: 0,
-        y: 5.7,
-        blur: 12,
-        spread: 0,
-      },
-      {
-        opacity: 0.04 * 1,
-        x: 0,
-        y: 15,
-        blur: 15,
-        spread: 0,
-      },
-    ],
-    dark: [
-      {
-        opacity: 0.08 * 3.5,
-        x: 0,
-        y: 0.9,
-        blur: 4,
-        spread: 0,
-      },
-      {
-        opacity: 0.06 * 3.5,
-        x: 0,
-        y: 2.6,
-        blur: 8,
-        spread: 0,
-      },
-      {
-        opacity: 0.05 * 3.5,
-        x: 0,
-        y: 5.7,
-        blur: 12,
-        spread: 0,
-      },
-      {
-        opacity: 0.04 * 3.5,
-        x: 0,
-        y: 15,
-        blur: 15,
-        spread: 0,
-      },
-    ],
-  },
-  l: {
-    light: [
-      {
-        opacity: 0.1 * 1,
-        x: 0,
-        y: 1,
-        blur: 5,
-        spread: 0,
-      },
-      {
-        opacity: 0.07 * 1,
-        x: 0,
-        y: 3.6,
-        blur: 13,
-        spread: 0,
-      },
-      {
-        opacity: 0.06 * 1,
-        x: 0,
-        y: 8.4,
-        blur: 23,
-        spread: 0,
-      },
-      {
-        opacity: 0.05 * 1,
-        x: 0,
-        y: 23,
-        blur: 35,
-        spread: 0,
-      },
-    ],
-    dark: [
-      {
-        opacity: 0.1 * 3.5,
-        x: 0,
-        y: 1,
-        blur: 5,
-        spread: 0,
-      },
-      {
-        opacity: 0.07 * 3.5,
-        x: 0,
-        y: 3.6,
-        blur: 13,
-        spread: 0,
-      },
-      {
-        opacity: 0.06 * 3.5,
-        x: 0,
-        y: 8.4,
-        blur: 23,
-        spread: 0,
-      },
-      {
-        opacity: 0.05 * 3.5,
-        x: 0,
-        y: 23,
-        blur: 35,
-        spread: 0,
-      },
-    ],
-  },
-  xl: {
-    light: [
-      {
-        opacity: 0.13 * 1,
-        x: 0,
-        y: 2.7,
-        blur: 9,
-        spread: 0,
-      },
-      {
-        opacity: 0.09 * 1,
-        x: 0,
-        y: 9.4,
-        blur: 24,
-        spread: 0,
-      },
-      {
-        opacity: 0.08 * 1,
-        x: 0,
-        y: 21.8,
-        blur: 43,
-        spread: 0,
-      },
-    ],
-    dark: [
-      {
-        opacity: 0.13 * 3.5,
-        x: 0,
-        y: 2.7,
-        blur: 9,
-        spread: 0,
-      },
-      {
-        opacity: 0.09 * 3.5,
-        x: 0,
-        y: 9.4,
-        blur: 24,
-        spread: 0,
-      },
-      {
-        opacity: 0.08 * 3.5,
-        x: 0,
-        y: 21.8,
-        blur: 43,
-        spread: 0,
-      },
-    ],
-  },
-  xxl: {
-    light: [],
-    dark: [],
-  },
-  flat: {
-    light: [
-      {
-        opacity: 0.06 * 1,
-        x: 0,
-        y: 0,
-        blur: 0.8,
-        spread: 0,
-      },
-      {
-        opacity: 0.04 * 1,
-        x: 0,
-        y: 0,
-        blur: 2,
-        spread: 0,
-      },
-      {
-        opacity: 0.04 * 1,
-        x: 0,
-        y: 0,
-        blur: 5,
-        spread: 0,
-      },
-      {
-        opacity: 0.03 * 1,
-        x: 0,
-        y: 0,
-        blur: 17,
-        spread: 0,
-      },
-    ],
-    dark: [
-      {
-        opacity: 0.06 * 3.5,
-        x: 0,
-        y: 0,
-        blur: 0.8,
-        spread: 0,
-      },
-      {
-        opacity: 0.04 * 3.5,
-        x: 0,
-        y: 0,
-        blur: 2,
-        spread: 0,
-      },
-      {
-        opacity: 0.04 * 3.5,
-        x: 0,
-        y: 0,
-        blur: 5,
-        spread: 0,
-      },
-      {
-        opacity: 0.03 * 3.5,
-        x: 0,
-        y: 0,
-        blur: 17,
-        spread: 0,
-      },
-    ],
-  },
-};
-
-const shadowColors = {
-  colors: {
-    base: SHADOW_COLOR,
-  },
-};
-
-const shadowsLight: _EuiThemeShadows = {
-  ...shadowColors,
-  xs: {
-    down: formatMultipleBoxShadow(shadowPrimitives.xs.light, {
-      color: shadowColors.colors.base,
-    }),
-    up: formatMultipleBoxShadow(shadowPrimitives.xs.light, {
-      direction: 'up',
-      color: shadowColors.colors.base,
-    }),
-  },
-  s: {
-    down: formatMultipleBoxShadow(shadowPrimitives.s.light, {
-      color: shadowColors.colors.base,
-    }),
-    up: formatMultipleBoxShadow(shadowPrimitives.s.light, {
-      direction: 'up',
-      color: shadowColors.colors.base,
-    }),
-  },
-  m: {
-    down: formatMultipleBoxShadow(shadowPrimitives.m.light, {
-      color: shadowColors.colors.base,
-    }),
-    up: formatMultipleBoxShadow(shadowPrimitives.m.light, {
-      direction: 'up',
-      color: shadowColors.colors.base,
-    }),
-  },
-  l: {
-    down: formatMultipleBoxShadow(shadowPrimitives.l.light, {
-      color: shadowColors.colors.base,
-    }),
-    up: formatMultipleBoxShadow(shadowPrimitives.l.light, {
-      direction: 'up',
-      color: shadowColors.colors.base,
-    }),
-  },
-  xl: {
-    down: formatMultipleBoxShadow(shadowPrimitives.xl.light, {
-      color: shadowColors.colors.base,
-    }),
-    up: formatMultipleBoxShadow(shadowPrimitives.xl.light, {
-      direction: 'up',
-      color: shadowColors.colors.base,
-    }),
-  },
-  hover: {
-    base: {
-      down: formatMultipleBoxShadow(shadowPrimitives.s.light.slice(1), {
-        color: shadowColors.colors.base,
-      }),
-      up: formatMultipleBoxShadow(shadowPrimitives.s.light.slice(1), {
-        direction: 'up',
-        color: shadowColors.colors.base,
-      }),
-    },
-    xl: {
-      down: 'none',
-      up: 'none',
-    },
-  },
-  flat: {
-    down: formatMultipleBoxShadow(shadowPrimitives.flat.light, {
-      color: shadowColors.colors.base,
-    }),
-    up: formatMultipleBoxShadow(shadowPrimitives.flat.light, {
-      direction: 'up',
-      color: shadowColors.colors.base,
-    }),
-  },
-};
-
-const shadowsDark: _EuiThemeShadows = {
-  ...shadowColors,
-  xs: {
-    down: formatMultipleBoxShadow(shadowPrimitives.xs.dark, {
-      color: shadowColors.colors.base,
-    }),
-    up: formatMultipleBoxShadow(shadowPrimitives.xs.dark, {
-      direction: 'up',
-      color: shadowColors.colors.base,
-    }),
-  },
-  s: {
-    down: formatMultipleBoxShadow(shadowPrimitives.s.dark, {
-      color: shadowColors.colors.base,
-    }),
-    up: formatMultipleBoxShadow(shadowPrimitives.s.dark, {
-      direction: 'up',
-      color: shadowColors.colors.base,
-    }),
-  },
-  m: {
-    down: formatMultipleBoxShadow(shadowPrimitives.m.dark, {
-      color: shadowColors.colors.base,
-    }),
-    up: formatMultipleBoxShadow(shadowPrimitives.m.dark, {
-      direction: 'up',
-      color: shadowColors.colors.base,
-    }),
-  },
-  l: {
-    down: formatMultipleBoxShadow(shadowPrimitives.l.dark, {
-      color: shadowColors.colors.base,
-    }),
-    up: formatMultipleBoxShadow(shadowPrimitives.l.dark, {
-      direction: 'up',
-      color: shadowColors.colors.base,
-    }),
-  },
-  xl: {
-    down: formatMultipleBoxShadow(shadowPrimitives.xl.dark, {
-      color: shadowColors.colors.base,
-    }),
-    up: formatMultipleBoxShadow(shadowPrimitives.xl.dark, {
-      direction: 'up',
-      color: shadowColors.colors.base,
-    }),
-  },
-  hover: {
-    base: {
-      down: formatMultipleBoxShadow(shadowPrimitives.s.dark.slice(1), {
-        color: shadowColors.colors.base,
-      }),
-      up: formatMultipleBoxShadow(shadowPrimitives.s.dark.slice(1), {
-        direction: 'up',
-        color: shadowColors.colors.base,
-      }),
-    },
-    xl: {
-      down: 'none',
-      up: 'none',
-    },
-  },
-  flat: {
-    down: formatMultipleBoxShadow(shadowPrimitives.flat.dark, {
-      color: shadowColors.colors.base,
-    }),
-    up: formatMultipleBoxShadow(shadowPrimitives.flat.dark, {
-      direction: 'up',
-      color: shadowColors.colors.base,
-    }),
-  },
-};
-
-export const shadows: _EuiThemeShadows = {
-  LIGHT: shadowsLight,
-  DARK: shadowsDark,
-};
diff --git a/packages/eui/src/themes/amsterdam/global_styling/variables/_size.ts b/packages/eui/src/themes/amsterdam/global_styling/variables/_size.ts
deleted file mode 100644
index 99160540241..00000000000
--- a/packages/eui/src/themes/amsterdam/global_styling/variables/_size.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import {
-  _EuiThemeBase,
-  _EuiThemeSizes,
-} from '../../../../global_styling/variables';
-import { sizeToPixel } from '../../../../global_styling/functions';
-
-import { computed } from '../../../../services/theme/utils';
-
-export const base: _EuiThemeBase = 16;
-
-export const size: _EuiThemeSizes = {
-  xxs: computed(sizeToPixel(0.125)),
-  xs: computed(sizeToPixel(0.25)),
-  s: computed(sizeToPixel(0.5)),
-  m: computed(sizeToPixel(0.75)),
-  base: computed(sizeToPixel()),
-  l: computed(sizeToPixel(1.5)),
-  xl: computed(sizeToPixel(2)),
-  xxl: computed(sizeToPixel(2.5)),
-  xxxl: computed(sizeToPixel(3)),
-  xxxxl: computed(sizeToPixel(4)),
-};
diff --git a/packages/eui/src/themes/amsterdam/global_styling/variables/_states.scss b/packages/eui/src/themes/amsterdam/global_styling/variables/_states.scss
deleted file mode 100644
index 13e30784936..00000000000
--- a/packages/eui/src/themes/amsterdam/global_styling/variables/_states.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-// Color when not using currentColor
-$euiFocusRingColor: $euiColorPrimaryText;
-
-// Sizing
-$euiFocusRingAnimStartSize: 2px;
-$euiFocusRingSize: 2px;
-
-// Transparency
-$euiFocusTransparency: lightOrDarkTheme(.9, .8);
-$euiFocusTransparencyPercent: lightOrDarkTheme(90%, 80%);
-$euiFocusBackgroundColor: transparentize($euiColorPrimary, $euiFocusTransparency);
diff --git a/packages/eui/src/themes/amsterdam/global_styling/variables/_states.ts b/packages/eui/src/themes/amsterdam/global_styling/variables/_states.ts
deleted file mode 100644
index 6869e754a85..00000000000
--- a/packages/eui/src/themes/amsterdam/global_styling/variables/_states.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import { computed } from '../../../../services/theme/utils';
-import { transparentize } from '../../../../services/color/manipulation';
-import { _EuiThemeFocus } from '../../../../global_styling/variables/states';
-import { sizeToPixel } from '../../../../global_styling/functions/size';
-
-export const focus: _EuiThemeFocus = {
-  // Focus ring
-  color: 'currentColor',
-  width: computed(sizeToPixel(0.125)),
-  // Focus background
-  transparency: { LIGHT: 0.1, DARK: 0.2 },
-  backgroundColor: computed(({ colors, focus }) =>
-    transparentize(colors.primary, focus.transparency)
-  ),
-};
diff --git a/packages/eui/src/themes/amsterdam/global_styling/variables/_typography.scss b/packages/eui/src/themes/amsterdam/global_styling/variables/_typography.scss
deleted file mode 100644
index 824f56b42da..00000000000
--- a/packages/eui/src/themes/amsterdam/global_styling/variables/_typography.scss
+++ /dev/null
@@ -1,64 +0,0 @@
-// Finally start using the non-beta version of Inter
-$euiFontFamily: 'Inter', -apple-system, BlinkMacSystemFont, 'Segoe UI', Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol' !default;
-
-// Font sizes -- scale is loosely based on Major Third (1.250) with a base of 14px
-// Base list is an altered scale based on 16px to match the resulted values below
-$euiTextScale:    2.125, 1.6875, 1.375, 1.125, 1, .875, .75 !default;
-
-$euiFontSize:     $euiSize - 2; // 14px
-
-$euiFontSizeXS:   floor($euiFontSize * .86);  // 12px // h6
-$euiFontSizeS:    floor($euiFontSize * 1);    // 14px // h5 --> Now the same as the base $euiFontSize
-$euiFontSizeM:     ceil($euiFontSize * 1.14); // 16px // h4
-$euiFontSizeL:     ceil($euiFontSize * 1.57); // 22px // h3
-$euiFontSizeXL:   floor($euiFontSize * 1.93); // 27px // h2
-$euiFontSizeXXL:  floor($euiFontSize * 2.43); // 34px // h1
-
-$euiBodyLineHeight: 1.142857143 !default; // 16px from a 14px base font size to ensure it aligns to our 16px grid
-
-$euiCodeFontWeightRegular: 400;
-$euiCodeFontWeightBold: 700;
-
-// Normally functions are imported before variables in `_index.scss` files
-// But because they need to consume some typography variables they need to live here
-@function convertToRem($size) {
-  @return #{$size / $euiFontSize}rem;
-}
-
-// Use 8px increments for base gridline
-@function lineHeightFromBaseline($multiplier: 3) {
-  @return convertToRem(($euiSize / 2) * $multiplier);
-}
-
-$euiTitles: (
-  'xxxs': (
-    'font-size': $euiFontSizeXS,
-    'line-height': lineHeightFromBaseline(2),
-    'font-weight': $euiFontWeightBold,
-  ),
-  'xxs': (
-    'font-size': $euiFontSizeS,
-    'line-height': lineHeightFromBaseline(3),
-    'font-weight': $euiFontWeightBold,
-  ),
-  'xs': (
-    'font-size': $euiFontSizeM,
-    'line-height': lineHeightFromBaseline(3),
-    'font-weight': $euiFontWeightBold,
-  ),
-  's': (
-    'font-size': $euiFontSizeL,
-    'line-height': lineHeightFromBaseline(4),
-    'font-weight': $euiFontWeightBold,
-  ),
-  'm': (
-    'font-size': $euiFontSizeXL,
-    'line-height': lineHeightFromBaseline(4),
-    'font-weight': $euiFontWeightBold,
-  ),
-  'l': (
-    'font-size': $euiFontSizeXXL,
-    'line-height': lineHeightFromBaseline(5),
-    'font-weight': $euiFontWeightBold,
-  ),
-);
diff --git a/packages/eui/src/themes/amsterdam/global_styling/variables/_typography.ts b/packages/eui/src/themes/amsterdam/global_styling/variables/_typography.ts
deleted file mode 100644
index 3a95f26a6c5..00000000000
--- a/packages/eui/src/themes/amsterdam/global_styling/variables/_typography.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import { computed } from '../../../../services/theme/utils';
-import {
-  _EuiThemeFont,
-  _EuiThemeFontBase,
-  _EuiThemeFontScales,
-  _EuiThemeFontWeights,
-} from '../../../../global_styling/variables/typography';
-
-// Typographic scale -- loosely based on Major Third (1.250)
-export const fontScale: _EuiThemeFontScales = {
-  xxxs: 0.5625,
-  xxs: 0.6875,
-  xs: 0.75,
-  s: 0.875,
-  m: 1,
-  l: 1.375,
-  xl: 1.6875,
-  xxl: 2.125,
-};
-
-// Families & base font settings
-export const fontBase: _EuiThemeFontBase = {
-  family: "'Inter', BlinkMacSystemFont, Helvetica, Arial, sans-serif",
-  familyCode: "'Roboto Mono', Menlo, Courier, monospace",
-  familySerif: 'Georgia, Times, Times New Roman, serif',
-
-  // Careful using ligatures. Code editors like ACE will often error because of width calculations
-  featureSettings: "'calt' 1, 'kern' 1, 'liga' 1",
-  defaultUnits: 'rem',
-
-  baseline: computed(([base]) => base / 4, ['base']),
-  lineHeightMultiplier: 1.5,
-};
-
-export const fontWeight: _EuiThemeFontWeights = {
-  light: 300,
-  regular: 400,
-  medium: 500,
-  semiBold: 600,
-  bold: 700,
-};
-
-export const font: _EuiThemeFont = {
-  ...fontBase,
-  scale: fontScale,
-  weight: fontWeight,
-  body: {
-    scale: 's',
-    weight: 'regular',
-  },
-  title: {
-    weight: 'bold',
-  },
-};
diff --git a/packages/eui/src/themes/amsterdam/index.ts b/packages/eui/src/themes/amsterdam/index.ts
deleted file mode 100644
index 81ea9d264b0..00000000000
--- a/packages/eui/src/themes/amsterdam/index.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-// Only globally export the mixins we allow consumers to re-use
-export * from './global_styling/mixins/shadow';
diff --git a/packages/eui/src/themes/amsterdam/theme.ts b/packages/eui/src/themes/amsterdam/theme.ts
deleted file mode 100644
index f658d685b19..00000000000
--- a/packages/eui/src/themes/amsterdam/theme.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import { buildTheme } from '../../services/theme/utils';
-import { EuiThemeShape } from '../../services/theme/types';
-
-import { colors } from './global_styling/variables/_colors';
-import { animation } from './global_styling/variables/_animation';
-import { breakpoint } from './global_styling/variables/_breakpoint';
-import { base, size } from './global_styling/variables/_size';
-import { border } from './global_styling/variables/_borders';
-import { levels } from './global_styling/variables/_levels';
-import { font } from './global_styling/variables/_typography';
-import { focus } from './global_styling/variables/_states';
-import { shadows } from './global_styling/variables/_shadows';
-import { components } from './global_styling/variables/_components';
-
-export const AMSTERDAM_NAME_KEY = 'EUI_THEME_AMSTERDAM';
-
-export const euiThemeAmsterdam: EuiThemeShape = {
-  colors,
-  base,
-  size,
-  border,
-  font,
-  animation,
-  breakpoint,
-  levels,
-  focus,
-  shadows,
-  components,
-  flags: {
-    hasGlobalFocusColor: false,
-    hasVisColorAdjustment: true,
-    buttonVariant: 'classic',
-    formVariant: 'classic',
-    shadowVariant: 'classic',
-  },
-};
-
-export const EuiThemeAmsterdam = buildTheme(
-  euiThemeAmsterdam,
-  AMSTERDAM_NAME_KEY
-);
diff --git a/packages/eui/src/themes/amsterdam/theme_dark.scss b/packages/eui/src/themes/amsterdam/theme_dark.scss
deleted file mode 100644
index a578e60d010..00000000000
--- a/packages/eui/src/themes/amsterdam/theme_dark.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-// These are variable overwrites used only for this theme.
-@import 'colors_dark';
-
-// Global styling
-@import './global_styling/index';
diff --git a/packages/eui/src/themes/amsterdam/theme_light.scss b/packages/eui/src/themes/amsterdam/theme_light.scss
deleted file mode 100644
index 0b499f9e37d..00000000000
--- a/packages/eui/src/themes/amsterdam/theme_light.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-// This is the default theme.
-@import 'colors_light';
-
-// Global styling
-@import './global_styling/index';
diff --git a/packages/eui/src/themes/index.ts b/packages/eui/src/themes/index.ts
deleted file mode 100644
index 04db94c2a3f..00000000000
--- a/packages/eui/src/themes/index.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-import { colorVisLight } from './amsterdam/global_styling/variables/_colors_vis_light';
-import { colorVisDark } from './amsterdam/global_styling/variables/_colors_vis_dark';
-
-export { colorVisLight as colorVis, colorVisLight, colorVisDark };
-export type { EUI_THEME } from './themes';
-
-export { AMSTERDAM_NAME_KEY, EuiThemeAmsterdam } from './amsterdam/theme';
-
-export * from './amsterdam';
diff --git a/packages/eui/src/themes/json/README.md b/packages/eui/src/themes/json/README.md
deleted file mode 100644
index ee248b91f1f..00000000000
--- a/packages/eui/src/themes/json/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-## Temporary note
-
-NOTE: The `.json` and `.json.d.ts` files in this directory are no longer dynamically generated from various component Sass files, but instead static copies that, over time, should eventually be removed as we migrate from Sass to Emotion.
-
-For JavaScript usage: use `useEuiTheme()` instead to obtain theme variables.
-
-For Sass usage: TBD
diff --git a/packages/eui/src/themes/json/eui_theme_amsterdam_dark.json b/packages/eui/src/themes/json/eui_theme_amsterdam_dark.json
deleted file mode 100644
index cc6b31f5e4e..00000000000
--- a/packages/eui/src/themes/json/eui_theme_amsterdam_dark.json
+++ /dev/null
@@ -1,463 +0,0 @@
-{
-  "euiZDataGrid": 999,
-  "euiZHeaderBelowDataGrid": 998,
-  "euiZDataGridCellPopover": 1000,
-  "euiDataGridCellPaddingS": "4px",
-  "euiDataGridCellPaddingM": "6px",
-  "euiDataGridCellPaddingL": "8px",
-  "euiTableHoverColor": "#1e1e25",
-  "euiTableSelectedColor": "rgba(54, 162, 239, 0.19999999999999996)",
-  "euiTableHoverSelectedColor": "rgba(27, 81, 120, 0.27999999999999997)",
-  "euiTableActionsBorderColor": "rgba(83, 89, 102, 0.09999999999999998)",
-  "euiTableHoverClickableColor": "rgba(54, 162, 239, 0.050000000000000044)",
-  "euiTableFocusClickableColor": "rgba(54, 162, 239, 0.09999999999999998)",
-  "euiContrastRatioText": 4.5,
-  "euiContrastRatioGraphic": 3,
-  "euiContrastRatioDisabled": 2,
-  "euiAnimSlightBounce": "cubic-bezier(0.34, 1.61, 0.7, 1)",
-  "euiAnimSlightResistance": "cubic-bezier(0.694, 0.0482, 0.335, 1)",
-  "euiAnimSpeedExtraFast": "90ms",
-  "euiAnimSpeedFast": "150ms",
-  "euiAnimSpeedNormal": "250ms",
-  "euiAnimSpeedSlow": "350ms",
-  "euiAnimSpeedExtraSlow": "500ms",
-  "euiBorderWidthThin": "1px",
-  "euiBorderWidthThick": "2px",
-  "euiBorderColor": "#343741",
-  "euiBorderRadius": "6px",
-  "euiBorderRadiusSmall": "4px",
-  "euiBorderThick": "2px solid #343741",
-  "euiBorderThin": "1px solid #343741",
-  "euiBorderEditable": "2px dotted #343741",
-  "euiButtonHeight": "40px",
-  "euiButtonHeightSmall": "32px",
-  "euiButtonHeightXSmall": "24px",
-  "euiButtonColorDisabled": "#515761",
-  "euiButtonColorDisabledText": "#515761",
-  "euiButtonColorGhostDisabled": "#343741",
-  "euiButtonTypes": {
-    "primary": "#36a2ef",
-    "accent": "#f68fbe",
-    "accentSecondary": "#7dded8",
-    "neutral": "#becfe3",
-    "success": "#7dded8",
-    "warning": "#f3d371",
-    "risk": "#da8b45",
-    "danger": "#f86b63",
-    "ghost": "#ffffff",
-    "text": "#98a2b3"
-  },
-  "euiFontWeightLight": 300,
-  "euiFontWeightRegular": 400,
-  "euiFontWeightMedium": 500,
-  "euiFontWeightSemiBold": 600,
-  "euiFontWeightBold": 700,
-  "euiCodeFontWeightRegular": 400,
-  "euiCodeFontWeightBold": 700,
-  "euiFormMaxWidth": "400px",
-  "euiFormControlHeight": "40px",
-  "euiFormControlCompressedHeight": "32px",
-  "euiFormControlPadding": "12px",
-  "euiFormControlCompressedPadding": "8px",
-  "euiFormControlBorderRadius": "6px",
-  "euiFormControlCompressedBorderRadius": "4px",
-  "euiRadioSize": "16px",
-  "euiCheckBoxSize": "16px",
-  "euiCheckboxBorderRadius": "4px",
-  "euiSwitchHeight": "20px",
-  "euiSwitchWidth": "44px",
-  "euiSwitchThumbSize": "20px",
-  "euiSwitchIconHeight": "16px",
-  "euiSwitchHeightCompressed": "16px",
-  "euiSwitchWidthCompressed": "28px",
-  "euiSwitchThumbSizeCompressed": "16px",
-  "euiSwitchHeightMini": "10px",
-  "euiSwitchWidthMini": "22px",
-  "euiSwitchThumbSizeMini": "10px",
-  "euiFormBackgroundColor": "#16171c",
-  "euiFormBackgroundDisabledColor": "#202128",
-  "euiFormBackgroundReadOnlyColor": "#1d1e24",
-  "euiFormBorderOpaqueColor": "#ffffff",
-  "euiFormBorderColor": "rgba(255, 255, 255, 0.09999999999999998)",
-  "euiFormBorderDisabledColor": "rgba(255, 255, 255, 0.09999999999999998)",
-  "euiFormCustomControlDisabledIconColor": "#a6aab0",
-  "euiFormCustomControlBorderColor": "#66676d",
-  "euiFormControlDisabledColor": "#535966",
-  "euiFormControlBoxShadow": "0 0 rgba(0, 0, 0, 0)",
-  "euiFormControlPlaceholderText": "#81858f",
-  "euiFormInputGroupLabelBackground": "#2c2f37",
-  "euiFormInputGroupBorder": "none",
-  "euiSwitchOffColor": "rgba(83, 89, 102, 0.7)",
-  "euiFormControlIconSizes": {
-    "small": "12px",
-    "medium": "16px",
-    "large": "24px",
-    "xLarge": "32px",
-    "xxLarge": "40px"
-  },
-  "euiFormControlLayoutGroupInputHeight": "38px",
-  "euiFormControlLayoutGroupInputCompressedHeight": "30px",
-  "euiFormControlLayoutGroupInputCompressedBorderRadius": "2px",
-  "euiHeaderBackgroundColor": "#1d1e24",
-  "euiHeaderDarkBackgroundColor": "#131317",
-  "euiHeaderBorderColor": "#131417",
-  "euiHeaderBreadcrumbColor": "#d4dae5",
-  "euiHeaderHeight": "48px",
-  "euiHeaderChildSize": "40px",
-  "euiHeaderHeightCompensation": "48px",
-  "euiPageDefaultMaxWidth": "1200px",
-  "euiPageSidebarMinWidth": "192px",
-  "euiPanelPaddingModifiers": {
-    "paddingSmall": "8px",
-    "paddingMedium": "16px",
-    "paddingLarge": "24px"
-  },
-  "euiPanelBorderRadiusModifiers": {
-    "borderRadiusNone": 0,
-    "borderRadiusMedium": "6px"
-  },
-  "euiPanelBackgroundColorModifiers": {
-    "transparent": "rgba(0, 0, 0, 0)",
-    "plain": "#1d1e24",
-    "subdued": "#141519",
-    "accent": "#4a2b39",
-    "accentSecondary": "#264341",
-    "primary": "#103148",
-    "success": "#264341",
-    "warning": "#493f22",
-    "danger": "#4a201e"
-  },
-  "euiBreakpoints": {
-    "xs": 0,
-    "s": "575px",
-    "m": "768px",
-    "l": "992px",
-    "xl": "1200px"
-  },
-  "euiBreakpointKeys": "'xs', 's', 'm', 'l', 'xl'",
-  "euiShadowColor": "#000000",
-  "euiShadows": {
-    "xs": {
-      "down": "0px 0.8px 0.8px 0px hsla(0,0%,0%,0.14), 0px 2.3px 2px 0px hsla(0,0%,0%,0.105)",
-      "up": "0px 0.8px 0.8px 0px hsla(0,0%,0%,0.14), 0px -2.3px 2px 0px hsla(0,0%,0%,0.105)"
-    },
-    "s": {
-      "down": "0px 0.7px 1.4px 0px hsla(0,0%,0%,0.245), 0px 1.9px 4px 0px hsla(0,0%,0%,0.175), 0px 4.5px 10px 0px hsla(0,0%,0%,0.175)",
-      "up": "0px 0.7px 1.4px 0px hsla(0,0%,0%,0.245), 0px -1.9px 4px 0px hsla(0,0%,0%,0.175), 0px -4.5px 10px 0px hsla(0,0%,0%,0.175)"
-    },
-    "m": {
-      "down": "0px 0.9px 4px 0px hsla(0,0%,0%,0.28), 0px 2.6px 8px 0px hsla(0,0%,0%,0.21), 0px 5.7px 12px 0px hsla(0,0%,0%,0.175), 0px 15px 15px 0px hsla(0,0%,0%,0.14)",
-      "up": "0px 0.9px 4px 0px hsla(0,0%,0%,0.28), 0px -2.6px 8px 0px hsla(0,0%,0%,0.21), 0px -5.7px 12px 0px hsla(0,0%,0%,0.175), 0px -15px 15px 0px hsla(0,0%,0%,0.14)"
-    },
-    "l": {
-      "down": "0px 1px 5px 0px hsla(0,0%,0%,0.350), 0px 3.6px 13px 0px hsla(0,0%,0%,0.245), 0px 8.4px 23px 0px hsla(0,0%,0%,0.21), 0px 23px 35px 0px hsla(0,0%,0%,0.175)",
-      "up": "0px 1px 5px 0px hsla(0,0%,0%,0.350), 0px -3.6px 13px 0px hsla(0,0%,0%,0.245), 0px -8.4px 23px 0px hsla(0,0%,0%,0.21), 0px -23px 35px 0px hsla(0,0%,0%,0.175)"
-    },
-    "xl": {
-      "down": "0px 2.7px 9px 0px hsla(0,0%,0%,0.455), 0px 9.4px 24px 0px hsla(0,0%,0%,0.315), 0px 21.8px 43px 0px hsla(0,0%,0%,0.28)",
-      "up": "0px 2.7px 9px 0px hsla(0,0%,0%,0.455), 0px -9.4px 24px 0px hsla(0,0%,0%,0.315), 0px -21.8px 43px 0px hsla(0,0%,0%,0.28)"
-    },
-    "hover": {
-      "base": {
-        "down": "0px 1.9px 4px 0px hsla(0,0%,0%,0.175), 0px 4.5px 10px 0px hsla(0,0%,0%,0.175)",
-        "up": "0px 1.9px 4px 0px hsla(0,0%,0%,0.175), 0px -4.5px 10px 0px hsla(0,0%,0%,0.175)"
-      },
-      "xl": {
-        "down": "none",
-        "up": "none"
-      }
-    },
-    "flat": {
-      "down": "0px 0px 0.8px 0px hsla(0,0%,0%,0.21), 0px 0px 2px 0px hsla(0,0%,0%,0.14), 0px 0px 5px 0px hsla(0,0%,0%,0.14), 0px 0px 17px 0px hsla(0,0%,0%,0.105)",
-      "up": "0px 0px 0.8px 0px hsla(0,0%,0%,0.21), 0px 0px 2px 0px hsla(0,0%,0%,0.14), 0px 0px 5px 0px hsla(0,0%,0%,0.14), 0px 0px 17px 0px hsla(0,0%,0%,0.105)"
-    }
-  },
-  "euiSize": "16px",
-  "euiSizeXS": "4px",
-  "euiSizeS": "8px",
-  "euiSizeM": "12px",
-  "euiSizeL": "24px",
-  "euiSizeXL": "32px",
-  "euiSizeXXL": "40px",
-  "euiScrollBar": "16px",
-  "euiScrollBarCorner": "4px",
-  "euiScrollBarCornerThin": "6px",
-  "euiFocusRingColor": "#36a2ef",
-  "euiFocusRingAnimStartColor": "rgba(54, 162, 239, 0)",
-  "euiFocusRingAnimStartSize": "2px",
-  "euiFocusRingAnimStartSizeLarge": "10px",
-  "euiFocusRingSizeLarge": "4px",
-  "euiFocusRingSize": "2px",
-  "euiFocusTransparency": 0.8,
-  "euiFocusTransparencyPercent": "80%",
-  "euiFocusBackgroundColor": "rgba(54, 162, 239, 0.19999999999999996)",
-  "euiFontFamily": "'Inter', '-apple-system', 'BlinkMacSystemFont', 'Segoe UI', 'Helvetica', 'Arial', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'",
-  "euiCodeFontFamily": "'Roboto Mono', 'Consolas', 'Menlo', 'Courier', monospace",
-  "euiFontFeatureSettings": "calt 1 kern 1 liga 1",
-  "euiTextScale": "2.125 1.6875 1.375 1.125 1 0.875 0.75",
-  "euiFontSize": "14px",
-  "euiFontSizeXS": "12px",
-  "euiFontSizeS": "14px",
-  "euiFontSizeM": "16px",
-  "euiFontSizeL": "22px",
-  "euiFontSizeXL": "27px",
-  "euiFontSizeXXL": "34px",
-  "euiLineHeight": 1.5,
-  "euiBodyLineHeight": 1.142857143,
-  "euiTitles": {
-    "xxxs": {
-      "font-size": "12px",
-      "line-height": "1.14286rem",
-      "font-weight": 700
-    },
-    "xxs": {
-      "font-size": "14px",
-      "line-height": "1.71429rem",
-      "font-weight": 700
-    },
-    "xs": {
-      "font-size": "16px",
-      "line-height": "1.71429rem",
-      "font-weight": 700
-    },
-    "s": {
-      "font-size": "22px",
-      "line-height": "2.28571rem",
-      "font-weight": 700
-    },
-    "m": {
-      "font-size": "27px",
-      "line-height": "2.28571rem",
-      "font-weight": 700
-    },
-    "l": {
-      "font-size": "34px",
-      "line-height": "2.85714rem",
-      "font-weight": 700
-    }
-  },
-  "euiZLevel0": 0,
-  "euiZLevel1": 1000,
-  "euiZLevel2": 2000,
-  "euiZLevel3": 3000,
-  "euiZLevel4": 4000,
-  "euiZLevel5": 5000,
-  "euiZLevel6": 6000,
-  "euiZLevel7": 7000,
-  "euiZLevel8": 8000,
-  "euiZLevel9": 9000,
-  "euiZToastList": 9000,
-  "euiZModal": 8000,
-  "euiZMask": 6000,
-  "euiZNavigation": 6000,
-  "euiZContentMenu": 2000,
-  "euiZHeader": 1000,
-  "euiZFlyout": 1000,
-  "euiZMaskBelowHeader": 1000,
-  "euiZContent": 0,
-  "euiPaletteColorBlind": {
-    "euiColorVis0": {
-      "graphic": "#54B399",
-      "behindText": "#6DCCB1"
-    },
-    "euiColorVis1": {
-      "graphic": "#6092C0",
-      "behindText": "#79AAD9"
-    },
-    "euiColorVis2": {
-      "graphic": "#D36086",
-      "behindText": "#EE789D"
-    },
-    "euiColorVis3": {
-      "graphic": "#9170B8",
-      "behindText": "#A987D1"
-    },
-    "euiColorVis4": {
-      "graphic": "#CA8EAE",
-      "behindText": "#E4A6C7"
-    },
-    "euiColorVis5": {
-      "graphic": "#D6BF57",
-      "behindText": "#F1D86F"
-    },
-    "euiColorVis6": {
-      "graphic": "#B9A888",
-      "behindText": "#D2C0A0"
-    },
-    "euiColorVis7": {
-      "graphic": "#DA8B45",
-      "behindText": "#F5A35C"
-    },
-    "euiColorVis8": {
-      "graphic": "#AA6556",
-      "behindText": "#C47C6C"
-    },
-    "euiColorVis9": {
-      "graphic": "#E7664C",
-      "behindText": "#FF7E62"
-    }
-  },
-  "euiPaletteColorBlindKeys": "'euiColorVis0', 'euiColorVis1', 'euiColorVis2', 'euiColorVis3', 'euiColorVis4', 'euiColorVis5', 'euiColorVis6', 'euiColorVis7', 'euiColorVis8', 'euiColorVis9'",
-  "euiColorVis0": "#54B399",
-  "euiColorVis1": "#6092C0",
-  "euiColorVis2": "#D36086",
-  "euiColorVis3": "#9170B8",
-  "euiColorVis4": "#CA8EAE",
-  "euiColorVis5": "#D6BF57",
-  "euiColorVis6": "#B9A888",
-  "euiColorVis7": "#DA8B45",
-  "euiColorVis8": "#AA6556",
-  "euiColorVis9": "#E7664C",
-  "euiColorVis0_behindText": "#6DCCB1",
-  "euiColorVis1_behindText": "#79AAD9",
-  "euiColorVis2_behindText": "#EE789D",
-  "euiColorVis3_behindText": "#A987D1",
-  "euiColorVis4_behindText": "#E4A6C7",
-  "euiColorVis5_behindText": "#F1D86F",
-  "euiColorVis6_behindText": "#D2C0A0",
-  "euiColorVis7_behindText": "#F5A35C",
-  "euiColorVis8_behindText": "#C47C6C",
-  "euiColorVis9_behindText": "#FF7E62",
-  "euiColorVisText0": "#7DE2D1",
-  "euiColorVisText1": "#1BA9F5",
-  "euiColorVisText2": "#F990C0",
-  "euiColorVisText3": "#BA9FDA",
-  "euiColorVisText4": "#E9B8D2",
-  "euiColorVisText5": "#F4E08C",
-  "euiColorVisText6": "#DBCDB3",
-  "euiColorVisText7": "#FFCE7A",
-  "euiColorVisText8": "#D09689",
-  "euiColorVisText9": "#F66",
-  "euiColorVisSuccess0": "#209280",
-  "euiColorVisSuccess1": "#54B399",
-  "euiColorVisWarning0": "#D6BF57",
-  "euiColorVisDanger0": "#CC5642",
-  "euiColorVisDanger1": "#E7664C",
-  "euiColorVisNeutral0": "#FFFFFF",
-  "euiColorVisGrey0": "#d3dae6",
-  "euiColorVisGrey1": "#98a2b3",
-  "euiColorVisGrey2": "#69707d",
-  "euiColorVisGrey3": "#343741",
-  "euiColorVisWarm0": "#FBFBDC",
-  "euiColorVisWarm1": "#DA8B45",
-  "euiColorVisWarm2": "#E7664C",
-  "euiColorVisCool0": "#EBEFF5",
-  "euiColorVisCool1": "#6092C0",
-  "euiColorVisCool2": "#6092C0",
-  "euiColorVisComplementary0": "#6092C0",
-  "euiColorVisComplementary1": "#DA8B45",
-  "euiColorSeverityUnknown": "#D3DAE6",
-  "euiColorSeverityNeutral": "#BECFE3",
-  "euiColorSeveritySuccess": "#54B399",
-  "euiColorSeverityWarning": "#D6BF57",
-  "euiColorSeverityRisk": "#DA8B45",
-  "euiColorSeverityDanger": "#E7664C",
-  "euiColorChartLines": "#343741",
-  "euiColorChartBand": "#2a2b33",
-  "euiColorGhost": "#ffffff",
-  "euiColorInk": "#000000",
-  "euiColorPrimary": "#36a2ef",
-  "euiColorAccent": "#f68fbe",
-  "euiColorAccentSecondary": "#7dded8",
-  "euiColorSuccess": "#7dded8",
-  "euiColorWarning": "#f3d371",
-  "euiColorDanger": "#f86b63",
-  "euiColorEmptyShade": "#1d1e24",
-  "euiColorLightestShade": "#25262e",
-  "euiColorLightShade": "#343741",
-  "euiColorMediumShade": "#535966",
-  "euiColorDarkShade": "#98a2b3",
-  "euiColorDarkestShade": "#d4dae5",
-  "euiColorFullShade": "#ffffff",
-  "euiPageBackgroundColor": "#141519",
-  "euiColorHighlight": "#2e2d25",
-  "euiTextColor": "#dfe5ef",
-  "euiTitleColor": "#dfe5ef",
-  "euiTextSubduedColor": "#7a7f89",
-  "euiColorDisabled": "#515761",
-  "euiColorPrimaryText": "#36a2ef",
-  "euiColorSuccessText": "#7dded8",
-  "euiColorAccentText": "#f68fbe",
-  "euiColorWarningText": "#f3d371",
-  "euiColorDangerText": "#f86b63",
-  "euiColorDisabledText": "#515761",
-  "euiLinkColor": "#36a2ef",
-  "euiColorPlainLight": "#FFFFFF",
-  "euiColorPlainDark": "#000000",
-  "euiColorTextPrimary": "#36a2ef",
-  "euiColorTextAccent": "#f68fbe",
-  "euiColorTextAccentSecondary": "#7dded8",
-  "euiColorTextNeutral": "#becfe3",
-  "euiColorTextSuccess": "#7dded8",
-  "euiColorTextWarning": "#f3d371",
-  "euiColorTextRisk": "#da8b45",
-  "euiColorTextDanger": "#f86b63",
-  "euiColorTextParagraph": "#DFE5EF",
-  "euiColorTextHeading": "#DFE5EF",
-  "euiColorTextSubdued": "#81858f",
-  "euiColorTextDisabled": "#515761",
-  "euiColorTextInverse": "#000000",
-  "euiColorBackgroundBasePrimary": "#0b2030",
-  "euiColorBackgroundBaseAccent": "#311d26",
-  "euiColorBackgroundBaseAccentSecondary": "#192c2b",
-  "euiColorBackgroundBaseNeutral": "#26292d",
-  "euiColorBackgroundBaseSuccess": "#192c2b",
-  "euiColorBackgroundBaseWarning": "#312a17",
-  "euiColorBackgroundBaseRisk": "#2c1c0e",
-  "euiColorBackgroundBaseDanger": "#321514",
-  "euiColorBackgroundBaseSubdued": "#141519",
-  "euiColorBackgroundBaseDisabled": "#515761",
-  "euiColorBackgroundBaseHighlighted": "#141519",
-  "euiColorBackgroundBasePlain": "#1D1E24",
-  "euiColorBackgroundBaseFormsPrepend": "#2c2f37",
-  "euiColorBackgroundBaseFormsControlDisabled": "#535966",
-  "euiColorBackgroundBaseInteractiveHover": "rgba(52,55,65,0.2)",
-  "euiColorBackgroundBaseInteractiveSelect": "#103148",
-  "euiColorBackgroundBaseInteractiveSelectHover": "#164160",
-  "euiColorBackgroundBaseInteractiveOverlay": "rgba(0,0,0,0.5)",
-  "euiColorBackgroundBaseSkeletonEdge": "#2e3039",
-  "euiColorBackgroundBaseSkeletonMiddle": "#282a31",
-  "euiColorBackgroundLightPrimary": "#103148",
-  "euiColorBackgroundLightAccent": "#4a2b39",
-  "euiColorBackgroundLightAccentSecondary": "#264341",
-  "euiColorBackgroundLightNeutral": "#393e44",
-  "euiColorBackgroundLightSuccess": "#264341",
-  "euiColorBackgroundLightWarning": "#493f22",
-  "euiColorBackgroundLightRisk": "#412a15",
-  "euiColorBackgroundLightDanger": "#4a201e",
-  "euiColorBackgroundLightText": "#2a2c34",
-  "euiColorBackgroundFilledPrimary": "#36A2EF",
-  "euiColorBackgroundFilledAccent": "#F68FBE",
-  "euiColorBackgroundFilledAccentSecondary": "#7DDED8",
-  "euiColorBackgroundFilledNeutral": "#BECFE3",
-  "euiColorBackgroundFilledSuccess": "#7DDED8",
-  "euiColorBackgroundFilledWarning": "#F3D371",
-  "euiColorBackgroundFilledRisk": "#DA8B45",
-  "euiColorBackgroundFilledDanger": "#F86B63",
-  "euiColorBackgroundFilledText": "#DFE5EF",
-  "euiColorBorderBasePrimary": "#164160",
-  "euiColorBorderBaseAccent": "#62394c",
-  "euiColorBorderBaseAccentSecondary": "#325956",
-  "euiColorBorderBaseNeutral": "#4c535b",
-  "euiColorBorderBaseSuccess": "#325956",
-  "euiColorBorderBaseWarning": "#927f44",
-  "euiColorBorderBaseRisk": "#835329",
-  "euiColorBorderBaseDanger": "#632b28",
-  "euiColorBorderBaseSubdued": "#343741",
-  "euiColorBorderBaseDisabled": "rgba(255,255,255,0.1)",
-  "euiColorBorderBasePlain": "#343741",
-  "euiColorBorderBaseFloating": "transparent",
-  "euiColorBorderBaseFormsColorSwatch": "rgba(255,255,255,0.1)",
-  "euiColorBorderBaseFormsControl": "#69696f",
-  "euiColorBorderInteractiveFormsHoverPlain": "transparent",
-  "euiColorBorderInteractiveFormsHoverDanger": "transparent",
-  "euiColorBorderStrongPrimary": "#36A2EF",
-  "euiColorBorderStrongAccent": "#F68FBE",
-  "euiColorBorderStrongAccentSecondary": "#7DDED8",
-  "euiColorBorderStrongNeutral": "#B9CFE3",
-  "euiColorBorderStrongSuccess": "#7DDED8",
-  "euiColorBorderStrongWarning": "#F3D371",
-  "euiColorBorderStrongRisk": "#E1A26A",
-  "euiColorBorderStrongDanger": "#F86B63",
-  "euiColorBorderStrongText": "#98A2B3"
-}
diff --git a/packages/eui/src/themes/json/eui_theme_amsterdam_dark.json.d.ts b/packages/eui/src/themes/json/eui_theme_amsterdam_dark.json.d.ts
deleted file mode 100644
index 01f75568e29..00000000000
--- a/packages/eui/src/themes/json/eui_theme_amsterdam_dark.json.d.ts
+++ /dev/null
@@ -1,466 +0,0 @@
-declare module '@elastic/eui/dist/eui_theme_amsterdam_dark.json' {
-  const sassVariables: {
-    euiZDataGrid: number;
-    euiZHeaderBelowDataGrid: number;
-    euiZDataGridCellPopover: number;
-    euiDataGridCellPaddingS: string;
-    euiDataGridCellPaddingM: string;
-    euiDataGridCellPaddingL: string;
-    euiTableHoverColor: string;
-    euiTableSelectedColor: string;
-    euiTableHoverSelectedColor: string;
-    euiTableActionsBorderColor: string;
-    euiTableHoverClickableColor: string;
-    euiTableFocusClickableColor: string;
-    euiContrastRatioText: number;
-    euiContrastRatioGraphic: number;
-    euiContrastRatioDisabled: number;
-    euiAnimSlightBounce: string;
-    euiAnimSlightResistance: string;
-    euiAnimSpeedExtraFast: string;
-    euiAnimSpeedFast: string;
-    euiAnimSpeedNormal: string;
-    euiAnimSpeedSlow: string;
-    euiAnimSpeedExtraSlow: string;
-    euiBorderWidthThin: string;
-    euiBorderWidthThick: string;
-    euiBorderColor: string;
-    euiBorderRadius: string;
-    euiBorderRadiusSmall: string;
-    euiBorderThick: string;
-    euiBorderThin: string;
-    euiBorderEditable: string;
-    euiButtonHeight: string;
-    euiButtonHeightSmall: string;
-    euiButtonHeightXSmall: string;
-    euiButtonColorDisabled: string;
-    euiButtonColorDisabledText: string;
-    euiButtonColorGhostDisabled: string;
-    euiButtonTypes: {
-      primary: string;
-      accent: string;
-      accentSecondary: string;
-      neutral: string;
-      success: string;
-      warning: string;
-      risk: string;
-      danger: string;
-      ghost: string;
-      text: string;
-    };
-    euiFontWeightLight: number;
-    euiFontWeightRegular: number;
-    euiFontWeightMedium: number;
-    euiFontWeightSemiBold: number;
-    euiFontWeightBold: number;
-    euiCodeFontWeightRegular: number;
-    euiCodeFontWeightBold: number;
-    euiFormMaxWidth: string;
-    euiFormControlHeight: string;
-    euiFormControlCompressedHeight: string;
-    euiFormControlPadding: string;
-    euiFormControlCompressedPadding: string;
-    euiFormControlBorderRadius: string;
-    euiFormControlCompressedBorderRadius: string;
-    euiRadioSize: string;
-    euiCheckBoxSize: string;
-    euiCheckboxBorderRadius: string;
-    euiSwitchHeight: string;
-    euiSwitchWidth: string;
-    euiSwitchThumbSize: string;
-    euiSwitchIconHeight: string;
-    euiSwitchHeightCompressed: string;
-    euiSwitchWidthCompressed: string;
-    euiSwitchThumbSizeCompressed: string;
-    euiSwitchHeightMini: string;
-    euiSwitchWidthMini: string;
-    euiSwitchThumbSizeMini: string;
-    euiFormBackgroundColor: string;
-    euiFormBackgroundDisabledColor: string;
-    euiFormBackgroundReadOnlyColor: string;
-    euiFormBorderOpaqueColor: string;
-    euiFormBorderColor: string;
-    euiFormBorderDisabledColor: string;
-    euiFormCustomControlDisabledIconColor: string;
-    euiFormCustomControlBorderColor: string;
-    euiFormControlDisabledColor: string;
-    euiFormControlBoxShadow: string;
-    euiFormControlPlaceholderText: string;
-    euiFormInputGroupLabelBackground: string;
-    euiFormInputGroupBorder: string;
-    euiSwitchOffColor: string;
-    euiFormControlIconSizes: {
-      small: string;
-      medium: string;
-      large: string;
-      xLarge: string;
-      xxLarge: string;
-    };
-    euiFormControlLayoutGroupInputHeight: string;
-    euiFormControlLayoutGroupInputCompressedHeight: string;
-    euiFormControlLayoutGroupInputCompressedBorderRadius: string;
-    euiHeaderBackgroundColor: string;
-    euiHeaderDarkBackgroundColor: string;
-    euiHeaderBorderColor: string;
-    euiHeaderBreadcrumbColor: string;
-    euiHeaderHeight: string;
-    euiHeaderChildSize: string;
-    euiHeaderHeightCompensation: string;
-    euiPageDefaultMaxWidth: string;
-    euiPageSidebarMinWidth: string;
-    euiPanelPaddingModifiers: {
-      paddingSmall: string;
-      paddingMedium: string;
-      paddingLarge: string;
-    };
-    euiPanelBorderRadiusModifiers: {
-      borderRadiusNone: number;
-      borderRadiusMedium: string;
-    };
-    euiPanelBackgroundColorModifiers: {
-      transparent: string;
-      plain: string;
-      subdued: string;
-      accent: string;
-      accentSecondary: string;
-      primary: string;
-      success: string;
-      warning: string;
-      danger: string;
-    };
-    euiBreakpoints: {
-      xs: number;
-      s: string;
-      m: string;
-      l: string;
-      xl: string;
-    };
-    euiBreakpointKeys: string;
-    euiShadowColor: string;
-    euiShadows: {
-      xs: {
-        down: string;
-        up: string;
-      };
-      s: {
-        down: string;
-        up: string;
-      };
-      m: {
-        down: string;
-        up: string;
-      };
-      l: {
-        down: string;
-        up: string;
-      };
-      xl: {
-        down: string;
-        up: string;
-      };
-      hover: {
-        base: {
-          down: string;
-          up: string;
-        };
-        xl: {
-          down: string;
-          up: string;
-        };
-      };
-      flat: {
-        down: string;
-        up: string;
-      };
-    };
-    euiSize: string;
-    euiSizeXS: string;
-    euiSizeS: string;
-    euiSizeM: string;
-    euiSizeL: string;
-    euiSizeXL: string;
-    euiSizeXXL: string;
-    euiScrollBar: string;
-    euiScrollBarCorner: string;
-    euiScrollBarCornerThin: string;
-    euiFocusRingColor: string;
-    euiFocusRingAnimStartColor: string;
-    euiFocusRingAnimStartSize: string;
-    euiFocusRingAnimStartSizeLarge: string;
-    euiFocusRingSizeLarge: string;
-    euiFocusRingSize: string;
-    euiFocusTransparency: number;
-    euiFocusTransparencyPercent: string;
-    euiFocusBackgroundColor: string;
-    euiFontFamily: string;
-    euiCodeFontFamily: string;
-    euiFontFeatureSettings: string;
-    euiTextScale: string;
-    euiFontSize: string;
-    euiFontSizeXS: string;
-    euiFontSizeS: string;
-    euiFontSizeM: string;
-    euiFontSizeL: string;
-    euiFontSizeXL: string;
-    euiFontSizeXXL: string;
-    euiLineHeight: number;
-    euiBodyLineHeight: number;
-    euiTitles: {
-      xxxs: {
-        'font-size': string;
-        'line-height': string;
-        'font-weight': number;
-      };
-      xxs: {
-        'font-size': string;
-        'line-height': string;
-        'font-weight': number;
-      };
-      xs: {
-        'font-size': string;
-        'line-height': string;
-        'font-weight': number;
-      };
-      s: {
-        'font-size': string;
-        'line-height': string;
-        'font-weight': number;
-      };
-      m: {
-        'font-size': string;
-        'line-height': string;
-        'font-weight': number;
-      };
-      l: {
-        'font-size': string;
-        'line-height': string;
-        'font-weight': number;
-      };
-    };
-    euiZLevel0: number;
-    euiZLevel1: number;
-    euiZLevel2: number;
-    euiZLevel3: number;
-    euiZLevel4: number;
-    euiZLevel5: number;
-    euiZLevel6: number;
-    euiZLevel7: number;
-    euiZLevel8: number;
-    euiZLevel9: number;
-    euiZToastList: number;
-    euiZModal: number;
-    euiZMask: number;
-    euiZNavigation: number;
-    euiZContentMenu: number;
-    euiZHeader: number;
-    euiZFlyout: number;
-    euiZMaskBelowHeader: number;
-    euiZContent: number;
-    euiPaletteColorBlind: {
-      euiColorVis0: {
-        graphic: string;
-        behindText: string;
-      };
-      euiColorVis1: {
-        graphic: string;
-        behindText: string;
-      };
-      euiColorVis2: {
-        graphic: string;
-        behindText: string;
-      };
-      euiColorVis3: {
-        graphic: string;
-        behindText: string;
-      };
-      euiColorVis4: {
-        graphic: string;
-        behindText: string;
-      };
-      euiColorVis5: {
-        graphic: string;
-        behindText: string;
-      };
-      euiColorVis6: {
-        graphic: string;
-        behindText: string;
-      };
-      euiColorVis7: {
-        graphic: string;
-        behindText: string;
-      };
-      euiColorVis8: {
-        graphic: string;
-        behindText: string;
-      };
-      euiColorVis9: {
-        graphic: string;
-        behindText: string;
-      };
-    };
-    euiPaletteColorBlindKeys: string;
-    euiColorVis0: string;
-    euiColorVis1: string;
-    euiColorVis2: string;
-    euiColorVis3: string;
-    euiColorVis4: string;
-    euiColorVis5: string;
-    euiColorVis6: string;
-    euiColorVis7: string;
-    euiColorVis8: string;
-    euiColorVis9: string;
-    euiColorVis0_behindText: string;
-    euiColorVis1_behindText: string;
-    euiColorVis2_behindText: string;
-    euiColorVis3_behindText: string;
-    euiColorVis4_behindText: string;
-    euiColorVis5_behindText: string;
-    euiColorVis6_behindText: string;
-    euiColorVis7_behindText: string;
-    euiColorVis8_behindText: string;
-    euiColorVis9_behindText: string;
-    euiColorVisText0: string;
-    euiColorVisText1: string;
-    euiColorVisText2: string;
-    euiColorVisText3: string;
-    euiColorVisText4: string;
-    euiColorVisText5: string;
-    euiColorVisText6: string;
-    euiColorVisText7: string;
-    euiColorVisText8: string;
-    euiColorVisText9: string;
-    euiColorVisSuccess0: string;
-    euiColorVisSuccess1: string;
-    euiColorVisWarning0: string;
-    euiColorVisDanger0: string;
-    euiColorVisDanger1: string;
-    euiColorVisNeutral0: string;
-    euiColorVisGrey0: string;
-    euiColorVisGrey1: string;
-    euiColorVisGrey2: string;
-    euiColorVisGrey3: string;
-    euiColorVisWarm0: string;
-    euiColorVisWarm1: string;
-    euiColorVisWarm2: string;
-    euiColorVisCool0: string;
-    euiColorVisCool1: string;
-    euiColorVisCool2: string;
-    euiColorVisComplementary0: string;
-    euiColorVisComplementary1: string;
-    euiColorSeverityUnknown: string;
-    euiColorSeverityNeutral: string;
-    euiColorSeveritySuccess: string;
-    euiColorSeverityWarning: string;
-    euiColorSeverityRisk: string;
-    euiColorSeverityDanger: string;
-    euiColorChartLines: string;
-    euiColorChartBand: string;
-    euiColorGhost: string;
-    euiColorInk: string;
-    euiColorPrimary: string;
-    euiColorAccent: string;
-    euiColorAccentSecondary: string;
-    euiColorSuccess: string;
-    euiColorWarning: string;
-    euiColorDanger: string;
-    euiColorEmptyShade: string;
-    euiColorLightestShade: string;
-    euiColorLightShade: string;
-    euiColorMediumShade: string;
-    euiColorDarkShade: string;
-    euiColorDarkestShade: string;
-    euiColorFullShade: string;
-    euiPageBackgroundColor: string;
-    euiColorHighlight: string;
-    euiTextColor: string;
-    euiTitleColor: string;
-    euiTextSubduedColor: string;
-    euiColorDisabled: string;
-    euiColorPrimaryText: string;
-    euiColorSuccessText: string;
-    euiColorAccentText: string;
-    euiColorWarningText: string;
-    euiColorDangerText: string;
-    euiColorDisabledText: string;
-    euiLinkColor: string;
-    euiColorPlainLight: string;
-    euiColorPlainDark: string;
-    euiColorTextPrimary: string;
-    euiColorTextAccent: string;
-    euiColorTextAccentSecondary: string;
-    euiColorTextNeutral: string;
-    euiColorTextSuccess: string;
-    euiColorTextWarning: string;
-    euiColorTextRisk: string;
-    euiColorTextDanger: string;
-    euiColorTextParagraph: string;
-    euiColorTextHeading: string;
-    euiColorTextSubdued: string;
-    euiColorTextDisabled: string;
-    euiColorTextInverse: string;
-    euiColorBackgroundBasePrimary: string;
-    euiColorBackgroundBaseAccent: string;
-    euiColorBackgroundBaseAccentSecondary: string;
-    euiColorBackgroundBaseNeutral: string;
-    euiColorBackgroundBaseSuccess: string;
-    euiColorBackgroundBaseWarning: string;
-    euiColorBackgroundBaseRisk: string;
-    euiColorBackgroundBaseDanger: string;
-    euiColorBackgroundBaseSubdued: string;
-    euiColorBackgroundBasePlain: string;
-    euiColorBackgroundBaseDisabled: string;
-    euiColorBackgroundBaseHighlighted: string;
-    euiColorBackgroundBaseFormsPrepend: string;
-    euiColorBackgroundBaseFormsControlDisabled: string;
-    euiColorBackgroundBaseInteractiveHover: string;
-    euiColorBackgroundBaseInteractiveSelect: string;
-    euiColorBackgroundBaseInteractiveSelectHover: string;
-    euiColorBackgroundBaseInteractiveOverlay: string;
-    euiColorBackgroundBaseSkeletonEdge: string;
-    euiColorBackgroundBaseSkeletonMiddle: string;
-    euiColorBackgroundLightPrimary: string;
-    euiColorBackgroundLightAccent: string;
-    euiColorBackgroundLightAccentSecondary: string;
-    euiColorBackgroundLightNeutral: string;
-    euiColorBackgroundLightSuccess: string;
-    euiColorBackgroundLightWarning: string;
-    euiColorBackgroundLightRisk: string;
-    euiColorBackgroundLightDanger: string;
-    euiColorBackgroundLightText: string;
-    euiColorBackgroundFilledPrimary: string;
-    euiColorBackgroundFilledAccent: string;
-    euiColorBackgroundFilledAccentSecondary: string;
-    euiColorBackgroundFilledNeutral: string;
-    euiColorBackgroundFilledSuccess: string;
-    euiColorBackgroundFilledWarning: string;
-    euiColorBackgroundFilledRisk: string;
-    euiColorBackgroundFilledDanger: string;
-    euiColorBackgroundFilledText: string;
-    euiColorBorderBasePrimary: string;
-    euiColorBorderBaseAccent: string;
-    euiColorBorderBaseAccentSecondary: string;
-    euiColorBorderBaseNeutral: string;
-    euiColorBorderBaseSuccess: string;
-    euiColorBorderBaseWarning: string;
-    euiColorBorderBaseRisk: string;
-    euiColorBorderBaseDanger: string;
-    euiColorBorderBasePlain: string;
-    euiColorBorderBaseSubdued: string;
-    euiColorBorderBaseDisabled: string;
-    euiColorBorderBaseFloating: string;
-    euiColorBorderBaseFormsColorSwatch: string;
-    euiColorBorderBaseFormsControl: string;
-    euiColorBorderInteractiveFormsHoverPlain: string;
-    euiColorBorderInteractiveFormsHoverDanger: string;
-    euiColorBorderStrongPrimary: string;
-    euiColorBorderStrongAccent: string;
-    euiColorBorderStrongAccentSecondary: string;
-    euiColorBorderStrongNeutral: string;
-    euiColorBorderStrongSuccess: string;
-    euiColorBorderStrongWarning: string;
-    euiColorBorderStrongRisk: string;
-    euiColorBorderStrongDanger: string;
-    euiColorBorderStrongText: string;
-  };
-  export default sassVariables;
-}
diff --git a/packages/eui/src/themes/json/eui_theme_amsterdam_light.json b/packages/eui/src/themes/json/eui_theme_amsterdam_light.json
deleted file mode 100644
index 9ad8808242f..00000000000
--- a/packages/eui/src/themes/json/eui_theme_amsterdam_light.json
+++ /dev/null
@@ -1,463 +0,0 @@
-{
-  "euiZDataGrid": 999,
-  "euiZHeaderBelowDataGrid": 998,
-  "euiZDataGridCellPopover": 1000,
-  "euiDataGridCellPaddingS": "4px",
-  "euiDataGridCellPaddingM": "6px",
-  "euiDataGridCellPaddingL": "8px",
-  "euiTableHoverColor": "#fafbfd",
-  "euiTableSelectedColor": "rgba(227, 240, 249, 0.37)",
-  "euiTableHoverSelectedColor": "rgba(0, 119, 204, 0.09999999999999998)",
-  "euiTableActionsBorderColor": "rgba(152, 162, 179, 0.09999999999999998)",
-  "euiTableHoverClickableColor": "rgba(0, 119, 204, 0.050000000000000044)",
-  "euiTableFocusClickableColor": "rgba(0, 119, 204, 0.09999999999999998)",
-  "euiContrastRatioText": 4.5,
-  "euiContrastRatioGraphic": 3,
-  "euiContrastRatioDisabled": 2,
-  "euiAnimSlightBounce": "cubic-bezier(0.34, 1.61, 0.7, 1)",
-  "euiAnimSlightResistance": "cubic-bezier(0.694, 0.0482, 0.335, 1)",
-  "euiAnimSpeedExtraFast": "90ms",
-  "euiAnimSpeedFast": "150ms",
-  "euiAnimSpeedNormal": "250ms",
-  "euiAnimSpeedSlow": "350ms",
-  "euiAnimSpeedExtraSlow": "500ms",
-  "euiBorderWidthThin": "1px",
-  "euiBorderWidthThick": "2px",
-  "euiBorderColor": "#d3dae6",
-  "euiBorderRadius": "6px",
-  "euiBorderRadiusSmall": "4px",
-  "euiBorderThick": "2px solid #d3dae6",
-  "euiBorderThin": "1px solid #d3dae6",
-  "euiBorderEditable": "2px dotted #d3dae6",
-  "euiButtonHeight": "40px",
-  "euiButtonHeightSmall": "32px",
-  "euiButtonHeightXSmall": "24px",
-  "euiButtonColorDisabled": "#abb4c4",
-  "euiButtonColorDisabledText": "#abb4c4",
-  "euiButtonColorGhostDisabled": "#69707d",
-  "euiButtonTypes": {
-    "primary": "#0077cc",
-    "accent": "#f04e98",
-    "accentSecondary": "#00bfb3",
-    "neutral": "#bedfe3",
-    "success": "#00bfb3",
-    "warning": "#fec514",
-    "risk": "#da8b45",
-    "danger": "#bd271e",
-    "ghost": "#ffffff",
-    "text": "#69707d"
-  },
-  "euiFontWeightLight": 300,
-  "euiFontWeightRegular": 400,
-  "euiFontWeightMedium": 500,
-  "euiFontWeightSemiBold": 600,
-  "euiFontWeightBold": 700,
-  "euiCodeFontWeightRegular": 400,
-  "euiCodeFontWeightBold": 700,
-  "euiFormMaxWidth": "400px",
-  "euiFormControlHeight": "40px",
-  "euiFormControlCompressedHeight": "32px",
-  "euiFormControlPadding": "12px",
-  "euiFormControlCompressedPadding": "8px",
-  "euiFormControlBorderRadius": "6px",
-  "euiFormControlCompressedBorderRadius": "4px",
-  "euiRadioSize": "16px",
-  "euiCheckBoxSize": "16px",
-  "euiCheckboxBorderRadius": "4px",
-  "euiSwitchHeight": "20px",
-  "euiSwitchWidth": "44px",
-  "euiSwitchThumbSize": "20px",
-  "euiSwitchIconHeight": "16px",
-  "euiSwitchHeightCompressed": "16px",
-  "euiSwitchWidthCompressed": "28px",
-  "euiSwitchThumbSizeCompressed": "16px",
-  "euiSwitchHeightMini": "10px",
-  "euiSwitchWidthMini": "22px",
-  "euiSwitchThumbSizeMini": "10px",
-  "euiFormBackgroundColor": "#fbfcfd",
-  "euiFormBackgroundDisabledColor": "#eef2f7",
-  "euiFormBackgroundReadOnlyColor": "#ffffff",
-  "euiFormBorderOpaqueColor": "#112b86",
-  "euiFormBorderColor": "rgba(17, 43, 134, 0.09999999999999998)",
-  "euiFormBorderDisabledColor": "rgba(17, 43, 134, 0.09999999999999998)",
-  "euiFormCustomControlDisabledIconColor": "#5e646f",
-  "euiFormCustomControlBorderColor": "#c9cbcd",
-  "euiFormControlDisabledColor": "#98a2b3",
-  "euiFormControlBoxShadow": "0 0 rgba(0, 0, 0, 0)",
-  "euiFormControlPlaceholderText": "#69707d",
-  "euiFormInputGroupLabelBackground": "#e9edf3",
-  "euiFormInputGroupBorder": "none",
-  "euiSwitchOffColor": "rgba(152, 162, 179, 0.19999999999999996)",
-  "euiFormControlIconSizes": {
-    "small": "12px",
-    "medium": "16px",
-    "large": "24px",
-    "xLarge": "32px",
-    "xxLarge": "40px"
-  },
-  "euiFormControlLayoutGroupInputHeight": "38px",
-  "euiFormControlLayoutGroupInputCompressedHeight": "30px",
-  "euiFormControlLayoutGroupInputCompressedBorderRadius": "2px",
-  "euiHeaderBackgroundColor": "#ffffff",
-  "euiHeaderDarkBackgroundColor": "#25282f",
-  "euiHeaderBorderColor": "#cdd3df",
-  "euiHeaderBreadcrumbColor": "#343741",
-  "euiHeaderHeight": "48px",
-  "euiHeaderChildSize": "40px",
-  "euiHeaderHeightCompensation": "48px",
-  "euiPageDefaultMaxWidth": "1200px",
-  "euiPageSidebarMinWidth": "192px",
-  "euiPanelPaddingModifiers": {
-    "paddingSmall": "8px",
-    "paddingMedium": "16px",
-    "paddingLarge": "24px"
-  },
-  "euiPanelBorderRadiusModifiers": {
-    "borderRadiusNone": 0,
-    "borderRadiusMedium": "6px"
-  },
-  "euiPanelBackgroundColorModifiers": {
-    "transparent": "rgba(0, 0, 0, 0)",
-    "plain": "#ffffff",
-    "subdued": "#fafbfd",
-    "accent": "#feedf5",
-    "accentSecondary": "#e6f9f7",
-    "primary": "#e6f1fa",
-    "success": "#e6f9f7",
-    "warning": "#fff9e8",
-    "danger": "#f8e9e9"
-  },
-  "euiBreakpoints": {
-    "xs": 0,
-    "s": "575px",
-    "m": "768px",
-    "l": "992px",
-    "xl": "1200px"
-  },
-  "euiBreakpointKeys": "'xs', 's', 'm', 'l', 'xl'",
-  "euiShadowColor": "#000000",
-  "euiShadows": {
-    "xs": {
-      "down": "0px 0.8px 0.8px 0px hsla(0,0%,0%,0.04), 0px 2.3px 2px 0px hsla(0,0%,0%,0.03)",
-      "up": "0px 0.8px 0.8px 0px hsla(0,0%,0%,0.04), 0px -2.3px 2px 0px hsla(0,0%,0%,0.03)"
-    },
-    "s": {
-      "down": "0px 0.7px 1.4px 0px hsla(0,0%,0%,0.07), 0px 1.9px 4px 0px hsla(0,0%,0%,0.05), 0px 4.5px 10px 0px hsla(0,0%,0%,0.05)",
-      "up": "0px 0.7px 1.4px 0px hsla(0,0%,0%,0.07), 0px -1.9px 4px 0px hsla(0,0%,0%,0.05), 0px -4.5px 10px 0px hsla(0,0%,0%,0.05)"
-    },
-    "m": {
-      "down": "0px 0.9px 4px 0px hsla(0,0%,0%,0.08), 0px 2.6px 8px 0px hsla(0,0%,0%,0.06), 0px 5.7px 12px 0px hsla(0,0%,0%,0.05), 0px 15px 15px 0px hsla(0,0%,0%,0.04)",
-      "up": "0px 0.9px 4px 0px hsla(0,0%,0%,0.08), 0px -2.6px 8px 0px hsla(0,0%,0%,0.06), 0px -5.7px 12px 0px hsla(0,0%,0%,0.05), 0px -15px 15px 0px hsla(0,0%,0%,0.04)"
-    },
-    "l": {
-      "down": "0px 1px 5px 0px hsla(0,0%,0%,0.1), 0px 3.6px 13px 0px hsla(0,0%,0%,0.07), 0px 8.4px 23px 0px hsla(0,0%,0%,0.06), 0px 23px 35px 0px hsla(0,0%,0%,0.05)",
-      "up": "0px 1px 5px 0px hsla(0,0%,0%,0.1), 0px -3.6px 13px 0px hsla(0,0%,0%,0.07), 0px -8.4px 23px 0px hsla(0,0%,0%,0.06), 0px -23px 35px 0px hsla(0,0%,0%,0.05)"
-    },
-    "xl": {
-      "down": "0px 2.7px 9px 0px hsla(0,0%,0%,0.13), 0px 9.4px 24px 0px hsla(0,0%,0%,0.09), 0px 21.8px 43px 0px hsla(0,0%,0%,0.08)",
-      "up": "0px 2.7px 9px 0px hsla(0,0%,0%,0.13), 0px -9.4px 24px 0px hsla(0,0%,0%,0.09), 0px -21.8px 43px 0px hsla(0,0%,0%,0.08)"
-   },
-    "hover": {
-      "base": {
-        "down": "0px 1.9px 4px 0px hsla(0,0%,0%,0.05), 0px 4.5px 10px 0px hsla(0,0%,0%,0.05)",
-        "up": "0px 1.9px 4px 0px hsla(0,0%,0%,0.05), 0px -4.5px 10px 0px hsla(0,0%,0%,0.05)"
-      },
-      "xl": {
-        "down": "none",
-        "up": "none"
-      }
-    },
-    "flat": {
-      "down": "0px 0px 0.8px 0px hsla(0,0%,0%,0.06), 0px 0px 2px 0px hsla(0,0%,0%,0.04), 0px 0px 5px 0px hsla(0,0%,0%,0.04), 0px 0px 17px 0px hsla(0,0%,0%,0.03)",
-      "up": "0px 0px 0.8px 0px hsla(0,0%,0%,0.06), 0px 0px 2px 0px hsla(0,0%,0%,0.04), 0px 0px 5px 0px hsla(0,0%,0%,0.04), 0px 0px 17px 0px hsla(0,0%,0%,0.03)"
-    }
-  },
-  "euiSize": "16px",
-  "euiSizeXS": "4px",
-  "euiSizeS": "8px",
-  "euiSizeM": "12px",
-  "euiSizeL": "24px",
-  "euiSizeXL": "32px",
-  "euiSizeXXL": "40px",
-  "euiScrollBar": "16px",
-  "euiScrollBarCorner": "4px",
-  "euiScrollBarCornerThin": "6px",
-  "euiFocusRingColor": "#0071c2",
-  "euiFocusRingAnimStartColor": "rgba(0, 119, 204, 0)",
-  "euiFocusRingAnimStartSize": "2px",
-  "euiFocusRingAnimStartSizeLarge": "10px",
-  "euiFocusRingSizeLarge": "4px",
-  "euiFocusRingSize": "2px",
-  "euiFocusTransparency": 0.9,
-  "euiFocusTransparencyPercent": "90%",
-  "euiFocusBackgroundColor": "rgba(0, 119, 204, 0.09999999999999998)",
-  "euiFontFamily": "'Inter', '-apple-system', 'BlinkMacSystemFont', 'Segoe UI', 'Helvetica', 'Arial', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'",
-  "euiCodeFontFamily": "'Roboto Mono', 'Consolas', 'Menlo', 'Courier', monospace",
-  "euiFontFeatureSettings": "calt 1 kern 1 liga 1",
-  "euiTextScale": "2.125 1.6875 1.375 1.125 1 0.875 0.75",
-  "euiFontSize": "14px",
-  "euiFontSizeXS": "12px",
-  "euiFontSizeS": "14px",
-  "euiFontSizeM": "16px",
-  "euiFontSizeL": "22px",
-  "euiFontSizeXL": "27px",
-  "euiFontSizeXXL": "34px",
-  "euiLineHeight": 1.5,
-  "euiBodyLineHeight": 1.142857143,
-  "euiTitles": {
-    "xxxs": {
-      "font-size": "12px",
-      "line-height": "1.14286rem",
-      "font-weight": 700
-    },
-    "xxs": {
-      "font-size": "14px",
-      "line-height": "1.71429rem",
-      "font-weight": 700
-    },
-    "xs": {
-      "font-size": "16px",
-      "line-height": "1.71429rem",
-      "font-weight": 700
-    },
-    "s": {
-      "font-size": "22px",
-      "line-height": "2.28571rem",
-      "font-weight": 700
-    },
-    "m": {
-      "font-size": "27px",
-      "line-height": "2.28571rem",
-      "font-weight": 700
-    },
-    "l": {
-      "font-size": "34px",
-      "line-height": "2.85714rem",
-      "font-weight": 700
-    }
-  },
-  "euiZLevel0": 0,
-  "euiZLevel1": 1000,
-  "euiZLevel2": 2000,
-  "euiZLevel3": 3000,
-  "euiZLevel4": 4000,
-  "euiZLevel5": 5000,
-  "euiZLevel6": 6000,
-  "euiZLevel7": 7000,
-  "euiZLevel8": 8000,
-  "euiZLevel9": 9000,
-  "euiZToastList": 9000,
-  "euiZModal": 8000,
-  "euiZMask": 6000,
-  "euiZNavigation": 6000,
-  "euiZContentMenu": 2000,
-  "euiZHeader": 1000,
-  "euiZFlyout": 1000,
-  "euiZMaskBelowHeader": 1000,
-  "euiZContent": 0,
-  "euiPaletteColorBlind": {
-    "euiColorVis0": {
-      "graphic": "#54B399",
-      "behindText": "#6DCCB1"
-    },
-    "euiColorVis1": {
-      "graphic": "#6092C0",
-      "behindText": "#79AAD9"
-    },
-    "euiColorVis2": {
-      "graphic": "#D36086",
-      "behindText": "#EE789D"
-    },
-    "euiColorVis3": {
-      "graphic": "#9170B8",
-      "behindText": "#A987D1"
-    },
-    "euiColorVis4": {
-      "graphic": "#CA8EAE",
-      "behindText": "#E4A6C7"
-    },
-    "euiColorVis5": {
-      "graphic": "#D6BF57",
-      "behindText": "#F1D86F"
-    },
-    "euiColorVis6": {
-      "graphic": "#B9A888",
-      "behindText": "#D2C0A0"
-    },
-    "euiColorVis7": {
-      "graphic": "#DA8B45",
-      "behindText": "#F5A35C"
-    },
-    "euiColorVis8": {
-      "graphic": "#AA6556",
-      "behindText": "#C47C6C"
-    },
-    "euiColorVis9": {
-      "graphic": "#E7664C",
-      "behindText": "#FF7E62"
-    }
-  },
-  "euiPaletteColorBlindKeys": "'euiColorVis0', 'euiColorVis1', 'euiColorVis2', 'euiColorVis3', 'euiColorVis4', 'euiColorVis5', 'euiColorVis6', 'euiColorVis7', 'euiColorVis8', 'euiColorVis9'",
-  "euiColorVis0": "#54B399",
-  "euiColorVis1": "#6092C0",
-  "euiColorVis2": "#D36086",
-  "euiColorVis3": "#9170B8",
-  "euiColorVis4": "#CA8EAE",
-  "euiColorVis5": "#D6BF57",
-  "euiColorVis6": "#B9A888",
-  "euiColorVis7": "#DA8B45",
-  "euiColorVis8": "#AA6556",
-  "euiColorVis9": "#E7664C",
-  "euiColorVis0_behindText": "#6DCCB1",
-  "euiColorVis1_behindText": "#79AAD9",
-  "euiColorVis2_behindText": "#EE789D",
-  "euiColorVis3_behindText": "#A987D1",
-  "euiColorVis4_behindText": "#E4A6C7",
-  "euiColorVis5_behindText": "#F1D86F",
-  "euiColorVis6_behindText": "#D2C0A0",
-  "euiColorVis7_behindText": "#F5A35C",
-  "euiColorVis8_behindText": "#C47C6C",
-  "euiColorVis9_behindText": "#FF7E62",
-  "euiColorVisText0": "#017D73",
-  "euiColorVisText1": "#006BB4",
-  "euiColorVisText2": "#DD0A73",
-  "euiColorVisText3": "#745A93",
-  "euiColorVisText4": "#A2728B",
-  "euiColorVisText5": "#AB9946",
-  "euiColorVisText6": "#94866D",
-  "euiColorVisText7": "#F5A700",
-  "euiColorVisText8": "#885145",
-  "euiColorVisText9": "#BD271E",
-  "euiColorVisSuccess0": "#209280",
-  "euiColorVisSuccess1": "#54B399",
-  "euiColorVisWarning0": "#D6BF57",
-  "euiColorVisDanger0": "#CC5642",
-  "euiColorVisDanger1": "#E7664C",
-  "euiColorVisNeutral0": "#FFFFFF",
-  "euiColorVisGrey0": "#d3dae6",
-  "euiColorVisGrey1": "#98a2b3",
-  "euiColorVisGrey2": "#69707d",
-  "euiColorVisGrey3": "#343741",
-  "euiColorVisWarm0": "#FBFBDC",
-  "euiColorVisWarm1": "#DA8B45",
-  "euiColorVisWarm2": "#E7664C",
-  "euiColorVisCool0": "#EBEFF5",
-  "euiColorVisCool1": "#6092C0",
-  "euiColorVisCool2": "#6092C0",
-  "euiColorVisComplementary0": "#6092C0",
-  "euiColorVisComplementary1": "#DA8B45",
-  "euiColorSeverityUnknown": "#D3DAE6",
-  "euiColorSeverityNeutral": "#BECFE3",
-  "euiColorSeveritySuccess": "#54B399",
-  "euiColorSeverityWarning": "#D6BF57",
-  "euiColorSeverityRisk": "#DA8B45",
-  "euiColorSeverityDanger": "#E7664C",
-  "euiColorChartLines": "#eef0f3",
-  "euiColorChartBand": "#f5f7fa",
-  "euiColorGhost": "#ffffff",
-  "euiColorInk": "#000000",
-  "euiColorPrimary": "#0077cc",
-  "euiColorAccent": "#f04e98",
-  "euiColorAccentSecondary": "#00bfb3",
-  "euiColorSuccess": "#00bfb3",
-  "euiColorWarning": "#fec514",
-  "euiColorDanger": "#bd271e",
-  "euiColorEmptyShade": "#ffffff",
-  "euiColorLightestShade": "#f5f7fa",
-  "euiColorLightShade": "#d3dae6",
-  "euiColorMediumShade": "#98a2b3",
-  "euiColorDarkShade": "#69707d",
-  "euiColorDarkestShade": "#343741",
-  "euiColorFullShade": "#000000",
-  "euiPageBackgroundColor": "#fafbfd",
-  "euiColorHighlight": "#fff9e8",
-  "euiTextColor": "#343741",
-  "euiTitleColor": "#1a1c21",
-  "euiTextSubduedColor": "#69707d",
-  "euiColorDisabled": "#abb4c4",
-  "euiColorPrimaryText": "#0071c2",
-  "euiColorSuccessText": "#007e77",
-  "euiColorAccentText": "#c4407c",
-  "euiColorWarningText": "#8a6a0a",
-  "euiColorDangerText": "#bd271e",
-  "euiColorDisabledText": "#abb4c4",
-  "euiLinkColor": "#0071c2",
-  "euiColorPlainLight": "#FFFFFF",
-  "euiColorPlainDark": "#000000",
-  "euiColorTextPrimary": "#006bb8",
-  "euiColorTextAccent": "#ba3d76",
-  "euiColorTextAccentSecondary": "#007871",
-  "euiColorTextNeutral": "#626a75",
-  "euiColorTextSuccess": "#007871",
-  "euiColorTextWarning": "#83650a",
-  "euiColorTextRisk": "#915c2e",
-  "euiColorTextDanger": "#bd271e",
-  "euiColorTextParagraph": "#343741",
-  "euiColorTextHeading": "#1a1c21",
-  "euiColorTextSubdued": "#646a77",
-  "euiColorTextDisabled": "#a2abba",
-  "euiColorTextInverse": "#FFFFFF",
-  "euiColorBackgroundBasePrimary": "#e6f1fa",
-  "euiColorBackgroundBaseAccent": "#feedf5",
-  "euiColorBackgroundBaseAccentSecondary": "#e6f9f7",
-  "euiColorBackgroundBaseNeutral": "#f9fafc",
-  "euiColorBackgroundBaseSuccess": "#e6f9f7",
-  "euiColorBackgroundBaseWarning": "#fff9e8",
-  "euiColorBackgroundBaseRisk": "#fbf3ec",
-  "euiColorBackgroundBaseDanger": "#f8e9e9",
-  "euiColorBackgroundBaseSubdued": "#f7f8fc",
-  "euiColorBackgroundBaseDisabled": "#ABB4C4",
-  "euiColorBackgroundBaseHighlighted": "#f7f8fc",
-  "euiColorBackgroundBasePlain": "#FFFFFF",
-  "euiColorBackgroundBaseFormsPrepend": "#e9edf3",
-  "euiColorBackgroundBaseFormsControlDisabled": "#98A2B3",
-  "euiColorBackgroundBaseInteractiveHover": "rgba(211,218,230,0.2)",
-  "euiColorBackgroundBaseInteractiveSelect": "#f7fbfe",
-  "euiColorBackgroundBaseInteractiveSelectHover": "#d7ecfc",
-  "euiColorBackgroundBaseInteractiveOverlay": "rgba(0,0,0,0.5)",
-  "euiColorBackgroundBaseSkeletonEdge": "#f0f2f6",
-  "euiColorBackgroundBaseSkeletonMiddle": "#f6f8fa",
-  "euiColorBackgroundLightPrimary": "#cce4f5",
-  "euiColorBackgroundLightAccent": "#fcdcea",
-  "euiColorBackgroundLightAccentSecondary": "#ccf2f0",
-  "euiColorBackgroundLightNeutral": "#f2f5f9",
-  "euiColorBackgroundLightSuccess": "#ccf2f0",
-  "euiColorBackgroundLightWarning": "#fff3d0",
-  "euiColorBackgroundLightRisk": "#f8e8da",
-  "euiColorBackgroundLightDanger": "#f2d4d2",
-  "euiColorBackgroundLightText": "#e9edf3",
-  "euiColorBackgroundFilledPrimary": "#0077CC",
-  "euiColorBackgroundFilledAccent": "#f583b7",
-  "euiColorBackgroundFilledAccentSecondary": "#4dd2ca",
-  "euiColorBackgroundFilledNeutral": "#BECFE3",
-  "euiColorBackgroundFilledSuccess": "#4dd2ca",
-  "euiColorBackgroundFilledWarning": "#FEC514",
-  "euiColorBackgroundFilledRisk": "#DA8B45",
-  "euiColorBackgroundFilledDanger": "#BD271E",
-  "euiColorBackgroundFilledText": "#69707D",
-  "euiColorBorderBasePrimary": "#99c9eb",
-  "euiColorBorderBaseAccent": "#f9b8d6",
-  "euiColorBorderBaseAccentSecondary": "#99e5e1",
-  "euiColorBorderBaseNeutral": "#e5ecf4",
-  "euiColorBorderBaseSuccess": "#99e5e1",
-  "euiColorBorderBaseWarning": "#fedc72",
-  "euiColorBorderBaseRisk": "#e9b98f",
-  "euiColorBorderBaseDanger": "#e5a9a5",
-  "euiColorBorderBaseSubdued": "#D3DAE6",
-  "euiColorBorderBaseDisabled": "rgba(191,198,210,0.1)",
-  "euiColorBorderBasePlain": "#D3DAE6",
-  "euiColorBorderBaseFloating": "transparent",
-  "euiColorBorderBaseFormsColorSwatch": "rgba(0,0,0,0.1)",
-  "euiColorBorderBaseFormsControl": "#919296",
-  "euiColorBorderInteractiveFormsHoverPlain": "transparent",
-  "euiColorBorderInteractiveFormsHoverDanger": "transparent",
-  "euiColorBorderStrongPrimary": "#0077CC",
-  "euiColorBorderStrongAccent": "#F04E98",
-  "euiColorBorderStrongAccentSecondary": "#00BFB3",
-  "euiColorBorderStrongNeutral": "#94A6B6",
-  "euiColorBorderStrongSuccess": "#00BFB3",
-  "euiColorBorderStrongWarning": "#FEC514",
-  "euiColorBorderStrongRisk": "#DA8B45",
-  "euiColorBorderStrongDanger": "#BD271E",
-  "euiColorBorderStrongText": "#69707D"
-}
diff --git a/packages/eui/src/themes/json/eui_theme_amsterdam_light.json.d.ts b/packages/eui/src/themes/json/eui_theme_amsterdam_light.json.d.ts
deleted file mode 100644
index 69d0ebf777d..00000000000
--- a/packages/eui/src/themes/json/eui_theme_amsterdam_light.json.d.ts
+++ /dev/null
@@ -1,466 +0,0 @@
-declare module '@elastic/eui/dist/eui_theme_amsterdam_light.json' {
-  const sassVariables: {
-    euiZDataGrid: number;
-    euiZHeaderBelowDataGrid: number;
-    euiZDataGridCellPopover: number;
-    euiDataGridCellPaddingS: string;
-    euiDataGridCellPaddingM: string;
-    euiDataGridCellPaddingL: string;
-    euiTableHoverColor: string;
-    euiTableSelectedColor: string;
-    euiTableHoverSelectedColor: string;
-    euiTableActionsBorderColor: string;
-    euiTableHoverClickableColor: string;
-    euiTableFocusClickableColor: string;
-    euiContrastRatioText: number;
-    euiContrastRatioGraphic: number;
-    euiContrastRatioDisabled: number;
-    euiAnimSlightBounce: string;
-    euiAnimSlightResistance: string;
-    euiAnimSpeedExtraFast: string;
-    euiAnimSpeedFast: string;
-    euiAnimSpeedNormal: string;
-    euiAnimSpeedSlow: string;
-    euiAnimSpeedExtraSlow: string;
-    euiBorderWidthThin: string;
-    euiBorderWidthThick: string;
-    euiBorderColor: string;
-    euiBorderRadius: string;
-    euiBorderRadiusSmall: string;
-    euiBorderThick: string;
-    euiBorderThin: string;
-    euiBorderEditable: string;
-    euiButtonHeight: string;
-    euiButtonHeightSmall: string;
-    euiButtonHeightXSmall: string;
-    euiButtonColorDisabled: string;
-    euiButtonColorDisabledText: string;
-    euiButtonColorGhostDisabled: string;
-    euiButtonTypes: {
-      primary: string;
-      accent: string;
-      accentSecondary: string;
-      neutral: string;
-      success: string;
-      warning: string;
-      risk: string;
-      danger: string;
-      ghost: string;
-      text: string;
-    };
-    euiFontWeightLight: number;
-    euiFontWeightRegular: number;
-    euiFontWeightMedium: number;
-    euiFontWeightSemiBold: number;
-    euiFontWeightBold: number;
-    euiCodeFontWeightRegular: number;
-    euiCodeFontWeightBold: number;
-    euiFormMaxWidth: string;
-    euiFormControlHeight: string;
-    euiFormControlCompressedHeight: string;
-    euiFormControlPadding: string;
-    euiFormControlCompressedPadding: string;
-    euiFormControlBorderRadius: string;
-    euiFormControlCompressedBorderRadius: string;
-    euiRadioSize: string;
-    euiCheckBoxSize: string;
-    euiCheckboxBorderRadius: string;
-    euiSwitchHeight: string;
-    euiSwitchWidth: string;
-    euiSwitchThumbSize: string;
-    euiSwitchIconHeight: string;
-    euiSwitchHeightCompressed: string;
-    euiSwitchWidthCompressed: string;
-    euiSwitchThumbSizeCompressed: string;
-    euiSwitchHeightMini: string;
-    euiSwitchWidthMini: string;
-    euiSwitchThumbSizeMini: string;
-    euiFormBackgroundColor: string;
-    euiFormBackgroundDisabledColor: string;
-    euiFormBackgroundReadOnlyColor: string;
-    euiFormBorderOpaqueColor: string;
-    euiFormBorderColor: string;
-    euiFormBorderDisabledColor: string;
-    euiFormCustomControlDisabledIconColor: string;
-    euiFormCustomControlBorderColor: string;
-    euiFormControlDisabledColor: string;
-    euiFormControlBoxShadow: string;
-    euiFormControlPlaceholderText: string;
-    euiFormInputGroupLabelBackground: string;
-    euiFormInputGroupBorder: string;
-    euiSwitchOffColor: string;
-    euiFormControlIconSizes: {
-      small: string;
-      medium: string;
-      large: string;
-      xLarge: string;
-      xxLarge: string;
-    };
-    euiFormControlLayoutGroupInputHeight: string;
-    euiFormControlLayoutGroupInputCompressedHeight: string;
-    euiFormControlLayoutGroupInputCompressedBorderRadius: string;
-    euiHeaderBackgroundColor: string;
-    euiHeaderDarkBackgroundColor: string;
-    euiHeaderBorderColor: string;
-    euiHeaderBreadcrumbColor: string;
-    euiHeaderHeight: string;
-    euiHeaderChildSize: string;
-    euiHeaderHeightCompensation: string;
-    euiPageDefaultMaxWidth: string;
-    euiPageSidebarMinWidth: string;
-    euiPanelPaddingModifiers: {
-      paddingSmall: string;
-      paddingMedium: string;
-      paddingLarge: string;
-    };
-    euiPanelBorderRadiusModifiers: {
-      borderRadiusNone: number;
-      borderRadiusMedium: string;
-    };
-    euiPanelBackgroundColorModifiers: {
-      transparent: string;
-      plain: string;
-      subdued: string;
-      accent: string;
-      accentSecondary: string;
-      primary: string;
-      success: string;
-      warning: string;
-      danger: string;
-    };
-    euiBreakpoints: {
-      xs: number;
-      s: string;
-      m: string;
-      l: string;
-      xl: string;
-    };
-    euiBreakpointKeys: string;
-    euiShadowColor: string;
-    euiShadows: {
-      xs: {
-        down: string;
-        up: string;
-      };
-      s: {
-        down: string;
-        up: string;
-      };
-      m: {
-        down: string;
-        up: string;
-      };
-      l: {
-        down: string;
-        up: string;
-      };
-      xl: {
-        down: string;
-        up: string;
-      };
-      hover: {
-        base: {
-          down: string;
-          up: string;
-        };
-        xl: {
-          down: string;
-          up: string;
-        };
-      };
-      flat: {
-        down: string;
-        up: string;
-      };
-    };
-    euiSize: string;
-    euiSizeXS: string;
-    euiSizeS: string;
-    euiSizeM: string;
-    euiSizeL: string;
-    euiSizeXL: string;
-    euiSizeXXL: string;
-    euiScrollBar: string;
-    euiScrollBarCorner: string;
-    euiScrollBarCornerThin: string;
-    euiFocusRingColor: string;
-    euiFocusRingAnimStartColor: string;
-    euiFocusRingAnimStartSize: string;
-    euiFocusRingAnimStartSizeLarge: string;
-    euiFocusRingSizeLarge: string;
-    euiFocusRingSize: string;
-    euiFocusTransparency: number;
-    euiFocusTransparencyPercent: string;
-    euiFocusBackgroundColor: string;
-    euiFontFamily: string;
-    euiCodeFontFamily: string;
-    euiFontFeatureSettings: string;
-    euiTextScale: string;
-    euiFontSize: string;
-    euiFontSizeXS: string;
-    euiFontSizeS: string;
-    euiFontSizeM: string;
-    euiFontSizeL: string;
-    euiFontSizeXL: string;
-    euiFontSizeXXL: string;
-    euiLineHeight: number;
-    euiBodyLineHeight: number;
-    euiTitles: {
-      xxxs: {
-        'font-size': string;
-        'line-height': string;
-        'font-weight': number;
-      };
-      xxs: {
-        'font-size': string;
-        'line-height': string;
-        'font-weight': number;
-      };
-      xs: {
-        'font-size': string;
-        'line-height': string;
-        'font-weight': number;
-      };
-      s: {
-        'font-size': string;
-        'line-height': string;
-        'font-weight': number;
-      };
-      m: {
-        'font-size': string;
-        'line-height': string;
-        'font-weight': number;
-      };
-      l: {
-        'font-size': string;
-        'line-height': string;
-        'font-weight': number;
-      };
-    };
-    euiZLevel0: number;
-    euiZLevel1: number;
-    euiZLevel2: number;
-    euiZLevel3: number;
-    euiZLevel4: number;
-    euiZLevel5: number;
-    euiZLevel6: number;
-    euiZLevel7: number;
-    euiZLevel8: number;
-    euiZLevel9: number;
-    euiZToastList: number;
-    euiZModal: number;
-    euiZMask: number;
-    euiZNavigation: number;
-    euiZContentMenu: number;
-    euiZHeader: number;
-    euiZFlyout: number;
-    euiZMaskBelowHeader: number;
-    euiZContent: number;
-    euiPaletteColorBlind: {
-      euiColorVis0: {
-        graphic: string;
-        behindText: string;
-      };
-      euiColorVis1: {
-        graphic: string;
-        behindText: string;
-      };
-      euiColorVis2: {
-        graphic: string;
-        behindText: string;
-      };
-      euiColorVis3: {
-        graphic: string;
-        behindText: string;
-      };
-      euiColorVis4: {
-        graphic: string;
-        behindText: string;
-      };
-      euiColorVis5: {
-        graphic: string;
-        behindText: string;
-      };
-      euiColorVis6: {
-        graphic: string;
-        behindText: string;
-      };
-      euiColorVis7: {
-        graphic: string;
-        behindText: string;
-      };
-      euiColorVis8: {
-        graphic: string;
-        behindText: string;
-      };
-      euiColorVis9: {
-        graphic: string;
-        behindText: string;
-      };
-    };
-    euiPaletteColorBlindKeys: string;
-    euiColorVis0: string;
-    euiColorVis1: string;
-    euiColorVis2: string;
-    euiColorVis3: string;
-    euiColorVis4: string;
-    euiColorVis5: string;
-    euiColorVis6: string;
-    euiColorVis7: string;
-    euiColorVis8: string;
-    euiColorVis9: string;
-    euiColorVis0_behindText: string;
-    euiColorVis1_behindText: string;
-    euiColorVis2_behindText: string;
-    euiColorVis3_behindText: string;
-    euiColorVis4_behindText: string;
-    euiColorVis5_behindText: string;
-    euiColorVis6_behindText: string;
-    euiColorVis7_behindText: string;
-    euiColorVis8_behindText: string;
-    euiColorVis9_behindText: string;
-    euiColorVisText0: string;
-    euiColorVisText1: string;
-    euiColorVisText2: string;
-    euiColorVisText3: string;
-    euiColorVisText4: string;
-    euiColorVisText5: string;
-    euiColorVisText6: string;
-    euiColorVisText7: string;
-    euiColorVisText8: string;
-    euiColorVisText9: string;
-    euiColorVisSuccess0: string;
-    euiColorVisSuccess1: string;
-    euiColorVisWarning0: string;
-    euiColorVisDanger0: string;
-    euiColorVisDanger1: string;
-    euiColorVisNeutral0: string;
-    euiColorVisGrey0: string;
-    euiColorVisGrey1: string;
-    euiColorVisGrey2: string;
-    euiColorVisGrey3: string;
-    euiColorVisWarm0: string;
-    euiColorVisWarm1: string;
-    euiColorVisWarm2: string;
-    euiColorVisCool0: string;
-    euiColorVisCool1: string;
-    euiColorVisCool2: string;
-    euiColorVisComplementary0: string;
-    euiColorVisComplementary1: string;
-    euiColorSeverityUnknown: string;
-    euiColorSeverityNeutral: string;
-    euiColorSeveritySuccess: string;
-    euiColorSeverityWarning: string;
-    euiColorSeverityRisk: string;
-    euiColorSeverityDanger: string;
-    euiColorChartLines: string;
-    euiColorChartBand: string;
-    euiColorGhost: string;
-    euiColorInk: string;
-    euiColorPrimary: string;
-    euiColorAccent: string;
-    euiColorAccentSecondary: string;
-    euiColorSuccess: string;
-    euiColorWarning: string;
-    euiColorDanger: string;
-    euiColorEmptyShade: string;
-    euiColorLightestShade: string;
-    euiColorLightShade: string;
-    euiColorMediumShade: string;
-    euiColorDarkShade: string;
-    euiColorDarkestShade: string;
-    euiColorFullShade: string;
-    euiPageBackgroundColor: string;
-    euiColorHighlight: string;
-    euiTextColor: string;
-    euiTitleColor: string;
-    euiTextSubduedColor: string;
-    euiColorDisabled: string;
-    euiColorPrimaryText: string;
-    euiColorSuccessText: string;
-    euiColorAccentText: string;
-    euiColorWarningText: string;
-    euiColorDangerText: string;
-    euiColorDisabledText: string;
-    euiLinkColor: string;
-    euiColorPlainLight: string;
-    euiColorPlainDark: string;
-    euiColorTextPrimary: string;
-    euiColorTextAccent: string;
-    euiColorTextAccentSecondary: string;
-    euiColorTextNeutral: string;
-    euiColorTextSuccess: string;
-    euiColorTextWarning: string;
-    euiColorTextRisk: string;
-    euiColorTextDanger: string;
-    euiColorTextParagraph: string;
-    euiColorTextHeading: string;
-    euiColorTextSubdued: string;
-    euiColorTextDisabled: string;
-    euiColorTextInverse: string;
-    euiColorBackgroundBasePrimary: string;
-    euiColorBackgroundBaseAccent: string;
-    euiColorBackgroundBaseAccentSecondary: string;
-    euiColorBackgroundBaseNeutral: string;
-    euiColorBackgroundBaseSuccess: string;
-    euiColorBackgroundBaseWarning: string;
-    euiColorBackgroundBaseRisk: string;
-    euiColorBackgroundBaseDanger: string;
-    euiColorBackgroundBaseSubdued: string;
-    euiColorBackgroundBasePlain: string;
-    euiColorBackgroundBaseDisabled: string;
-    euiColorBackgroundBaseHighlighted: string;
-    euiColorBackgroundBaseFormsPrepend: string;
-    euiColorBackgroundBaseFormsControlDisabled: string;
-    euiColorBackgroundBaseInteractiveHover: string;
-    euiColorBackgroundBaseInteractiveSelect: string;
-    euiColorBackgroundBaseInteractiveSelectHover: string;
-    euiColorBackgroundBaseInteractiveOverlay: string;
-    euiColorBackgroundBaseSkeletonEdge: string;
-    euiColorBackgroundBaseSkeletonMiddle: string;
-    euiColorBackgroundLightPrimary: string;
-    euiColorBackgroundLightAccent: string;
-    euiColorBackgroundLightAccentSecondary: string;
-    euiColorBackgroundLightNeutral: string;
-    euiColorBackgroundLightSuccess: string;
-    euiColorBackgroundLightWarning: string;
-    euiColorBackgroundLightRisk: string;
-    euiColorBackgroundLightDanger: string;
-    euiColorBackgroundLightText: string;
-    euiColorBackgroundFilledPrimary: string;
-    euiColorBackgroundFilledAccent: string;
-    euiColorBackgroundFilledAccentSecondary: string;
-    euiColorBackgroundFilledNeutral: string;
-    euiColorBackgroundFilledSuccess: string;
-    euiColorBackgroundFilledWarning: string;
-    euiColorBackgroundFilledRisk: string;
-    euiColorBackgroundFilledDanger: string;
-    euiColorBackgroundFilledText: string;
-    euiColorBorderBasePrimary: string;
-    euiColorBorderBaseAccent: string;
-    euiColorBorderBaseAccentSecondary: string;
-    euiColorBorderBaseNeutral: string;
-    euiColorBorderBaseSuccess: string;
-    euiColorBorderBaseWarning: string;
-    euiColorBorderBaseRisk: string;
-    euiColorBorderBaseDanger: string;
-    euiColorBorderBasePlain: string;
-    euiColorBorderBaseSubdued: string;
-    euiColorBorderBaseDisabled: string;
-    euiColorBorderBaseFloating: string;
-    euiColorBorderBaseFormsColorSwatch: string;
-    euiColorBorderBaseFormsControl: string;
-    euiColorBorderInteractiveFormsHoverPlain: string;
-    euiColorBorderInteractiveFormsHoverDanger: string;
-    euiColorBorderStrongPrimary: string;
-    euiColorBorderStrongAccent: string;
-    euiColorBorderStrongAccentSecondary: string;
-    euiColorBorderStrongNeutral: string;
-    euiColorBorderStrongSuccess: string;
-    euiColorBorderStrongWarning: string;
-    euiColorBorderStrongRisk: string;
-    euiColorBorderStrongDanger: string;
-    euiColorBorderStrongText: string;
-  };
-  export default sassVariables;
-}
diff --git a/packages/eui/src/themes/json/eui_theme_borealis_dark.json b/packages/eui/src/themes/json/eui_theme_borealis_dark.json
deleted file mode 100644
index 22b425b828b..00000000000
--- a/packages/eui/src/themes/json/eui_theme_borealis_dark.json
+++ /dev/null
@@ -1,463 +0,0 @@
-{
-  "euiZDataGrid": 999,
-  "euiZHeaderBelowDataGrid": 998,
-  "euiZDataGridCellPopover": 1000,
-  "euiDataGridCellPaddingS": "4px",
-  "euiDataGridCellPaddingM": "6px",
-  "euiDataGridCellPaddingL": "8px",
-  "euiTableHoverColor": "rgba(255, 255, 255, 0.06)",
-  "euiTableSelectedColor": "#243147",
-  "euiTableHoverSelectedColor": "rgba(255, 255, 255, 0.06)",
-  "euiTableActionsBorderColor": "#2B394F",
-  "euiTableHoverClickableColor": "rgba(255, 255, 255, 0.06)",
-  "euiTableFocusClickableColor": "rgba(255, 255, 255, 0.06)",
-  "euiContrastRatioText": 4.5,
-  "euiContrastRatioGraphic": 3,
-  "euiContrastRatioDisabled": 2,
-  "euiAnimSlightBounce": "cubic-bezier(0.34, 1.61, 0.7, 1)",
-  "euiAnimSlightResistance": "cubic-bezier(0.694, 0.0482, 0.335, 1)",
-  "euiAnimSpeedExtraFast": "90ms",
-  "euiAnimSpeedFast": "150ms",
-  "euiAnimSpeedNormal": "250ms",
-  "euiAnimSpeedSlow": "350ms",
-  "euiAnimSpeedExtraSlow": "500ms",
-  "euiBorderWidthThin": "1px",
-  "euiBorderWidthThick": "2px",
-  "euiBorderColor": "#2B394F",
-  "euiBorderRadius": "4px",
-  "euiBorderRadiusSmall": "4px",
-  "euiBorderThick": "2px solid #2B394F",
-  "euiBorderThin": "1px solid #2B394F",
-  "euiBorderEditable": "2px dotted #2B394F",
-  "euiButtonHeight": "40px",
-  "euiButtonHeightSmall": "32px",
-  "euiButtonHeightXSmall": "24px",
-  "euiButtonColorDisabled": "#1D2A3E",
-  "euiButtonColorDisabledText": "#6A7FA0",
-  "euiButtonColorGhostDisabled": "#1D2A3E",
-  "euiButtonTypes": {
-    "primary": "#61A2FF",
-    "accent": "#EE72A6",
-    "accentSecondary": "#16C5C0",
-    "neutral": "#63C8E3",
-    "success": "#24C292",
-    "warning": "#FACB3D",
-    "risk": "#FF995E",
-    "danger": "#F6726A",
-    "ghost": "#07101F",
-    "text": "#8E9FBC"
-  },
-  "euiFontWeightLight": 300,
-  "euiFontWeightRegular": 400,
-  "euiFontWeightMedium": 450,
-  "euiFontWeightSemiBold": 500,
-  "euiFontWeightBold": 600,
-  "euiCodeFontWeightRegular": 400,
-  "euiCodeFontWeightBold": 600,
-  "euiFormMaxWidth": "400px",
-  "euiFormControlHeight": "40px",
-  "euiFormControlCompressedHeight": "32px",
-  "euiFormControlPadding": "12px",
-  "euiFormControlCompressedPadding": "8px",
-  "euiFormControlBorderRadius": "4px",
-  "euiFormControlCompressedBorderRadius": "4px",
-  "euiRadioSize": "16px",
-  "euiCheckBoxSize": "16px",
-  "euiCheckboxBorderRadius": "4px",
-  "euiSwitchHeight": "20px",
-  "euiSwitchWidth": "44px",
-  "euiSwitchThumbSize": "20px",
-  "euiSwitchIconHeight": "16px",
-  "euiSwitchHeightCompressed": "16px",
-  "euiSwitchWidthCompressed": "28px",
-  "euiSwitchThumbSizeCompressed": "16px",
-  "euiSwitchHeightMini": "10px",
-  "euiSwitchWidthMini": "22px",
-  "euiSwitchThumbSizeMini": "10px",
-  "euiFormBackgroundColor": "#07101F",
-  "euiFormBackgroundDisabledColor": "#1D2A3E",
-  "euiFormBackgroundReadOnlyColor": "#0B1628",
-  "euiFormBorderOpaqueColor": "#5054af",
-  "euiFormBorderColor": "#485975",
-  "euiFormBorderDisabledColor": "#485975",
-  "euiFormCustomControlDisabledIconColor": "#6A7FA0",
-  "euiFormCustomControlBorderColor": "#485975",
-  "euiFormControlDisabledColor": "#485975",
-  "euiFormControlBoxShadow": "0 0 rgba(0, 0, 0, 0)",
-  "euiFormControlPlaceholderText": "#8E9FBC",
-  "euiFormInputGroupLabelBackground": "#243147",
-  "euiFormInputGroupBorder": "none",
-  "euiSwitchOffColor": "#8E9FBC",
-  "euiFormControlIconSizes": {
-    "small": "12px",
-    "medium": "16px",
-    "large": "24px",
-    "xLarge": "32px",
-    "xxLarge": "40px"
-  },
-  "euiFormControlLayoutGroupInputHeight": "38px",
-  "euiFormControlLayoutGroupInputCompressedHeight": "30px",
-  "euiFormControlLayoutGroupInputCompressedBorderRadius": "2px",
-  "euiHeaderBackgroundColor": "#0B1628",
-  "euiHeaderDarkBackgroundColor": "#0B1628",
-  "euiHeaderBorderColor": "#2B394F",
-  "euiHeaderBreadcrumbColor": "#0D2F5E",
-  "euiHeaderHeight": "48px",
-  "euiHeaderChildSize": "40px",
-  "euiHeaderHeightCompensation": "48px",
-  "euiPageDefaultMaxWidth": "1200px",
-  "euiPageSidebarMinWidth": "192px",
-  "euiPanelPaddingModifiers": {
-    "paddingSmall": "8px",
-    "paddingMedium": "16px",
-    "paddingLarge": "24px"
-  },
-  "euiPanelBorderRadiusModifiers": {
-    "borderRadiusNone": 0,
-    "borderRadiusMedium": "4px"
-  },
-  "euiPanelBackgroundColorModifiers": {
-    "transparent": "rgba(0, 0, 0, 0)",
-    "plain": "#0B1628",
-    "subdued": "#07101F",
-    "accent": "#351725",
-    "accentSecondary": "#03282B",
-    "primary": "#0A2342",
-    "success": "#092A26",
-    "warning": "#2C2721",
-    "danger": "#351721"
-  },
-  "euiBreakpoints": {
-    "xs": 0,
-    "s": "575px",
-    "m": "768px",
-    "l": "992px",
-    "xl": "1200px"
-  },
-  "euiBreakpointKeys": "'xs', 's', 'm', 'l', 'xl'",
-  "euiShadowColor": "#000000",
-  "euiShadows": {
-    "xs": {
-      "down": "0px 1px 4px 0px hsla(0,0%,0%,0.4), 0px 2px 8px 0px hsla(0,0%,0%,0.24)",
-      "up": "0px 1px 4px 0px hsla(0,0%,0%,0.4), 0px -2px 8px 0px hsla(0,0%,0%,0.24)"
-    },
-    "s":{
-      "down": "0px 2px 7px 0px hsla(0,0%,0%,0.46), 0px 4px 11px 0px hsla(0,0%,0%,0.26)",
-      "up": "0px 2px 7px 0px hsla(0,0%,0%,0.46), 0px -4px 11px 0px hsla(0,0%,0%,0.26)"
-    },
-    "m": {
-      "down": "0px 3px 10px 0px hsla(0,0%,0%,0.52), 0px 6px 14px 0px hsla(0,0%,0%,0.28)",
-      "up": "0px 3px 10px 0px hsla(0,0%,0%,0.52), 0px -6px 14px 0px hsla(0,0%,0%,0.28)"
-    },
-    "l": {
-      "down": "0px 4px 13px 0px hsla(0,0%,0%,0.58), 0px 8px 17px 0px hsla(0,0%,0%,0.3)",
-      "up": "0px 4px 13px 0px hsla(0,0%,0%,0.58), 0px -8px 17px 0px hsla(0,0%,0%,0.3)"
-    },
-    "xl": {
-      "down": "0px 5px 16px 0px hsla(0,0%,0%,0.64), 0px 10px 20px 0px hsla(0,0%,0%,0.32)",
-      "up": "0px 5px 16px 0px hsla(0,0%,0%,0.64), 0px -10px 20px 0px hsla(0,0%,0%,0.32)"
-    },
-    "hover": {
-      "base": {
-        "down": "0px 2px 7px 0px hsla(0,0%,0%,0.46), 0px 4px 11px 0px hsla(0,0%,0%,0.26)",
-        "up": "0px -2px 7px 0px hsla(0,0%,0%,0.46), 0px -4px 11px 0px hsla(0,0%,0%,0.26)"
-      },
-      "xl": {
-        "down": "0px 6px 19px 0px hsla(0,0%,0%,0.7), 0px 12px 23px 0px hsla(0,0%,0%,0.34)",
-        "up": "0px -6px 19px 0px hsla(0,0%,0%,0.7), 0px -12px 23px 0px hsla(0,0%,0%,0.34)"
-      }
-    },
-    "flat": {
-      "down": "0px 1px 4px 0px hsla(0,0%,0%,0.4), 0px 2px 8px 0px hsla(0,0%,0%,0.24)",
-      "up": "0px 1px 4px 0px hsla(0,0%,0%,0.4), 0px -2px 8px 0px hsla(0,0%,0%,0.24)"
-    }
-  },
-  "euiSize": "16px",
-  "euiSizeXS": "4px",
-  "euiSizeS": "8px",
-  "euiSizeM": "12px",
-  "euiSizeL": "24px",
-  "euiSizeXL": "32px",
-  "euiSizeXXL": "40px",
-  "euiScrollBar": "16px",
-  "euiScrollBarCorner": "4px",
-  "euiScrollBarCornerThin": "6px",
-  "euiFocusRingColor": "#61A2FF",
-  "euiFocusRingAnimStartColor": "rgba(0, 0, 0, 0)",
-  "euiFocusRingAnimStartSize": "2px",
-  "euiFocusRingAnimStartSizeLarge": "10px",
-  "euiFocusRingSizeLarge": "4px",
-  "euiFocusRingSize": "2px",
-  "euiFocusTransparency": 0.8,
-  "euiFocusTransparencyPercent": "80%",
-  "euiFocusBackgroundColor": "#243147",
-  "euiFontFamily": "'Inter', '-apple-system', 'BlinkMacSystemFont', 'Segoe UI', 'Helvetica', 'Arial', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'",
-  "euiCodeFontFamily": "'Roboto Mono', 'Consolas', 'Menlo', 'Courier', monospace",
-  "euiFontFeatureSettings": "calt 1 kern 1 liga 1",
-  "euiTextScale": "1,875, 1.5, 1.25, 1, .875, .75",
-  "euiFontSize": "14px",
-  "euiFontSizeXS": "12px",
-  "euiFontSizeS": "14px",
-  "euiFontSizeM": "16px",
-  "euiFontSizeL": "20px",
-  "euiFontSizeXL": "24px",
-  "euiFontSizeXXL": "30px",
-  "euiLineHeight": 1.5,
-  "euiBodyLineHeight": 1.142857143,
-  "euiTitles": {
-    "xxxs": {
-      "font-size": "12px",
-      "line-height": "1.1429rem",
-      "font-weight": 600
-    },
-    "xxs": {
-      "font-size": "14px",
-      "line-height": "1.4286rem",
-      "font-weight": 600
-    },
-    "xs": {
-      "font-size": "16px",
-      "line-height": "1.7143rem",
-      "font-weight": 600
-    },
-    "s": {
-      "font-size": "20px",
-      "line-height": "1.7143rem",
-      "font-weight": 600
-    },
-    "m": {
-      "font-size": "24px",
-      "line-height": "2rem",
-      "font-weight": 600
-    },
-    "l": {
-      "font-size": "30px",
-      "line-height": "2.5714rem",
-      "font-weight": 600
-    }
-  },
-  "euiZLevel0": 0,
-  "euiZLevel1": 1000,
-  "euiZLevel2": 2000,
-  "euiZLevel3": 3000,
-  "euiZLevel4": 4000,
-  "euiZLevel5": 5000,
-  "euiZLevel6": 6000,
-  "euiZLevel7": 7000,
-  "euiZLevel8": 8000,
-  "euiZLevel9": 9000,
-  "euiZToastList": 9000,
-  "euiZModal": 8000,
-  "euiZMask": 6000,
-  "euiZNavigation": 6000,
-  "euiZContentMenu": 2000,
-  "euiZHeader": 1000,
-  "euiZFlyout": 1000,
-  "euiZMaskBelowHeader": 1000,
-  "euiZContent": 0,
-  "euiPaletteColorBlind": {
-    "euiColorVis0": {
-      "graphic": "#16C5C0",
-      "behindText": "#16C5C0"
-    },
-    "euiColorVis1": {
-      "graphic": "#A6EDEA",
-      "behindText": "#A6EDEA"
-    },
-    "euiColorVis2": {
-      "graphic": "#61A2FF",
-      "behindText": "#61A2FF"
-    },
-    "euiColorVis3": {
-      "graphic": "#BFDBFF",
-      "behindText": "#BFDBFF"
-    },
-    "euiColorVis4": {
-      "graphic": "#EE72A6",
-      "behindText": "#EE72A6"
-    },
-    "euiColorVis5": {
-      "graphic": "#FFC7DB",
-      "behindText": "#FFC7DB"
-    },
-    "euiColorVis6": {
-      "graphic": "#F6726A",
-      "behindText": "#F6726A"
-    },
-    "euiColorVis7": {
-      "graphic": "#FFC9C2",
-      "behindText": "#FFC9C2"
-    },
-    "euiColorVis8": {
-      "graphic": "#EAAE01",
-      "behindText": "#EAAE01"
-    },
-    "euiColorVis9": {
-      "graphic": "#FCD883",
-      "behindText": "#FCD883"
-    }
-  },
-  "euiPaletteColorBlindKeys": "'euiColorVis0', 'euiColorVis1', 'euiColorVis2', 'euiColorVis3', 'euiColorVis4', 'euiColorVis5', 'euiColorVis6', 'euiColorVis7', 'euiColorVis8', 'euiColorVis9'",
-  "euiColorVis0": "#16C5C0",
-  "euiColorVis1": "#A6EDEA",
-  "euiColorVis2": "#61A2FF",
-  "euiColorVis3": "#BFDBFF",
-  "euiColorVis4": "#EE72A6",
-  "euiColorVis5": "#FFC7DB",
-  "euiColorVis6": "#F6726A",
-  "euiColorVis7": "#FFC9C2",
-  "euiColorVis8": "#EAAE01",
-  "euiColorVis9": "#FCD883",
-  "euiColorVis0_behindText": "#16C5C0",
-  "euiColorVis1_behindText": "#A6EDEA",
-  "euiColorVis2_behindText": "#61A2FF",
-  "euiColorVis3_behindText": "#BFDBFF",
-  "euiColorVis4_behindText": "#EE72A6",
-  "euiColorVis5_behindText": "#FFC7DB",
-  "euiColorVis6_behindText": "#F6726A",
-  "euiColorVis7_behindText": "#FFC9C2",
-  "euiColorVis8_behindText": "#EAAE01",
-  "euiColorVis9_behindText": "#FCD883",
-  "euiColorVisText0": "#16C5C0",
-  "euiColorVisText1": "#A6EDEA",
-  "euiColorVisText2": "#61A2FF",
-  "euiColorVisText3": "#BFDBFF",
-  "euiColorVisText4": "#EE72A6",
-  "euiColorVisText5": "#FFC7DB",
-  "euiColorVisText6": "#F6726A",
-  "euiColorVisText7": "#FFC9C2",
-  "euiColorVisText8": "#EAAE01",
-  "euiColorVisText9": "#FCD883",
-  "euiColorVisSuccess0": "#24C292",
-  "euiColorVisSuccess1": "#AEE8D2",
-  "euiColorVisWarning0": "#FCD883",
-  "euiColorVisDanger0": "#F6726A",
-  "euiColorVisDanger1": "#FFC9C2",
-  "euiColorVisNeutral0": "#F6F9FC",
-  "euiColorVisGrey0": "#CAD3E2",
-  "euiColorVisGrey1": "#8E9FBC",
-  "euiColorVisGrey2": "#5A6D8C",
-  "euiColorVisGrey3": "#1D2A3E",
-  "euiColorVisWarm0": "#FFE8E5",
-  "euiColorVisWarm1": "#FFB5AD",
-  "euiColorVisWarm2": "#F6726A",
-  "euiColorVisCool0": "#E8F1FF",
-  "euiColorVisCool1": "#A3CBFF",
-  "euiColorVisCool2": "#61A2FF",
-  "euiColorVisComplementary0": "#61A2FF",
-  "euiColorVisComplementary1": "#EAAE01",
-  "euiColorSeverityUnknown": "#E3E8F2",
-  "euiColorSeverityNeutral": "#B5E5F2",
-  "euiColorSeveritySuccess": "#24C292",
-  "euiColorSeverityWarning": "#FCD883",
-  "euiColorSeverityRisk": "#FF995E",
-  "euiColorSeverityDanger": "#EE4C48",
-  "euiColorChartLines": "#7186A8",
-  "euiColorChartBand": "#243147",
-  "euiColorGhost": "#FFFFFF",
-  "euiColorInk": "#000000",
-  "euiColorPrimary": "#61A2FF",
-  "euiColorAccent": "#EE72A6",
-  "euiColorAccentSecondary": "#16C5C0",
-  "euiColorSuccess": "#24C292",
-  "euiColorWarning": "#FACB3D",
-  "euiColorDanger": "#F6726A",
-  "euiColorEmptyShade": "#0B1628",
-  "euiColorLightestShade": "#172336",
-  "euiColorLightShade": "#243147",
-  "euiColorMediumShade": "#516381",
-  "euiColorDarkShade": "#7186A8",
-  "euiColorDarkestShade": "#CAD3E2",
-  "euiColorFullShade": "#FFFFFF",
-  "euiPageBackgroundColor": "#07101F",
-  "euiColorHighlight": "#1750BA",
-  "euiTextColor": "#CAD3E2",
-  "euiTitleColor": "#E3E8F2",
-  "euiTextSubduedColor": "#8E9FBC",
-  "euiColorDisabled": "#1D2A3E",
-  "euiColorPrimaryText": "#61A2FF",
-  "euiColorSuccessText": "#24C292",
-  "euiColorAccentText": "#EE72A6",
-  "euiColorWarningText": "#FCD883",
-  "euiColorDangerText": "#F6726A",
-  "euiColorDisabledText": "#6A7FA0",
-  "euiLinkColor": "#61A2FF",
-  "euiColorPlainLight": "#FFFFFF",
-  "euiColorPlainDark": "#07101F",
-  "euiColorTextPrimary": "#61A2FF",
-  "euiColorTextAccent": "#EE72A6",
-  "euiColorTextAccentSecondary": "#16C5C0",
-  "euiColorTextNeutral": "#37B8DC",
-  "euiColorTextSuccess": "#24C292",
-  "euiColorTextWarning": "#FCD883",
-  "euiColorTextRisk": "#FF995E",
-  "euiColorTextDanger": "#F6726A",
-  "euiColorTextParagraph": "#CAD3E2",
-  "euiColorTextHeading": "#E3E8F2",
-  "euiColorTextSubdued": "#8E9FBC",
-  "euiColorTextDisabled": "#6A7FA0",
-  "euiColorTextInverse": "#07101F",
-  "euiColorBackgroundBasePrimary": "#0A2342",
-  "euiColorBackgroundBaseAccent": "#351725",
-  "euiColorBackgroundBaseAccentSecondary": "#03282B",
-  "euiColorBackgroundBaseNeutral": "#002938",
-  "euiColorBackgroundBaseSuccess": "#092A26",
-  "euiColorBackgroundBaseWarning": "#2C2721",
-  "euiColorBackgroundBaseRisk": "#361D18",
-  "euiColorBackgroundBaseDanger": "#351721",
-  "euiColorBackgroundBaseSubdued": "#07101F",
-  "euiColorBackgroundBasePlain": "#0B1628",
-  "euiColorBackgroundBaseDisabled": "#1D2A3E",
-  "euiColorBackgroundBaseHighlighted": "#172336",
-  "euiColorBackgroundBaseFormsPrepend": "#243147",
-  "euiColorBackgroundBaseFormsControlDisabled": "#2B394F",
-  "euiColorBackgroundBaseInteractiveHover": "rgba(255,255,255, 0.08)",
-  "euiColorBackgroundBaseInteractiveSelect": "#0D2F5E",
-  "euiColorBackgroundBaseInteractiveSelectHover": "#123778",
-  "euiColorBackgroundBaseInteractiveOverlay": "rgba(43,57,79, 0.7)",
-  "euiColorBackgroundBaseSkeletonEdge": "rgba(255,255,255, 0.16)",
-  "euiColorBackgroundBaseSkeletonMiddle": "rgba(255,255,255, 0.08)",
-  "euiColorBackgroundLightPrimary": "#0D2F5E",
-  "euiColorBackgroundLightAccent": "#481E32",
-  "euiColorBackgroundLightAccentSecondary": "#023436",
-  "euiColorBackgroundLightNeutral": "#003447",
-  "euiColorBackgroundLightSuccess": "#0D362B",
-  "euiColorBackgroundLightWarning": "#3D3014",
-  "euiColorBackgroundLightRisk": "#4A221C",
-  "euiColorBackgroundLightDanger": "#491D27",
-  "euiColorBackgroundLightText": "#2B394F",
-  "euiColorBackgroundFilledPrimary": "#61A2FF",
-  "euiColorBackgroundFilledAccent": "#EE72A6",
-  "euiColorBackgroundFilledAccentSecondary": "#16C5C0",
-  "euiColorBackgroundFilledNeutral": "#63C8E3",
-  "euiColorBackgroundFilledSuccess": "#24C292",
-  "euiColorBackgroundFilledWarning": "#FACB3D",
-  "euiColorBackgroundFilledRisk": "#FF995E",
-  "euiColorBackgroundFilledDanger": "#F6726A",
-  "euiColorBackgroundFilledText": "#8E9FBC",
-  "euiColorBorderBasePrimary": "#123778",
-  "euiColorBorderBaseAccent": "#5E2140",
-  "euiColorBorderBaseAccentSecondary": "#044949",
-  "euiColorBorderBaseNeutral": "#00425C",
-  "euiColorBorderBaseSuccess": "#094837",
-  "euiColorBorderBaseWarning": "#513910",
-  "euiColorBorderBaseRisk": "#5E281A",
-  "euiColorBorderBaseDanger": "#5E2129",
-  "euiColorBorderBasePlain": "#485975",
-  "euiColorBorderBaseSubdued": "#2B394F",
-  "euiColorBorderBaseDisabled": "#485975",
-  "euiColorBorderBaseFloating": "#2B394F",
-  "euiColorBorderBaseFormsColorSwatch": "rgba(255,255,255, 0.32)",
-  "euiColorBorderBaseFormsControl": "#6A7FA0",
-  "euiColorBorderInteractiveFormsHoverPlain": "#5A6D8C",
-  "euiColorBorderInteractiveFormsHoverDanger": "#EE4C48",
-  "euiColorBorderStrongPrimary": "#61A2FF",
-  "euiColorBorderStrongAccent": "#EE72A6",
-  "euiColorBorderStrongAccentSecondary": "#16C5C0",
-  "euiColorBorderStrongNeutral": "#37B8DC",
-  "euiColorBorderStrongSuccess": "#24C292",
-  "euiColorBorderStrongWarning": "#FACB3D",
-  "euiColorBorderStrongRisk": "#FC8544",
-  "euiColorBorderStrongDanger": "#F6726A",
-  "euiColorBorderStrongText": "#8E9FBC"
-}
diff --git a/packages/eui/src/themes/json/eui_theme_borealis_dark.json.d.ts b/packages/eui/src/themes/json/eui_theme_borealis_dark.json.d.ts
deleted file mode 100644
index 1bdbf5ab145..00000000000
--- a/packages/eui/src/themes/json/eui_theme_borealis_dark.json.d.ts
+++ /dev/null
@@ -1,466 +0,0 @@
-declare module '@elastic/eui/dist/eui_theme_borealis_dark.json' {
-  const sassVariables: {
-    euiZDataGrid: number;
-    euiZHeaderBelowDataGrid: number;
-    euiZDataGridCellPopover: number;
-    euiDataGridCellPaddingS: string;
-    euiDataGridCellPaddingM: string;
-    euiDataGridCellPaddingL: string;
-    euiTableHoverColor: string;
-    euiTableSelectedColor: string;
-    euiTableHoverSelectedColor: string;
-    euiTableActionsBorderColor: string;
-    euiTableHoverClickableColor: string;
-    euiTableFocusClickableColor: string;
-    euiContrastRatioText: number;
-    euiContrastRatioGraphic: number;
-    euiContrastRatioDisabled: number;
-    euiAnimSlightBounce: string;
-    euiAnimSlightResistance: string;
-    euiAnimSpeedExtraFast: string;
-    euiAnimSpeedFast: string;
-    euiAnimSpeedNormal: string;
-    euiAnimSpeedSlow: string;
-    euiAnimSpeedExtraSlow: string;
-    euiBorderWidthThin: string;
-    euiBorderWidthThick: string;
-    euiBorderColor: string;
-    euiBorderRadius: string;
-    euiBorderRadiusSmall: string;
-    euiBorderThick: string;
-    euiBorderThin: string;
-    euiBorderEditable: string;
-    euiButtonHeight: string;
-    euiButtonHeightSmall: string;
-    euiButtonHeightXSmall: string;
-    euiButtonColorDisabled: string;
-    euiButtonColorDisabledText: string;
-    euiButtonColorGhostDisabled: string;
-    euiButtonTypes: {
-      primary: string;
-      accent: string;
-      accentSecondary: string;
-      neutral: string;
-      success: string;
-      warning: string;
-      risk: string;
-      danger: string;
-      ghost: string;
-      text: string;
-    };
-    euiFontWeightLight: number;
-    euiFontWeightRegular: number;
-    euiFontWeightMedium: number;
-    euiFontWeightSemiBold: number;
-    euiFontWeightBold: number;
-    euiCodeFontWeightRegular: number;
-    euiCodeFontWeightBold: number;
-    euiFormMaxWidth: string;
-    euiFormControlHeight: string;
-    euiFormControlCompressedHeight: string;
-    euiFormControlPadding: string;
-    euiFormControlCompressedPadding: string;
-    euiFormControlBorderRadius: string;
-    euiFormControlCompressedBorderRadius: string;
-    euiRadioSize: string;
-    euiCheckBoxSize: string;
-    euiCheckboxBorderRadius: string;
-    euiSwitchHeight: string;
-    euiSwitchWidth: string;
-    euiSwitchThumbSize: string;
-    euiSwitchIconHeight: string;
-    euiSwitchHeightCompressed: string;
-    euiSwitchWidthCompressed: string;
-    euiSwitchThumbSizeCompressed: string;
-    euiSwitchHeightMini: string;
-    euiSwitchWidthMini: string;
-    euiSwitchThumbSizeMini: string;
-    euiFormBackgroundColor: string;
-    euiFormBackgroundDisabledColor: string;
-    euiFormBackgroundReadOnlyColor: string;
-    euiFormBorderOpaqueColor: string;
-    euiFormBorderColor: string;
-    euiFormBorderDisabledColor: string;
-    euiFormCustomControlDisabledIconColor: string;
-    euiFormCustomControlBorderColor: string;
-    euiFormControlDisabledColor: string;
-    euiFormControlBoxShadow: string;
-    euiFormControlPlaceholderText: string;
-    euiFormInputGroupLabelBackground: string;
-    euiFormInputGroupBorder: string;
-    euiSwitchOffColor: string;
-    euiFormControlIconSizes: {
-      small: string;
-      medium: string;
-      large: string;
-      xLarge: string;
-      xxLarge: string;
-    };
-    euiFormControlLayoutGroupInputHeight: string;
-    euiFormControlLayoutGroupInputCompressedHeight: string;
-    euiFormControlLayoutGroupInputCompressedBorderRadius: string;
-    euiHeaderBackgroundColor: string;
-    euiHeaderDarkBackgroundColor: string;
-    euiHeaderBorderColor: string;
-    euiHeaderBreadcrumbColor: string;
-    euiHeaderHeight: string;
-    euiHeaderChildSize: string;
-    euiHeaderHeightCompensation: string;
-    euiPageDefaultMaxWidth: string;
-    euiPageSidebarMinWidth: string;
-    euiPanelPaddingModifiers: {
-      paddingSmall: string;
-      paddingMedium: string;
-      paddingLarge: string;
-    };
-    euiPanelBorderRadiusModifiers: {
-      borderRadiusNone: number;
-      borderRadiusMedium: string;
-    };
-    euiPanelBackgroundColorModifiers: {
-      transparent: string;
-      plain: string;
-      subdued: string;
-      accent: string;
-      accentSecondary: string;
-      primary: string;
-      success: string;
-      warning: string;
-      danger: string;
-    };
-    euiBreakpoints: {
-      xs: number;
-      s: string;
-      m: string;
-      l: string;
-      xl: string;
-    };
-    euiBreakpointKeys: string;
-    euiShadowColor: string;
-    euiShadows: {
-      xs: {
-        down: string;
-        up: string;
-      };
-      s: {
-        down: string;
-        up: string;
-      };
-      m: {
-        down: string;
-        up: string;
-      };
-      l: {
-        down: string;
-        up: string;
-      };
-      xl: {
-        down: string;
-        up: string;
-      };
-      hover: {
-        base: {
-          down: string;
-          up: string;
-        };
-        xl: {
-          down: string;
-          up: string;
-        };
-      };
-      flat: {
-        down: string;
-        up: string;
-      };
-    };
-    euiSize: string;
-    euiSizeXS: string;
-    euiSizeS: string;
-    euiSizeM: string;
-    euiSizeL: string;
-    euiSizeXL: string;
-    euiSizeXXL: string;
-    euiScrollBar: string;
-    euiScrollBarCorner: string;
-    euiScrollBarCornerThin: string;
-    euiFocusRingColor: string;
-    euiFocusRingAnimStartColor: string;
-    euiFocusRingAnimStartSize: string;
-    euiFocusRingAnimStartSizeLarge: string;
-    euiFocusRingSizeLarge: string;
-    euiFocusRingSize: string;
-    euiFocusTransparency: number;
-    euiFocusTransparencyPercent: string;
-    euiFocusBackgroundColor: string;
-    euiFontFamily: string;
-    euiCodeFontFamily: string;
-    euiFontFeatureSettings: string;
-    euiTextScale: string;
-    euiFontSize: string;
-    euiFontSizeXS: string;
-    euiFontSizeS: string;
-    euiFontSizeM: string;
-    euiFontSizeL: string;
-    euiFontSizeXL: string;
-    euiFontSizeXXL: string;
-    euiLineHeight: number;
-    euiBodyLineHeight: number;
-    euiTitles: {
-      xxxs: {
-        'font-size': string;
-        'line-height': string;
-        'font-weight': number;
-      };
-      xxs: {
-        'font-size': string;
-        'line-height': string;
-        'font-weight': number;
-      };
-      xs: {
-        'font-size': string;
-        'line-height': string;
-        'font-weight': number;
-      };
-      s: {
-        'font-size': string;
-        'line-height': string;
-        'font-weight': number;
-      };
-      m: {
-        'font-size': string;
-        'line-height': string;
-        'font-weight': number;
-      };
-      l: {
-        'font-size': string;
-        'line-height': string;
-        'font-weight': number;
-      };
-    };
-    euiZLevel0: number;
-    euiZLevel1: number;
-    euiZLevel2: number;
-    euiZLevel3: number;
-    euiZLevel4: number;
-    euiZLevel5: number;
-    euiZLevel6: number;
-    euiZLevel7: number;
-    euiZLevel8: number;
-    euiZLevel9: number;
-    euiZToastList: number;
-    euiZModal: number;
-    euiZMask: number;
-    euiZNavigation: number;
-    euiZContentMenu: number;
-    euiZHeader: number;
-    euiZFlyout: number;
-    euiZMaskBelowHeader: number;
-    euiZContent: number;
-    euiPaletteColorBlind: {
-      euiColorVis0: {
-        graphic: string;
-        behindText: string;
-      };
-      euiColorVis1: {
-        graphic: string;
-        behindText: string;
-      };
-      euiColorVis2: {
-        graphic: string;
-        behindText: string;
-      };
-      euiColorVis3: {
-        graphic: string;
-        behindText: string;
-      };
-      euiColorVis4: {
-        graphic: string;
-        behindText: string;
-      };
-      euiColorVis5: {
-        graphic: string;
-        behindText: string;
-      };
-      euiColorVis6: {
-        graphic: string;
-        behindText: string;
-      };
-      euiColorVis7: {
-        graphic: string;
-        behindText: string;
-      };
-      euiColorVis8: {
-        graphic: string;
-        behindText: string;
-      };
-      euiColorVis9: {
-        graphic: string;
-        behindText: string;
-      };
-    };
-    euiPaletteColorBlindKeys: string;
-    euiColorVis0: string;
-    euiColorVis1: string;
-    euiColorVis2: string;
-    euiColorVis3: string;
-    euiColorVis4: string;
-    euiColorVis5: string;
-    euiColorVis6: string;
-    euiColorVis7: string;
-    euiColorVis8: string;
-    euiColorVis9: string;
-    euiColorVis0_behindText: string;
-    euiColorVis1_behindText: string;
-    euiColorVis2_behindText: string;
-    euiColorVis3_behindText: string;
-    euiColorVis4_behindText: string;
-    euiColorVis5_behindText: string;
-    euiColorVis6_behindText: string;
-    euiColorVis7_behindText: string;
-    euiColorVis8_behindText: string;
-    euiColorVis9_behindText: string;
-    euiColorVisText0: string;
-    euiColorVisText1: string;
-    euiColorVisText2: string;
-    euiColorVisText3: string;
-    euiColorVisText4: string;
-    euiColorVisText5: string;
-    euiColorVisText6: string;
-    euiColorVisText7: string;
-    euiColorVisText8: string;
-    euiColorVisText9: string;
-    euiColorVisSuccess0: string;
-    euiColorVisSuccess1: string;
-    euiColorVisWarning0: string;
-    euiColorVisDanger0: string;
-    euiColorVisDanger1: string;
-    euiColorVisNeutral0: string;
-    euiColorVisGrey0: string;
-    euiColorVisGrey1: string;
-    euiColorVisGrey2: string;
-    euiColorVisGrey3: string;
-    euiColorVisWarm0: string;
-    euiColorVisWarm1: string;
-    euiColorVisWarm2: string;
-    euiColorVisCool0: string;
-    euiColorVisCool1: string;
-    euiColorVisCool2: string;
-    euiColorVisComplementary0: string;
-    euiColorVisComplementary1: string;
-    euiColorSeverityUnknown: string;
-    euiColorSeverityNeutral: string;
-    euiColorSeveritySuccess: string;
-    euiColorSeverityWarning: string;
-    euiColorSeverityRisk: string;
-    euiColorSeverityDanger: string;
-    euiColorChartLines: string;
-    euiColorChartBand: string;
-    euiColorGhost: string;
-    euiColorInk: string;
-    euiColorPrimary: string;
-    euiColorAccent: string;
-    euiColorAccentSecondary: string;
-    euiColorSuccess: string;
-    euiColorWarning: string;
-    euiColorDanger: string;
-    euiColorEmptyShade: string;
-    euiColorLightestShade: string;
-    euiColorLightShade: string;
-    euiColorMediumShade: string;
-    euiColorDarkShade: string;
-    euiColorDarkestShade: string;
-    euiColorFullShade: string;
-    euiPageBackgroundColor: string;
-    euiColorHighlight: string;
-    euiTextColor: string;
-    euiTitleColor: string;
-    euiTextSubduedColor: string;
-    euiColorDisabled: string;
-    euiColorPrimaryText: string;
-    euiColorSuccessText: string;
-    euiColorAccentText: string;
-    euiColorWarningText: string;
-    euiColorDangerText: string;
-    euiColorDisabledText: string;
-    euiLinkColor: string;
-    euiColorPlainLight: string;
-    euiColorPlainDark: string;
-    euiColorTextPrimary: string;
-    euiColorTextAccent: string;
-    euiColorTextAccentSecondary: string;
-    euiColorTextNeutral: string;
-    euiColorTextSuccess: string;
-    euiColorTextWarning: string;
-    euiColorTextRisk: string;
-    euiColorTextDanger: string;
-    euiColorTextParagraph: string;
-    euiColorTextHeading: string;
-    euiColorTextSubdued: string;
-    euiColorTextDisabled: string;
-    euiColorTextInverse: string;
-    euiColorBackgroundBasePrimary: string;
-    euiColorBackgroundBaseAccent: string;
-    euiColorBackgroundBaseAccentSecondary: string;
-    euiColorBackgroundBaseNeutral: string;
-    euiColorBackgroundBaseSuccess: string;
-    euiColorBackgroundBaseWarning: string;
-    euiColorBackgroundBaseRisk: string;
-    euiColorBackgroundBaseDanger: string;
-    euiColorBackgroundBaseSubdued: string;
-    euiColorBackgroundBasePlain: string;
-    euiColorBackgroundBaseDisabled: string;
-    euiColorBackgroundBaseHighlighted: string;
-    euiColorBackgroundBaseFormsPrepend: string;
-    euiColorBackgroundBaseFormsControlDisabled: string;
-    euiColorBackgroundBaseInteractiveHover: string;
-    euiColorBackgroundBaseInteractiveSelect: string;
-    euiColorBackgroundBaseInteractiveSelectHover: string;
-    euiColorBackgroundBaseInteractiveOverlay: string;
-    euiColorBackgroundBaseSkeletonEdge: string;
-    euiColorBackgroundBaseSkeletonMiddle: string;
-    euiColorBackgroundLightPrimary: string;
-    euiColorBackgroundLightAccent: string;
-    euiColorBackgroundLightAccentSecondary: string;
-    euiColorBackgroundLightNeutral: string;
-    euiColorBackgroundLightSuccess: string;
-    euiColorBackgroundLightWarning: string;
-    euiColorBackgroundLightRisk: string;
-    euiColorBackgroundLightDanger: string;
-    euiColorBackgroundLightText: string;
-    euiColorBackgroundFilledPrimary: string;
-    euiColorBackgroundFilledAccent: string;
-    euiColorBackgroundFilledAccentSecondary: string;
-    euiColorBackgroundFilledNeutral: string;
-    euiColorBackgroundFilledSuccess: string;
-    euiColorBackgroundFilledWarning: string;
-    euiColorBackgroundFilledRisk: string;
-    euiColorBackgroundFilledDanger: string;
-    euiColorBackgroundFilledText: string;
-    euiColorBorderBasePrimary: string;
-    euiColorBorderBaseAccent: string;
-    euiColorBorderBaseAccentSecondary: string;
-    euiColorBorderBaseNeutral: string;
-    euiColorBorderBaseSuccess: string;
-    euiColorBorderBaseWarning: string;
-    euiColorBorderBaseRisk: string;
-    euiColorBorderBaseDanger: string;
-    euiColorBorderBasePlain: string;
-    euiColorBorderBaseSubdued: string;
-    euiColorBorderBaseDisabled: string;
-    euiColorBorderBaseFloating: string;
-    euiColorBorderBaseFormsColorSwatch: string;
-    euiColorBorderBaseFormsControl: string;
-    euiColorBorderInteractiveFormsHoverPlain: string;
-    euiColorBorderInteractiveFormsHoverDanger: string;
-    euiColorBorderStrongPrimary: string;
-    euiColorBorderStrongAccent: string;
-    euiColorBorderStrongAccentSecondary: string;
-    euiColorBorderStrongNeutral: string;
-    euiColorBorderStrongSuccess: string;
-    euiColorBorderStrongWarning: string;
-    euiColorBorderStrongRisk: string;
-    euiColorBorderStrongDanger: string;
-    euiColorBorderStrongText: string;
-  };
-  export default sassVariables;
-}
diff --git a/packages/eui/src/themes/json/eui_theme_borealis_light.json b/packages/eui/src/themes/json/eui_theme_borealis_light.json
deleted file mode 100644
index c7d2be2e4bf..00000000000
--- a/packages/eui/src/themes/json/eui_theme_borealis_light.json
+++ /dev/null
@@ -1,463 +0,0 @@
-{
-  "euiZDataGrid": 999,
-  "euiZHeaderBelowDataGrid": 998,
-  "euiZDataGridCellPopover": 1000,
-  "euiDataGridCellPaddingS": "4px",
-  "euiDataGridCellPaddingM": "6px",
-  "euiDataGridCellPaddingL": "8px",
-  "euiTableHoverColor": "rgba(54, 95, 178, 0.06)",
-  "euiTableSelectedColor": "#EDEFF3",
-  "euiTableHoverSelectedColor": "rgba(54, 95, 178, 0.06)",
-  "euiTableActionsBorderColor": "#E3E8F2",
-  "euiTableHoverClickableColor": "rgba(54, 95, 178, 0.06)",
-  "euiTableFocusClickableColor": "rgba(54, 95, 178, 0.06)",
-  "euiContrastRatioText": 4.5,
-  "euiContrastRatioGraphic": 3,
-  "euiContrastRatioDisabled": 2,
-  "euiAnimSlightBounce": "cubic-bezier(0.34, 1.61, 0.7, 1)",
-  "euiAnimSlightResistance": "cubic-bezier(0.694, 0.0482, 0.335, 1)",
-  "euiAnimSpeedExtraFast": "90ms",
-  "euiAnimSpeedFast": "150ms",
-  "euiAnimSpeedNormal": "250ms",
-  "euiAnimSpeedSlow": "350ms",
-  "euiAnimSpeedExtraSlow": "500ms",
-  "euiBorderWidthThin": "1px",
-  "euiBorderWidthThick": "2px",
-  "euiBorderColor": "#E3E8F2",
-  "euiBorderRadius": "4px",
-  "euiBorderRadiusSmall": "4px",
-  "euiBorderThick": "2px solid #E3E8F2",
-  "euiBorderThin": "1px solid #E3E8F2",
-  "euiBorderEditable": "2px dotted #E3E8F2",
-  "euiButtonHeight": "40px",
-  "euiButtonHeightSmall": "32px",
-  "euiButtonHeightXSmall": "24px",
-  "euiButtonColorDisabled": "#ECF1F9",
-  "euiButtonColorDisabledText": "#798EAF",
-  "euiButtonColorGhostDisabled": "#ECF1F9",
-  "euiButtonTypes": {
-    "primary": "#0B64DD",
-    "accent": "#BC1E70",
-    "accentSecondary": "#008B87",
-    "neutral": "#1C8CB5",
-    "success": "#008A5E",
-    "warning": "#FACB3D",
-    "risk": "#ED6723",
-    "danger": "#C61E25",
-    "ghost": "#ffffff",
-    "text": "#5A6D8C"
-  },
-  "euiFontWeightLight": 300,
-  "euiFontWeightRegular": 400,
-  "euiFontWeightMedium": 450,
-  "euiFontWeightSemiBold": 500,
-  "euiFontWeightBold": 600,
-  "euiCodeFontWeightRegular": 400,
-  "euiCodeFontWeightBold": 600,
-  "euiFormMaxWidth": "400px",
-  "euiFormControlHeight": "40px",
-  "euiFormControlCompressedHeight": "32px",
-  "euiFormControlPadding": "12px",
-  "euiFormControlCompressedPadding": "8px",
-  "euiFormControlBorderRadius": "4px",
-  "euiFormControlCompressedBorderRadius": "4px",
-  "euiRadioSize": "16px",
-  "euiCheckBoxSize": "16px",
-  "euiCheckboxBorderRadius": "4px",
-  "euiSwitchHeight": "20px",
-  "euiSwitchWidth": "44px",
-  "euiSwitchThumbSize": "20px",
-  "euiSwitchIconHeight": "16px",
-  "euiSwitchHeightCompressed": "16px",
-  "euiSwitchWidthCompressed": "28px",
-  "euiSwitchThumbSizeCompressed": "16px",
-  "euiSwitchHeightMini": "10px",
-  "euiSwitchWidthMini": "22px",
-  "euiSwitchThumbSizeMini": "10px",
-  "euiFormBackgroundColor": "#F6F9FC",
-  "euiFormBackgroundDisabledColor": "#ECF1F9",
-  "euiFormBackgroundReadOnlyColor": "#FFFFFF",
-  "euiFormBorderOpaqueColor": "#1c2390",
-  "euiFormBorderColor": "#CAD3E2",
-  "euiFormBorderDisabledColor": "#CAD3E2",
-  "euiFormCustomControlDisabledIconColor": "#798EAF",
-  "euiFormCustomControlBorderColor": "#CAD3E2",
-  "euiFormControlDisabledColor": "#CAD3E2",
-  "euiFormControlBoxShadow": "0 0 rgba(0, 0, 0, 0)",
-  "euiFormControlPlaceholderText": "#5A6D8C",
-  "euiFormInputGroupLabelBackground": "#ECF1F9",
-  "euiFormInputGroupBorder": "none",
-  "euiSwitchOffColor": "#5A6D8C",
-  "euiFormControlIconSizes": {
-    "small": "12px",
-    "medium": "16px",
-    "large": "24px",
-    "xLarge": "32px",
-    "xxLarge": "40px"
-  },
-  "euiFormControlLayoutGroupInputHeight": "38px",
-  "euiFormControlLayoutGroupInputCompressedHeight": "30px",
-  "euiFormControlLayoutGroupInputCompressedBorderRadius": "2px",
-  "euiHeaderBackgroundColor": "#FFFFFF",
-  "euiHeaderDarkBackgroundColor": "#0B1628",
-  "euiHeaderBorderColor": "#E3E8F2",
-  "euiHeaderBreadcrumbColor": "#D9E8FF",
-  "euiHeaderHeight": "48px",
-  "euiHeaderChildSize": "40px",
-  "euiHeaderHeightCompensation": "48px",
-  "euiPageDefaultMaxWidth": "1200px",
-  "euiPageSidebarMinWidth": "192px",
-  "euiPanelPaddingModifiers": {
-    "paddingSmall": "8px",
-    "paddingMedium": "16px",
-    "paddingLarge": "24px"
-  },
-  "euiPanelBorderRadiusModifiers": {
-    "borderRadiusNone": 0,
-    "borderRadiusMedium": "4px"
-  },
-  "euiPanelBackgroundColorModifiers": {
-    "transparent": "rgba(0, 0, 0, 0)",
-    "plain": "#FFFFFF",
-    "subdued": "#F6F9FC",
-    "accent": "#FFEBF5",
-    "accentSecondary": "#E2F9F7",
-    "primary": "#E8F1FF",
-    "success": "#E2F8F0",
-    "warning": "#FDF3D8",
-    "danger": "#FFE8E5"
-  },
-  "euiBreakpoints": {
-    "xs": 0,
-    "s": "575px",
-    "m": "768px",
-    "l": "992px",
-    "xl": "1200px"
-  },
-  "euiBreakpointKeys": "'xs', 's', 'm', 'l', 'xl'",
-  "euiShadowColor": "#2B394F",
-  "euiShadows": {
-    "xs": {
-      "down": "0px 0px 2px 0px hsl(216.67deg 29.51% 23.92% / 0.16), 0px 1px 4px 0px hsl(216.67deg 29.51% 23.92% / 0.06), 0px 2px 8px 0px hsl(216.67deg 29.51% 23.92% / 0.04)",
-      "up": "0px 0px 2px 0px hsl(216.67deg 29.51% 23.92% / 0.16), 0px -1px 4px 0px hsl(216.67deg 29.51% 23.92% / 0.06), 0px -2px 8px 0px hsl(216.67deg 29.51% 23.92% / 0.04)"
-    },
-    "s": {
-      "down": "0px 0px 2px 0px hsl(216.67deg 29.51% 23.92% / 0.16), 0px 2px 7px 0px hsl(216.67deg 29.51% 23.92% / 0.08), 0px 4px 11px 0px hsl(216.67deg 29.51% 23.92% / 0.05)",
-      "up": "0px 0px 2px 0px hsl(216.67deg 29.51% 23.92% / 0.16), 0px -2px 7px 0px hsl(216.67deg 29.51% 23.92% / 0.08), 0px -4px 11px 0px hsl(216.67deg 29.51% 23.92% / 0.05)"
-    },
-    "m": {
-      "down": "0px 0px 2px 0px hsl(216.67deg 29.51% 23.92% / 0.16), 0px 3px 10px 0px hsl(216.67deg 29.51% 23.92% / 0.1), 0px 6px 14px 0px hsl(216.67deg 29.51% 23.92% / 0.06)",
-      "up": "0px 0px 2px 0px hsl(216.67deg 29.51% 23.92% / 0.16), 0px -3px 10px 0px hsl(216.67deg 29.51% 23.92% / 0.1), 0px -6px 14px 0px hsl(216.67deg 29.51% 23.92% / 0.06)"
-    },
-    "l": {
-      "down": "0px 0px 2px 0px hsl(216.67deg 29.51% 23.92% / 0.16), 0px 4px 13px 0px hsl(216.67deg 29.51% 23.92% / 0.12), 0px 8px 17px 0px hsl(216.67deg 29.51% 23.92% / 0.07)",
-      "up": "0px 0px 2px 0px hsl(216.67deg 29.51% 23.92% / 0.16), 0px -4px 13px 0px hsl(216.67deg 29.51% 23.92% / 0.12), 0px -8px 17px 0px hsl(216.67deg 29.51% 23.92% / 0.07)"
-    },
-    "xl": {
-      "down": "0px 0px 2px 0px hsl(216.67deg 29.51% 23.92% / 0.16), 0px 5px 16px 0px hsl(216.67deg 29.51% 23.92% / 0.14), 0px 10px 20px 0px hsl(216.67deg 29.51% 23.92% / 0.08)",
-      "up": "0px 0px 2px 0px hsl(216.67deg 29.51% 23.92% / 0.16), 0px -5px 16px 0px hsl(216.67deg 29.51% 23.92% / 0.14), 0px -10px 20px 0px hsl(216.67deg 29.51% 23.92% / 0.08)"
-    },
-    "hover": {
-      "base": {
-        "down": "0px 0px 2px 0px hsla(216.67,29.51%,23.92%,0.16), 0px 2px 7px 0px hsla(216.67,29.51%,23.92%,0.08), 0px 4px 11px 0px hsla(216.67,29.51%,23.92%,0.05)",
-        "up": "0px 0px 2px 0px hsla(216.67,29.51%,23.92%,0.16), 0px -2px 7px 0px hsla(216.67,29.51%,23.92%,0.08), 0px -4px 11px 0px hsla(216.67,29.51%,23.92%,0.05)"
-      },
-        "xl": {
-        "down": "0px 0px 2px 0px hsl(216.67deg 29.51% 23.92% / 0.16), 0px 6px 19px 0px hsl(216.67deg 29.51% 23.92% / 0.16), 0px 12px 23px 0px hsl(216.67deg 29.51% 23.92% / 0.09)",
-        "up": "0px 0px 2px 0px hsl(216.67deg 29.51% 23.92% / 0.16), 0px -6px 19px 0px hsl(216.67deg 29.51% 23.92% / 0.16), 0px -12px 23px 0px hsl(216.67deg 29.51% 23.92% / 0.09)"
-      }
-    },
-    "flat": {
-      "down": "0px 0px 2px 0px hsl(216.67deg 29.51% 23.92% / 0.16), 0px 1px 4px 0px hsl(216.67deg 29.51% 23.92% / 0.06), 0px 2px 8px 0px hsl(216.67deg 29.51% 23.92% / 0.04)",
-      "up": "0px 0px 2px 0px hsl(216.67deg 29.51% 23.92% / 0.16), 0px -1px 4px 0px hsl(216.67deg 29.51% 23.92% / 0.06), 0px -2px 8px 0px hsl(216.67deg 29.51% 23.92% / 0.04)"
-    }
-  },
-  "euiSize": "16px",
-  "euiSizeXS": "4px",
-  "euiSizeS": "8px",
-  "euiSizeM": "12px",
-  "euiSizeL": "24px",
-  "euiSizeXL": "32px",
-  "euiSizeXXL": "40px",
-  "euiScrollBar": "16px",
-  "euiScrollBarCorner": "4px",
-  "euiScrollBarCornerThin": "6px",
-  "euiFocusRingColor": "#1750BA",
-  "euiFocusRingAnimStartColor": "rgba(0, 0, 0, 0)",
-  "euiFocusRingAnimStartSize": "2px",
-  "euiFocusRingAnimStartSizeLarge": "10px",
-  "euiFocusRingSizeLarge": "4px",
-  "euiFocusRingSize": "2px",
-  "euiFocusTransparency": 0.9,
-  "euiFocusTransparencyPercent": "90%",
-  "euiFocusBackgroundColor": "#ECF1F9",
-  "euiFontFamily": "'Inter', '-apple-system', 'BlinkMacSystemFont', 'Segoe UI', 'Helvetica', 'Arial', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'",
-  "euiCodeFontFamily": "'Roboto Mono', 'Consolas', 'Menlo', 'Courier', monospace",
-  "euiFontFeatureSettings": "calt 1 kern 1 liga 1",
-  "euiTextScale": "1,875, 1.5, 1.25, 1, .875, .75",
-  "euiFontSize": "14px",
-  "euiFontSizeXS": "12px",
-  "euiFontSizeS": "14px",
-  "euiFontSizeM": "16px",
-  "euiFontSizeL": "20px",
-  "euiFontSizeXL": "24px",
-  "euiFontSizeXXL": "30px",
-  "euiLineHeight": 1.5,
-  "euiBodyLineHeight": 1.142857143,
-  "euiTitles": {
-    "xxxs": {
-      "font-size": "12px",
-      "line-height": "1.1429rem",
-      "font-weight": 600
-    },
-    "xxs": {
-      "font-size": "14px",
-      "line-height": "1.4286rem",
-      "font-weight": 600
-    },
-    "xs": {
-      "font-size": "16px",
-      "line-height": "1.7143rem",
-      "font-weight": 600
-    },
-    "s": {
-      "font-size": "20px",
-      "line-height": "1.7143rem",
-      "font-weight": 600
-    },
-    "m": {
-      "font-size": "24px",
-      "line-height": "2rem",
-      "font-weight": 600
-    },
-    "l": {
-      "font-size": "30px",
-      "line-height": "2.5714rem",
-      "font-weight": 600
-    }
-  },
-  "euiZLevel0": 0,
-  "euiZLevel1": 1000,
-  "euiZLevel2": 2000,
-  "euiZLevel3": 3000,
-  "euiZLevel4": 4000,
-  "euiZLevel5": 5000,
-  "euiZLevel6": 6000,
-  "euiZLevel7": 7000,
-  "euiZLevel8": 8000,
-  "euiZLevel9": 9000,
-  "euiZToastList": 9000,
-  "euiZModal": 8000,
-  "euiZMask": 6000,
-  "euiZNavigation": 6000,
-  "euiZContentMenu": 2000,
-  "euiZHeader": 1000,
-  "euiZFlyout": 1000,
-  "euiZMaskBelowHeader": 1000,
-  "euiZContent": 0,
-  "euiPaletteColorBlind": {
-    "euiColorVis0": {
-      "graphic": "#16C5C0",
-      "behindText": "#16C5C0"
-    },
-    "euiColorVis1": {
-      "graphic": "#98E6E2",
-      "behindText": "#98E6E2"
-    },
-    "euiColorVis2": {
-      "graphic": "#61A2FF",
-      "behindText": "#61A2FF"
-    },
-    "euiColorVis3": {
-      "graphic": "#BFDBFF",
-      "behindText": "#BFDBFF"
-    },
-    "euiColorVis4": {
-      "graphic": "#EE72A6",
-      "behindText": "#EE72A6"
-    },
-    "euiColorVis5": {
-      "graphic": "#FFC7DB",
-      "behindText": "#FFC7DB"
-    },
-    "euiColorVis6": {
-      "graphic": "#F6726A",
-      "behindText": "#F6726A"
-    },
-    "euiColorVis7": {
-      "graphic": "#FFC9C2",
-      "behindText": "#FFC9C2"
-    },
-    "euiColorVis8": {
-      "graphic": "#EAAE01",
-      "behindText": "#EAAE01"
-    },
-    "euiColorVis9": {
-      "graphic": "#FCD883",
-      "behindText": "#FCD883"
-    }
-  },
-  "euiPaletteColorBlindKeys": "'euiColorVis0', 'euiColorVis1', 'euiColorVis2', 'euiColorVis3', 'euiColorVis4', 'euiColorVis5', 'euiColorVis6', 'euiColorVis7', 'euiColorVis8', 'euiColorVis9'",
-  "euiColorVis0": "#16C5C0",
-  "euiColorVis1": "#A6EDEA",
-  "euiColorVis2": "#61A2FF",
-  "euiColorVis3": "#BFDBFF",
-  "euiColorVis4": "#EE72A6",
-  "euiColorVis5": "#FFC7DB",
-  "euiColorVis6": "#F6726A",
-  "euiColorVis7": "#FFC9C2",
-  "euiColorVis8": "#EAAE01",
-  "euiColorVis9": "#FCD883",
-  "euiColorVis0_behindText": "#16C5C0",
-  "euiColorVis1_behindText": "#A6EDEA",
-  "euiColorVis2_behindText": "#61A2FF",
-  "euiColorVis3_behindText": "#B4D5FF",
-  "euiColorVis4_behindText": "#EE72A6",
-  "euiColorVis5_behindText": "#FFC7DB",
-  "euiColorVis6_behindText": "#F6726A",
-  "euiColorVis7_behindText": "#FFC9C2",
-  "euiColorVis8_behindText": "#EAAE01",
-  "euiColorVis9_behindText": "#FCD883",
-  "euiColorVisText0": "#065B58",
-  "euiColorVisText1": "#047471",
-  "euiColorVisText2": "#154399",
-  "euiColorVisText3": "#0B64DD",
-  "euiColorVisText4": "#A11262",
-  "euiColorVisText5": "#D13680",
-  "euiColorVisText6": "#A71627",
-  "euiColorVisText7": "#DA3737",
-  "euiColorVisText8": "#6A4906",
-  "euiColorVisText9": "#966B03",
-  "euiColorVisSuccess0": "#24C292",
-  "euiColorVisSuccess1": "#AEE8D2",
-  "euiColorVisWarning0": "#FCD883",
-  "euiColorVisDanger0": "#F6726A",
-  "euiColorVisDanger1": "#FFC9C2",
-  "euiColorVisNeutral0": "#F6F9FC",
-  "euiColorVisGrey0": "#CAD3E2",
-  "euiColorVisGrey1": "#8E9FBC",
-  "euiColorVisGrey2": "#5A6D8C",
-  "euiColorVisGrey3": "#1D2A3E",
-  "euiColorVisWarm0": "#FFE8E5",
-  "euiColorVisWarm1": "#FFB5AD",
-  "euiColorVisWarm2": "#F6726A",
-  "euiColorVisCool0": "#E8F1FF",
-  "euiColorVisCool1": "#A3CBFF",
-  "euiColorVisCool2": "#61A2FF",
-  "euiColorVisComplementary0": "#61A2FF",
-  "euiColorVisComplementary1": "#EAAE01",
-  "euiColorSeverityUnknown": "#E3E8F2",
-  "euiColorSeverityNeutral": "#B5E5F2",
-  "euiColorSeveritySuccess": "#24C292",
-  "euiColorSeverityWarning": "#FCD883",
-  "euiColorSeverityRisk": "#FF995E",
-  "euiColorSeverityDanger": "#EE4C48",
-  "euiColorChartLines": "#CAD3E2",
-  "euiColorChartBand": "#F6F9FC",
-  "euiColorGhost": "#FFFFFF",
-  "euiColorInk": "#000000",
-  "euiColorPrimary": "#0B64DD",
-  "euiColorAccent": "#BC1E70",
-  "euiColorAccentSecondary": "#008B87",
-  "euiColorSuccess": "#008A5E",
-  "euiColorWarning": "#FACB3D",
-  "euiColorDanger": "#C61E25",
-  "euiColorEmptyShade": "#FFFFFF",
-  "euiColorLightestShade": "#ECF1F9",
-  "euiColorLightShade": "#CAD3E2",
-  "euiColorMediumShade": "#8E9FBC",
-  "euiColorDarkShade": "#5A6D8C",
-  "euiColorDarkestShade": "#2B394F",
-  "euiColorFullShade": "#07101F",
-  "euiPageBackgroundColor": "#F6F9FC",
-  "euiColorHighlight": "#E8F1FF",
-  "euiTextColor": "#1D2A3E",
-  "euiTitleColor": "#111C2C",
-  "euiTextSubduedColor": "#516381",
-  "euiColorDisabled": "#E3E8F2",
-  "euiColorPrimaryText": "#1750BA",
-  "euiColorSuccessText": "#09724D",
-  "euiColorAccentText": "#A11262",
-  "euiColorWarningText": "#6A4906",
-  "euiColorDangerText": "#A71627",
-  "euiColorDisabledText": "#798EAF",
-  "euiLinkColor": "#0B64DD",
-  "euiColorPlainLight": "#FFFFFF",
-  "euiColorPlainDark": "#07101F",
-  "euiColorTextPrimary": "#1750BA",
-  "euiColorTextAccent": "#A11262",
-  "euiColorTextAccentSecondary": "#047471",
-  "euiColorTextNeutral": "#0F658A",
-  "euiColorTextSuccess": "#09724D",
-  "euiColorTextWarning": "#6A4906",
-  "euiColorTextRisk": "#9E3A16",
-  "euiColorTextDanger": "#A71627",
-  "euiColorTextParagraph": "#1D2A3E",
-  "euiColorTextHeading": "#111C2C",
-  "euiColorTextSubdued": "#516381",
-  "euiColorTextDisabled": "#798EAF",
-  "euiColorTextInverse": "#FFFFFF",
-  "euiColorBackgroundBasePrimary": "#E8F1FF",
-  "euiColorBackgroundBaseAccent": "#FFEBF5",
-  "euiColorBackgroundBaseAccentSecondary": "#E2F9F7",
-  "euiColorBackgroundBaseNeutral": "#E5F6FA",
-  "euiColorBackgroundBaseSuccess": "#E2F8F0",
-  "euiColorBackgroundBaseWarning": "#FDF3D8",
-  "euiColorBackgroundBaseRisk": "#FFEDD6",
-  "euiColorBackgroundBaseDanger": "#FFE8E5",
-  "euiColorBackgroundBaseSubdued": "#F6F9FC",
-  "euiColorBackgroundBasePlain": "#FFFFFF",
-  "euiColorBackgroundBaseDisabled": "#ECF1F9",
-  "euiColorBackgroundBaseHighlighted": "#F6F9FC",
-  "euiColorBackgroundBaseFormsPrepend": "#ECF1F9",
-  "euiColorBackgroundBaseFormsControlDisabled": "#CAD3E2",
-  "euiColorBackgroundBaseInteractiveHover": "rgba(23,80,186, 0.04)",
-  "euiColorBackgroundBaseInteractiveSelect": "#E8F1FF",
-  "euiColorBackgroundBaseInteractiveSelectHover": "#D9E8FF",
-  "euiColorBackgroundBaseInteractiveOverlay": "rgba(72,89,117, 0.7)",
-  "euiColorBackgroundBaseSkeletonEdge": "rgba(72,89,117, 0.16)",
-  "euiColorBackgroundBaseSkeletonMiddle": "rgba(72,89,117, 0.04)",
-  "euiColorBackgroundLightPrimary": "#D9E8FF",
-  "euiColorBackgroundLightAccent": "#FDDDE9",
-  "euiColorBackgroundLightAccentSecondary": "#C9F3F0",
-  "euiColorBackgroundLightNeutral": "#CFEEF7",
-  "euiColorBackgroundLightSuccess": "#C9F3E3",
-  "euiColorBackgroundLightWarning": "#FDE9B5",
-  "euiColorBackgroundLightRisk": "#FFDEBF",
-  "euiColorBackgroundLightDanger": "#FDDDD8",
-  "euiColorBackgroundLightText": "#E3E8F2",
-  "euiColorBackgroundFilledPrimary": "#0B64DD",
-  "euiColorBackgroundFilledAccent": "#BC1E70",
-  "euiColorBackgroundFilledAccentSecondary": "#008B87",
-  "euiColorBackgroundFilledNeutral": "#1C8CB5",
-  "euiColorBackgroundFilledSuccess": "#008A5E",
-  "euiColorBackgroundFilledWarning": "#FACB3D",
-  "euiColorBackgroundFilledRisk": "#ED6723",
-  "euiColorBackgroundFilledDanger": "#C61E25",
-  "euiColorBackgroundFilledText": "#5A6D8C",
-  "euiColorBorderBasePrimary": "#BFDBFF",
-  "euiColorBorderBaseAccent": "#FFC7DB",
-  "euiColorBorderBaseAccentSecondary": "#A6EDEA",
-  "euiColorBorderBaseNeutral": "#B5E5F2",
-  "euiColorBorderBaseSuccess": "#AEE8D2",
-  "euiColorBorderBaseWarning": "#FCD883",
-  "euiColorBorderBaseRisk": "#FFCDA1",
-  "euiColorBorderBaseDanger": "#FFC9C2",
-  "euiColorBorderBasePlain": "#CAD3E2",
-  "euiColorBorderBaseSubdued": "#E3E8F2",
-  "euiColorBorderBaseDisabled": "#CAD3E2",
-  "euiColorBorderBaseFloating": "transparent",
-  "euiColorBorderBaseFormsColorSwatch": "rgba(72,89,117, 0.24)",
-  "euiColorBorderBaseFormsControl": "#8E9FBC",
-  "euiColorBorderInteractiveFormsHoverPlain": "#B4C1D5",
-  "euiColorBorderInteractiveFormsHoverDanger": "#DA3737",
-  "euiColorBorderStrongPrimary": "#0B64DD",
-  "euiColorBorderStrongAccent": "#BC1E70",
-  "euiColorBorderStrongAccentSecondary": "#008B87",
-  "euiColorBorderStrongNeutral": "#19799F",
-  "euiColorBorderStrongSuccess": "#008A5E",
-  "euiColorBorderStrongWarning": "#966B03",
-  "euiColorBorderStrongRisk": "#C24411",
-  "euiColorBorderStrongDanger": "#C61E25",
-  "euiColorBorderStrongText": "#5A6D8C"
-}
diff --git a/packages/eui/src/themes/json/eui_theme_borealis_light.json.d.ts b/packages/eui/src/themes/json/eui_theme_borealis_light.json.d.ts
deleted file mode 100644
index 84127cd03f3..00000000000
--- a/packages/eui/src/themes/json/eui_theme_borealis_light.json.d.ts
+++ /dev/null
@@ -1,466 +0,0 @@
-declare module '@elastic/eui/dist/eui_theme_borealis_light.json' {
-  const sassVariables: {
-    euiZDataGrid: number;
-    euiZHeaderBelowDataGrid: number;
-    euiZDataGridCellPopover: number;
-    euiDataGridCellPaddingS: string;
-    euiDataGridCellPaddingM: string;
-    euiDataGridCellPaddingL: string;
-    euiTableHoverColor: string;
-    euiTableSelectedColor: string;
-    euiTableHoverSelectedColor: string;
-    euiTableActionsBorderColor: string;
-    euiTableHoverClickableColor: string;
-    euiTableFocusClickableColor: string;
-    euiContrastRatioText: number;
-    euiContrastRatioGraphic: number;
-    euiContrastRatioDisabled: number;
-    euiAnimSlightBounce: string;
-    euiAnimSlightResistance: string;
-    euiAnimSpeedExtraFast: string;
-    euiAnimSpeedFast: string;
-    euiAnimSpeedNormal: string;
-    euiAnimSpeedSlow: string;
-    euiAnimSpeedExtraSlow: string;
-    euiBorderWidthThin: string;
-    euiBorderWidthThick: string;
-    euiBorderColor: string;
-    euiBorderRadius: string;
-    euiBorderRadiusSmall: string;
-    euiBorderThick: string;
-    euiBorderThin: string;
-    euiBorderEditable: string;
-    euiButtonHeight: string;
-    euiButtonHeightSmall: string;
-    euiButtonHeightXSmall: string;
-    euiButtonColorDisabled: string;
-    euiButtonColorDisabledText: string;
-    euiButtonColorGhostDisabled: string;
-    euiButtonTypes: {
-      primary: string;
-      accent: string;
-      accentSecondary: string;
-      neutral: string;
-      success: string;
-      warning: string;
-      risk: string;
-      danger: string;
-      ghost: string;
-      text: string;
-    };
-    euiFontWeightLight: number;
-    euiFontWeightRegular: number;
-    euiFontWeightMedium: number;
-    euiFontWeightSemiBold: number;
-    euiFontWeightBold: number;
-    euiCodeFontWeightRegular: number;
-    euiCodeFontWeightBold: number;
-    euiFormMaxWidth: string;
-    euiFormControlHeight: string;
-    euiFormControlCompressedHeight: string;
-    euiFormControlPadding: string;
-    euiFormControlCompressedPadding: string;
-    euiFormControlBorderRadius: string;
-    euiFormControlCompressedBorderRadius: string;
-    euiRadioSize: string;
-    euiCheckBoxSize: string;
-    euiCheckboxBorderRadius: string;
-    euiSwitchHeight: string;
-    euiSwitchWidth: string;
-    euiSwitchThumbSize: string;
-    euiSwitchIconHeight: string;
-    euiSwitchHeightCompressed: string;
-    euiSwitchWidthCompressed: string;
-    euiSwitchThumbSizeCompressed: string;
-    euiSwitchHeightMini: string;
-    euiSwitchWidthMini: string;
-    euiSwitchThumbSizeMini: string;
-    euiFormBackgroundColor: string;
-    euiFormBackgroundDisabledColor: string;
-    euiFormBackgroundReadOnlyColor: string;
-    euiFormBorderOpaqueColor: string;
-    euiFormBorderColor: string;
-    euiFormBorderDisabledColor: string;
-    euiFormCustomControlDisabledIconColor: string;
-    euiFormCustomControlBorderColor: string;
-    euiFormControlDisabledColor: string;
-    euiFormControlBoxShadow: string;
-    euiFormControlPlaceholderText: string;
-    euiFormInputGroupLabelBackground: string;
-    euiFormInputGroupBorder: string;
-    euiSwitchOffColor: string;
-    euiFormControlIconSizes: {
-      small: string;
-      medium: string;
-      large: string;
-      xLarge: string;
-      xxLarge: string;
-    };
-    euiFormControlLayoutGroupInputHeight: string;
-    euiFormControlLayoutGroupInputCompressedHeight: string;
-    euiFormControlLayoutGroupInputCompressedBorderRadius: string;
-    euiHeaderBackgroundColor: string;
-    euiHeaderDarkBackgroundColor: string;
-    euiHeaderBorderColor: string;
-    euiHeaderBreadcrumbColor: string;
-    euiHeaderHeight: string;
-    euiHeaderChildSize: string;
-    euiHeaderHeightCompensation: string;
-    euiPageDefaultMaxWidth: string;
-    euiPageSidebarMinWidth: string;
-    euiPanelPaddingModifiers: {
-      paddingSmall: string;
-      paddingMedium: string;
-      paddingLarge: string;
-    };
-    euiPanelBorderRadiusModifiers: {
-      borderRadiusNone: number;
-      borderRadiusMedium: string;
-    };
-    euiPanelBackgroundColorModifiers: {
-      transparent: string;
-      plain: string;
-      subdued: string;
-      accent: string;
-      accentSecondary: string;
-      primary: string;
-      success: string;
-      warning: string;
-      danger: string;
-    };
-    euiBreakpoints: {
-      xs: number;
-      s: string;
-      m: string;
-      l: string;
-      xl: string;
-    };
-    euiBreakpointKeys: string;
-    euiShadowColor: string;
-    euiShadows: {
-      xs: {
-        down: string;
-        up: string;
-      };
-      s: {
-        down: string;
-        up: string;
-      };
-      m: {
-        down: string;
-        up: string;
-      };
-      l: {
-        down: string;
-        up: string;
-      };
-      xl: {
-        down: string;
-        up: string;
-      };
-      hover: {
-        base: {
-          down: string;
-          up: string;
-        };
-        xl: {
-          down: string;
-          up: string;
-        };
-      };
-      flat: {
-        down: string;
-        up: string;
-      };
-    };
-    euiSize: string;
-    euiSizeXS: string;
-    euiSizeS: string;
-    euiSizeM: string;
-    euiSizeL: string;
-    euiSizeXL: string;
-    euiSizeXXL: string;
-    euiScrollBar: string;
-    euiScrollBarCorner: string;
-    euiScrollBarCornerThin: string;
-    euiFocusRingColor: string;
-    euiFocusRingAnimStartColor: string;
-    euiFocusRingAnimStartSize: string;
-    euiFocusRingAnimStartSizeLarge: string;
-    euiFocusRingSizeLarge: string;
-    euiFocusRingSize: string;
-    euiFocusTransparency: number;
-    euiFocusTransparencyPercent: string;
-    euiFocusBackgroundColor: string;
-    euiFontFamily: string;
-    euiCodeFontFamily: string;
-    euiFontFeatureSettings: string;
-    euiTextScale: string;
-    euiFontSize: string;
-    euiFontSizeXS: string;
-    euiFontSizeS: string;
-    euiFontSizeM: string;
-    euiFontSizeL: string;
-    euiFontSizeXL: string;
-    euiFontSizeXXL: string;
-    euiLineHeight: number;
-    euiBodyLineHeight: number;
-    euiTitles: {
-      xxxs: {
-        'font-size': string;
-        'line-height': string;
-        'font-weight': number;
-      };
-      xxs: {
-        'font-size': string;
-        'line-height': string;
-        'font-weight': number;
-      };
-      xs: {
-        'font-size': string;
-        'line-height': string;
-        'font-weight': number;
-      };
-      s: {
-        'font-size': string;
-        'line-height': string;
-        'font-weight': number;
-      };
-      m: {
-        'font-size': string;
-        'line-height': string;
-        'font-weight': number;
-      };
-      l: {
-        'font-size': string;
-        'line-height': string;
-        'font-weight': number;
-      };
-    };
-    euiZLevel0: number;
-    euiZLevel1: number;
-    euiZLevel2: number;
-    euiZLevel3: number;
-    euiZLevel4: number;
-    euiZLevel5: number;
-    euiZLevel6: number;
-    euiZLevel7: number;
-    euiZLevel8: number;
-    euiZLevel9: number;
-    euiZToastList: number;
-    euiZModal: number;
-    euiZMask: number;
-    euiZNavigation: number;
-    euiZContentMenu: number;
-    euiZHeader: number;
-    euiZFlyout: number;
-    euiZMaskBelowHeader: number;
-    euiZContent: number;
-    euiPaletteColorBlind: {
-      euiColorVis0: {
-        graphic: string;
-        behindText: string;
-      };
-      euiColorVis1: {
-        graphic: string;
-        behindText: string;
-      };
-      euiColorVis2: {
-        graphic: string;
-        behindText: string;
-      };
-      euiColorVis3: {
-        graphic: string;
-        behindText: string;
-      };
-      euiColorVis4: {
-        graphic: string;
-        behindText: string;
-      };
-      euiColorVis5: {
-        graphic: string;
-        behindText: string;
-      };
-      euiColorVis6: {
-        graphic: string;
-        behindText: string;
-      };
-      euiColorVis7: {
-        graphic: string;
-        behindText: string;
-      };
-      euiColorVis8: {
-        graphic: string;
-        behindText: string;
-      };
-      euiColorVis9: {
-        graphic: string;
-        behindText: string;
-      };
-    };
-    euiPaletteColorBlindKeys: string;
-    euiColorVis0: string;
-    euiColorVis1: string;
-    euiColorVis2: string;
-    euiColorVis3: string;
-    euiColorVis4: string;
-    euiColorVis5: string;
-    euiColorVis6: string;
-    euiColorVis7: string;
-    euiColorVis8: string;
-    euiColorVis9: string;
-    euiColorVis0_behindText: string;
-    euiColorVis1_behindText: string;
-    euiColorVis2_behindText: string;
-    euiColorVis3_behindText: string;
-    euiColorVis4_behindText: string;
-    euiColorVis5_behindText: string;
-    euiColorVis6_behindText: string;
-    euiColorVis7_behindText: string;
-    euiColorVis8_behindText: string;
-    euiColorVis9_behindText: string;
-    euiColorVisText0: string;
-    euiColorVisText1: string;
-    euiColorVisText2: string;
-    euiColorVisText3: string;
-    euiColorVisText4: string;
-    euiColorVisText5: string;
-    euiColorVisText6: string;
-    euiColorVisText7: string;
-    euiColorVisText8: string;
-    euiColorVisText9: string;
-    euiColorVisSuccess0: string;
-    euiColorVisSuccess1: string;
-    euiColorVisWarning0: string;
-    euiColorVisDanger0: string;
-    euiColorVisDanger1: string;
-    euiColorVisNeutral0: string;
-    euiColorVisGrey0: string;
-    euiColorVisGrey1: string;
-    euiColorVisGrey2: string;
-    euiColorVisGrey3: string;
-    euiColorVisWarm0: string;
-    euiColorVisWarm1: string;
-    euiColorVisWarm2: string;
-    euiColorVisCool0: string;
-    euiColorVisCool1: string;
-    euiColorVisCool2: string;
-    euiColorVisComplementary0: string;
-    euiColorVisComplementary1: string;
-    euiColorSeverityUnknown: string;
-    euiColorSeverityNeutral: string;
-    euiColorSeveritySuccess: string;
-    euiColorSeverityWarning: string;
-    euiColorSeverityRisk: string;
-    euiColorSeverityDanger: string;
-    euiColorChartLines: string;
-    euiColorChartBand: string;
-    euiColorGhost: string;
-    euiColorInk: string;
-    euiColorPrimary: string;
-    euiColorAccent: string;
-    euiColorAccentSecondary: string;
-    euiColorSuccess: string;
-    euiColorWarning: string;
-    euiColorDanger: string;
-    euiColorEmptyShade: string;
-    euiColorLightestShade: string;
-    euiColorLightShade: string;
-    euiColorMediumShade: string;
-    euiColorDarkShade: string;
-    euiColorDarkestShade: string;
-    euiColorFullShade: string;
-    euiPageBackgroundColor: string;
-    euiColorHighlight: string;
-    euiTextColor: string;
-    euiTitleColor: string;
-    euiTextSubduedColor: string;
-    euiColorDisabled: string;
-    euiColorPrimaryText: string;
-    euiColorSuccessText: string;
-    euiColorAccentText: string;
-    euiColorWarningText: string;
-    euiColorDangerText: string;
-    euiColorDisabledText: string;
-    euiLinkColor: string;
-    euiColorPlainLight: string;
-    euiColorPlainDark: string;
-    euiColorTextPrimary: string;
-    euiColorTextAccent: string;
-    euiColorTextAccentSecondary: string;
-    euiColorTextNeutral: string;
-    euiColorTextSuccess: string;
-    euiColorTextWarning: string;
-    euiColorTextRisk: string;
-    euiColorTextDanger: string;
-    euiColorTextParagraph: string;
-    euiColorTextHeading: string;
-    euiColorTextSubdued: string;
-    euiColorTextDisabled: string;
-    euiColorTextInverse: string;
-    euiColorBackgroundBasePrimary: string;
-    euiColorBackgroundBaseAccent: string;
-    euiColorBackgroundBaseAccentSecondary: string;
-    euiColorBackgroundBaseNeutral: string;
-    euiColorBackgroundBaseSuccess: string;
-    euiColorBackgroundBaseWarning: string;
-    euiColorBackgroundBaseRisk: string;
-    euiColorBackgroundBaseDanger: string;
-    euiColorBackgroundBaseSubdued: string;
-    euiColorBackgroundBasePlain: string;
-    euiColorBackgroundBaseDisabled: string;
-    euiColorBackgroundBaseHighlighted: string;
-    euiColorBackgroundBaseFormsPrepend: string;
-    euiColorBackgroundBaseFormsControlDisabled: string;
-    euiColorBackgroundBaseInteractiveHover: string;
-    euiColorBackgroundBaseInteractiveSelect: string;
-    euiColorBackgroundBaseInteractiveSelectHover: string;
-    euiColorBackgroundBaseInteractiveOverlay: string;
-    euiColorBackgroundBaseSkeletonEdge: string;
-    euiColorBackgroundBaseSkeletonMiddle: string;
-    euiColorBackgroundLightPrimary: string;
-    euiColorBackgroundLightAccent: string;
-    euiColorBackgroundLightAccentSecondary: string;
-    euiColorBackgroundLightNeutral: string;
-    euiColorBackgroundLightSuccess: string;
-    euiColorBackgroundLightWarning: string;
-    euiColorBackgroundLightRisk: string;
-    euiColorBackgroundLightDanger: string;
-    euiColorBackgroundLightText: string;
-    euiColorBackgroundFilledPrimary: string;
-    euiColorBackgroundFilledAccent: string;
-    euiColorBackgroundFilledAccentSecondary: string;
-    euiColorBackgroundFilledNeutral: string;
-    euiColorBackgroundFilledSuccess: string;
-    euiColorBackgroundFilledWarning: string;
-    euiColorBackgroundFilledRisk: string;
-    euiColorBackgroundFilledDanger: string;
-    euiColorBackgroundFilledText: string;
-    euiColorBorderBasePrimary: string;
-    euiColorBorderBaseAccent: string;
-    euiColorBorderBaseAccentSecondary: string;
-    euiColorBorderBaseNeutral: string;
-    euiColorBorderBaseSuccess: string;
-    euiColorBorderBaseWarning: string;
-    euiColorBorderBaseRisk: string;
-    euiColorBorderBaseDanger: string;
-    euiColorBorderBasePlain: string;
-    euiColorBorderBaseSubdued: string;
-    euiColorBorderBaseDisabled: string;
-    euiColorBorderBaseFloating: string;
-    euiColorBorderBaseFormsColorSwatch: string;
-    euiColorBorderBaseFormsControl: string;
-    euiColorBorderInteractiveFormsHoverPlain: string;
-    euiColorBorderInteractiveFormsHoverDanger: string;
-    euiColorBorderStrongPrimary: string;
-    euiColorBorderStrongAccent: string;
-    euiColorBorderStrongAccentSecondary: string;
-    euiColorBorderStrongNeutral: string;
-    euiColorBorderStrongSuccess: string;
-    euiColorBorderStrongWarning: string;
-    euiColorBorderStrongRisk: string;
-    euiColorBorderStrongDanger: string;
-    euiColorBorderStrongText: string;
-  };
-  export default sassVariables;
-}
diff --git a/packages/eui/src/themes/themes.ts b/packages/eui/src/themes/themes.ts
deleted file mode 100644
index 64eb725b410..00000000000
--- a/packages/eui/src/themes/themes.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import { EuiThemeSystem } from '../services';
-
-export interface EUI_THEME {
-  text: string;
-  value: string;
-  provider?: EuiThemeSystem;
-}
diff --git a/packages/website/docs/getting-started/theming/tokens/colors/data_vis_colors_table.tsx b/packages/website/docs/getting-started/theming/tokens/colors/data_vis_colors_table.tsx
index 375d85daa8b..1adc8f4a68c 100644
--- a/packages/website/docs/getting-started/theming/tokens/colors/data_vis_colors_table.tsx
+++ b/packages/website/docs/getting-started/theming/tokens/colors/data_vis_colors_table.tsx
@@ -1,18 +1,6 @@
-import { EuiCode, EuiSpacer, EuiText, useEuiTheme } from '@elastic/eui';
+import { EuiCode, useEuiTheme } from '@elastic/eui';
 import { ColorsTable } from './colors_table';
 
-export const DataVisBackgroundColor = () => {
-  const { euiTheme } = useEuiTheme();
-
-  return (
-    <EuiCode>
-      {euiTheme.themeName === 'EUI_THEME_AMSTERDAM'
-        ? 'colors.emptyShade'
-        : 'colors.backgroundBasePlain'}
-    </EuiCode>
-  );
-};
-
 export const DataVisColorsTable = () => {
   const { euiTheme } = useEuiTheme();
 
@@ -64,69 +52,6 @@ export const DataVisColorsTable = () => {
   );
 };
 
-export const DataVisColorsBehindTextColorsTable = () => {
-  const { euiTheme } = useEuiTheme();
-
-  if (euiTheme.themeName === 'EUI_THEME_AMSTERDAM')
-    return (
-      <>
-        <EuiSpacer />
-        <EuiText>
-          <p>
-            When using the palette as a background for text (i.e. badges), use
-            the <EuiCode>BehindText</EuiCode> variant. It is a brightened
-            version of the base palette to create better contrast with text.
-          </p>
-        </EuiText>
-        <EuiSpacer />
-        <ColorsTable
-          colors={[
-            {
-              value: euiTheme.colors.vis.euiColorVisBehindText0,
-              token: 'colors.vis.euiColorVisBehindText0',
-            },
-            {
-              value: euiTheme.colors.vis.euiColorVisBehindText1,
-              token: 'colors.vis.euiColorVisBehindText1',
-            },
-            {
-              value: euiTheme.colors.vis.euiColorVisBehindText2,
-              token: 'colors.vis.euiColorVisBehindText2',
-            },
-            {
-              value: euiTheme.colors.vis.euiColorVisBehindText3,
-              token: 'colors.vis.euiColorVisBehindText3',
-            },
-            {
-              value: euiTheme.colors.vis.euiColorVisBehindText4,
-              token: 'colors.vis.euiColorVisBehindText4',
-            },
-            {
-              value: euiTheme.colors.vis.euiColorVisBehindText5,
-              token: 'colors.vis.euiColorVisBehindText5',
-            },
-            {
-              value: euiTheme.colors.vis.euiColorVisBehindText6,
-              token: 'colors.vis.euiColorVisBehindText6',
-            },
-            {
-              value: euiTheme.colors.vis.euiColorVisBehindText7,
-              token: 'colors.vis.euiColorVisBehindText7',
-            },
-            {
-              value: euiTheme.colors.vis.euiColorVisBehindText8,
-              token: 'colors.vis.euiColorVisBehindText8',
-            },
-            {
-              value: euiTheme.colors.vis.euiColorVisBehindText9,
-              token: 'colors.vis.euiColorVisBehindText9',
-            },
-          ]}
-        />
-      </>
-    );
-};
-
 export const DataVisTextColorsTable = () => {
   const { euiTheme } = useEuiTheme();
 
diff --git a/packages/website/docs/getting-started/theming/tokens/colors/index.mdx b/packages/website/docs/getting-started/theming/tokens/colors/index.mdx
index bf053940f19..6a6e3c407c3 100644
--- a/packages/website/docs/getting-started/theming/tokens/colors/index.mdx
+++ b/packages/website/docs/getting-started/theming/tokens/colors/index.mdx
@@ -201,7 +201,7 @@ import { SpecialColorsTable } from './special_colors_table';
 Data visualization colors are semantically tied to data visualizations and are not meant for use in other contexts. Do not use these colors in other contexts.
 :::
 
-import { DataVisColorsTable, DataVisColorsBehindTextColorsTable, DataVisBackgroundColor } from './data_vis_colors_table';
+import { DataVisColorsTable, DataVisBackgroundColor } from './data_vis_colors_table';
 import { DataVisColorsPreview } from './data_vis_colors_preview'
 
 
@@ -210,7 +210,7 @@ import { DataVisColorsPreview } from './data_vis_colors_preview'
     ### `euiTheme.colors.vis[token]` <Badge color="hollow">token</Badge>
 
     The following colors are color-blind safe and should be used in categorically seried visualizations and graphics.
-    They are meant to be contrasted against the value of <DataVisBackgroundColor /> for the current theme.
+    They are meant to be contrasted against the value of `colors.backgroundBasePlain` for the current theme.
 
     See the [Data visualization text colors](#dataVisText) section for a note about text colors.
 
@@ -231,7 +231,6 @@ import { DataVisColorsPreview } from './data_vis_colors_preview'
 <EuiSpacer />
 
 <DataVisColorsTable />
-<DataVisColorsBehindTextColorsTable />
 
 ## Severity and Health colors
 
@@ -300,7 +299,6 @@ import { DataVisTextColorsPreview } from './data_vis_colors_preview'
 <EuiSpacer />
 
 <DataVisTextColorsTable />
-<DataVisColorsBehindTextColorsTable />
 
 ## Contrast ratios and color modes {#contrast}