diff --git a/e2e/helpers.ts b/e2e/helpers.ts
index 5a2406731a..47d3717381 100644
--- a/e2e/helpers.ts
+++ b/e2e/helpers.ts
@@ -122,7 +122,7 @@ interface EachThemeCbParams {
   urlParam: string;
 }
 
-export const themeIds = ['light', 'dark', 'eui-light', 'eui-dark'];
+export const themeIds = ['light', 'dark'];
 
 /**
  * This is a wrapper around it.each for Themes
diff --git a/e2e/screenshots/all.test.ts-snapshots/baselines/stylings/dark-theme-chrome-linux.png b/e2e/screenshots/all.test.ts-snapshots/baselines/stylings/dark-theme-chrome-linux.png
index 993e0a6be7..6afa352bd3 100644
Binary files a/e2e/screenshots/all.test.ts-snapshots/baselines/stylings/dark-theme-chrome-linux.png and b/e2e/screenshots/all.test.ts-snapshots/baselines/stylings/dark-theme-chrome-linux.png differ
diff --git a/e2e/screenshots/all.test.ts-snapshots/baselines/sunburst/custom-stroke-chrome-linux.png b/e2e/screenshots/all.test.ts-snapshots/baselines/sunburst/custom-stroke-chrome-linux.png
index 73ad0af94a..2d4f6b5775 100644
Binary files a/e2e/screenshots/all.test.ts-snapshots/baselines/sunburst/custom-stroke-chrome-linux.png and b/e2e/screenshots/all.test.ts-snapshots/baselines/sunburst/custom-stroke-chrome-linux.png differ
diff --git a/e2e/screenshots/axis_stories.test.ts-snapshots/axis-stories/theme-dark/should-switch-to-a-30-minute-raster-chrome-linux.png b/e2e/screenshots/axis_stories.test.ts-snapshots/axis-stories/theme-dark/should-switch-to-a-30-minute-raster-chrome-linux.png
index dd87f6a209..b4ee38bce3 100644
Binary files a/e2e/screenshots/axis_stories.test.ts-snapshots/axis-stories/theme-dark/should-switch-to-a-30-minute-raster-chrome-linux.png and b/e2e/screenshots/axis_stories.test.ts-snapshots/axis-stories/theme-dark/should-switch-to-a-30-minute-raster-chrome-linux.png differ
diff --git a/e2e/screenshots/axis_stories.test.ts-snapshots/axis-stories/theme-light/should-switch-to-a-30-minute-raster-chrome-linux.png b/e2e/screenshots/axis_stories.test.ts-snapshots/axis-stories/theme-light/should-switch-to-a-30-minute-raster-chrome-linux.png
index ac8227c903..59d447730a 100644
Binary files a/e2e/screenshots/axis_stories.test.ts-snapshots/axis-stories/theme-light/should-switch-to-a-30-minute-raster-chrome-linux.png and b/e2e/screenshots/axis_stories.test.ts-snapshots/axis-stories/theme-light/should-switch-to-a-30-minute-raster-chrome-linux.png differ
diff --git a/e2e/screenshots/dark_mode.test.ts-snapshots/small-multiples-dark-mode/renders-panel-titles-chrome-linux.png b/e2e/screenshots/dark_mode.test.ts-snapshots/small-multiples-dark-mode/renders-panel-titles-chrome-linux.png
index 288b197ccc..3e1a1e4aa3 100644
Binary files a/e2e/screenshots/dark_mode.test.ts-snapshots/small-multiples-dark-mode/renders-panel-titles-chrome-linux.png and b/e2e/screenshots/dark_mode.test.ts-snapshots/small-multiples-dark-mode/renders-panel-titles-chrome-linux.png differ
diff --git a/e2e/screenshots/goal_stories.test.ts-snapshots/goal-stories/theme-dark/should-render-gauge-with-target-story-chrome-linux.png b/e2e/screenshots/goal_stories.test.ts-snapshots/goal-stories/theme-dark/should-render-gauge-with-target-story-chrome-linux.png
index 419a08b7e4..9ad5fc6a10 100644
Binary files a/e2e/screenshots/goal_stories.test.ts-snapshots/goal-stories/theme-dark/should-render-gauge-with-target-story-chrome-linux.png and b/e2e/screenshots/goal_stories.test.ts-snapshots/goal-stories/theme-dark/should-render-gauge-with-target-story-chrome-linux.png differ
diff --git a/e2e/screenshots/goal_stories.test.ts-snapshots/goal-stories/theme-dark/should-render-minimal-goal-story-chrome-linux.png b/e2e/screenshots/goal_stories.test.ts-snapshots/goal-stories/theme-dark/should-render-minimal-goal-story-chrome-linux.png
index 8d64e422de..990a10fcba 100644
Binary files a/e2e/screenshots/goal_stories.test.ts-snapshots/goal-stories/theme-dark/should-render-minimal-goal-story-chrome-linux.png and b/e2e/screenshots/goal_stories.test.ts-snapshots/goal-stories/theme-dark/should-render-minimal-goal-story-chrome-linux.png differ
diff --git a/e2e/screenshots/goal_stories.test.ts-snapshots/goal-stories/theme-dark/should-render-vertical-negative-story-chrome-linux.png b/e2e/screenshots/goal_stories.test.ts-snapshots/goal-stories/theme-dark/should-render-vertical-negative-story-chrome-linux.png
index 8556c5349a..e4eba77f62 100644
Binary files a/e2e/screenshots/goal_stories.test.ts-snapshots/goal-stories/theme-dark/should-render-vertical-negative-story-chrome-linux.png and b/e2e/screenshots/goal_stories.test.ts-snapshots/goal-stories/theme-dark/should-render-vertical-negative-story-chrome-linux.png differ
diff --git a/e2e/screenshots/goal_stories.test.ts-snapshots/goal-stories/theme-light/should-render-gauge-with-target-story-chrome-linux.png b/e2e/screenshots/goal_stories.test.ts-snapshots/goal-stories/theme-light/should-render-gauge-with-target-story-chrome-linux.png
index 98719fb322..b8416fcf8e 100644
Binary files a/e2e/screenshots/goal_stories.test.ts-snapshots/goal-stories/theme-light/should-render-gauge-with-target-story-chrome-linux.png and b/e2e/screenshots/goal_stories.test.ts-snapshots/goal-stories/theme-light/should-render-gauge-with-target-story-chrome-linux.png differ
diff --git a/e2e/screenshots/goal_stories.test.ts-snapshots/goal-stories/theme-light/should-render-minimal-goal-story-chrome-linux.png b/e2e/screenshots/goal_stories.test.ts-snapshots/goal-stories/theme-light/should-render-minimal-goal-story-chrome-linux.png
index 871b1dda09..7ae15e858b 100644
Binary files a/e2e/screenshots/goal_stories.test.ts-snapshots/goal-stories/theme-light/should-render-minimal-goal-story-chrome-linux.png and b/e2e/screenshots/goal_stories.test.ts-snapshots/goal-stories/theme-light/should-render-minimal-goal-story-chrome-linux.png differ
diff --git a/e2e/screenshots/goal_stories.test.ts-snapshots/goal-stories/theme-light/should-render-vertical-negative-story-chrome-linux.png b/e2e/screenshots/goal_stories.test.ts-snapshots/goal-stories/theme-light/should-render-vertical-negative-story-chrome-linux.png
index c2db4deb9c..c22ac0b9b2 100644
Binary files a/e2e/screenshots/goal_stories.test.ts-snapshots/goal-stories/theme-light/should-render-vertical-negative-story-chrome-linux.png and b/e2e/screenshots/goal_stories.test.ts-snapshots/goal-stories/theme-light/should-render-vertical-negative-story-chrome-linux.png differ
diff --git a/e2e/screenshots/heatmap_stories.test.ts-snapshots/heatmap-stories/theme-dark/should-highlight-band-on-legend-hover-dark-chrome-linux.png b/e2e/screenshots/heatmap_stories.test.ts-snapshots/heatmap-stories/theme-dark/should-highlight-band-on-legend-hover-dark-chrome-linux.png
index 25aec8ee3d..5bc593eb3c 100644
Binary files a/e2e/screenshots/heatmap_stories.test.ts-snapshots/heatmap-stories/theme-dark/should-highlight-band-on-legend-hover-dark-chrome-linux.png and b/e2e/screenshots/heatmap_stories.test.ts-snapshots/heatmap-stories/theme-dark/should-highlight-band-on-legend-hover-dark-chrome-linux.png differ
diff --git a/e2e/screenshots/heatmap_stories.test.ts-snapshots/heatmap-stories/theme-dark/should-render-basic-heatmap-chrome-linux.png b/e2e/screenshots/heatmap_stories.test.ts-snapshots/heatmap-stories/theme-dark/should-render-basic-heatmap-chrome-linux.png
index 68223a1108..bac1f59aec 100644
Binary files a/e2e/screenshots/heatmap_stories.test.ts-snapshots/heatmap-stories/theme-dark/should-render-basic-heatmap-chrome-linux.png and b/e2e/screenshots/heatmap_stories.test.ts-snapshots/heatmap-stories/theme-dark/should-render-basic-heatmap-chrome-linux.png differ
diff --git a/e2e/screenshots/heatmap_stories.test.ts-snapshots/heatmap-stories/theme-dark/should-render-correct-brush-area-chrome-linux.png b/e2e/screenshots/heatmap_stories.test.ts-snapshots/heatmap-stories/theme-dark/should-render-correct-brush-area-chrome-linux.png
index 6845351f6a..b3669d57c0 100644
Binary files a/e2e/screenshots/heatmap_stories.test.ts-snapshots/heatmap-stories/theme-dark/should-render-correct-brush-area-chrome-linux.png and b/e2e/screenshots/heatmap_stories.test.ts-snapshots/heatmap-stories/theme-dark/should-render-correct-brush-area-chrome-linux.png differ
diff --git a/e2e/screenshots/heatmap_stories.test.ts-snapshots/heatmap-stories/theme-light/should-highlight-band-on-legend-hover-light-chrome-linux.png b/e2e/screenshots/heatmap_stories.test.ts-snapshots/heatmap-stories/theme-light/should-highlight-band-on-legend-hover-light-chrome-linux.png
index e88460de1a..56dd31be46 100644
Binary files a/e2e/screenshots/heatmap_stories.test.ts-snapshots/heatmap-stories/theme-light/should-highlight-band-on-legend-hover-light-chrome-linux.png and b/e2e/screenshots/heatmap_stories.test.ts-snapshots/heatmap-stories/theme-light/should-highlight-band-on-legend-hover-light-chrome-linux.png differ
diff --git a/e2e/screenshots/heatmap_stories.test.ts-snapshots/heatmap-stories/theme-light/should-render-basic-heatmap-chrome-linux.png b/e2e/screenshots/heatmap_stories.test.ts-snapshots/heatmap-stories/theme-light/should-render-basic-heatmap-chrome-linux.png
index 0e98c90392..c2760c7a2a 100644
Binary files a/e2e/screenshots/heatmap_stories.test.ts-snapshots/heatmap-stories/theme-light/should-render-basic-heatmap-chrome-linux.png and b/e2e/screenshots/heatmap_stories.test.ts-snapshots/heatmap-stories/theme-light/should-render-basic-heatmap-chrome-linux.png differ
diff --git a/e2e/screenshots/heatmap_stories.test.ts-snapshots/heatmap-stories/theme-light/should-render-correct-brush-area-chrome-linux.png b/e2e/screenshots/heatmap_stories.test.ts-snapshots/heatmap-stories/theme-light/should-render-correct-brush-area-chrome-linux.png
index 6938c27007..75f6765d05 100644
Binary files a/e2e/screenshots/heatmap_stories.test.ts-snapshots/heatmap-stories/theme-light/should-render-correct-brush-area-chrome-linux.png and b/e2e/screenshots/heatmap_stories.test.ts-snapshots/heatmap-stories/theme-light/should-render-correct-brush-area-chrome-linux.png differ
diff --git a/e2e/screenshots/interactions.test.ts-snapshots/interactions/mouse-cursor/should-show-cursor-band-when-background-is-set-with-dark-theme-chrome-linux.png b/e2e/screenshots/interactions.test.ts-snapshots/interactions/mouse-cursor/should-show-cursor-band-when-background-is-set-with-dark-theme-chrome-linux.png
new file mode 100644
index 0000000000..292ae4fc6c
Binary files /dev/null and b/e2e/screenshots/interactions.test.ts-snapshots/interactions/mouse-cursor/should-show-cursor-band-when-background-is-set-with-dark-theme-chrome-linux.png differ
diff --git a/e2e/screenshots/interactions.test.ts-snapshots/interactions/mouse-cursor/should-show-cursor-band-when-background-is-set-with-light-theme-chrome-linux.png b/e2e/screenshots/interactions.test.ts-snapshots/interactions/mouse-cursor/should-show-cursor-band-when-background-is-set-with-light-theme-chrome-linux.png
new file mode 100644
index 0000000000..88a2773182
Binary files /dev/null and b/e2e/screenshots/interactions.test.ts-snapshots/interactions/mouse-cursor/should-show-cursor-band-when-background-is-set-with-light-theme-chrome-linux.png differ
diff --git a/e2e/screenshots/interactions.test.ts-snapshots/interactions/mouse-cursor/should-show-cursor-when-background-is-set-with-dark-theme-chrome-linux.png b/e2e/screenshots/interactions.test.ts-snapshots/interactions/mouse-cursor/should-show-cursor-when-background-is-set-with-dark-theme-chrome-linux.png
new file mode 100644
index 0000000000..a3f115883b
Binary files /dev/null and b/e2e/screenshots/interactions.test.ts-snapshots/interactions/mouse-cursor/should-show-cursor-when-background-is-set-with-dark-theme-chrome-linux.png differ
diff --git a/e2e/screenshots/interactions.test.ts-snapshots/interactions/mouse-cursor/should-show-cursor-when-background-is-set-with-light-theme-chrome-linux.png b/e2e/screenshots/interactions.test.ts-snapshots/interactions/mouse-cursor/should-show-cursor-when-background-is-set-with-light-theme-chrome-linux.png
new file mode 100644
index 0000000000..0aeb495225
Binary files /dev/null and b/e2e/screenshots/interactions.test.ts-snapshots/interactions/mouse-cursor/should-show-cursor-when-background-is-set-with-light-theme-chrome-linux.png differ
diff --git a/e2e/screenshots/interactions.test.ts-snapshots/interactions/tooltips/should-render-current-tooltip-in-dark-theme-chrome-linux.png b/e2e/screenshots/interactions.test.ts-snapshots/interactions/tooltips/should-render-current-tooltip-in-dark-theme-chrome-linux.png
index ec0187ca18..ffaf84cb70 100644
Binary files a/e2e/screenshots/interactions.test.ts-snapshots/interactions/tooltips/should-render-current-tooltip-in-dark-theme-chrome-linux.png and b/e2e/screenshots/interactions.test.ts-snapshots/interactions/tooltips/should-render-current-tooltip-in-dark-theme-chrome-linux.png differ
diff --git a/e2e/screenshots/metric_stories.test.ts-snapshots/metric/metric-bar-type/should-render-metric-with-transparent-bg-color-dark-theme-chrome-linux.png b/e2e/screenshots/metric_stories.test.ts-snapshots/metric/metric-bar-type/should-render-metric-with-transparent-bg-color-dark-theme-chrome-linux.png
index 6f549ac318..ad0aa52c42 100644
Binary files a/e2e/screenshots/metric_stories.test.ts-snapshots/metric/metric-bar-type/should-render-metric-with-transparent-bg-color-dark-theme-chrome-linux.png and b/e2e/screenshots/metric_stories.test.ts-snapshots/metric/metric-bar-type/should-render-metric-with-transparent-bg-color-dark-theme-chrome-linux.png differ
diff --git a/e2e/screenshots/metric_stories.test.ts-snapshots/metric/metric-none-type/should-render-metric-with-transparent-bg-color-dark-theme-chrome-linux.png b/e2e/screenshots/metric_stories.test.ts-snapshots/metric/metric-none-type/should-render-metric-with-transparent-bg-color-dark-theme-chrome-linux.png
index 4439457778..2b45e504c4 100644
Binary files a/e2e/screenshots/metric_stories.test.ts-snapshots/metric/metric-none-type/should-render-metric-with-transparent-bg-color-dark-theme-chrome-linux.png and b/e2e/screenshots/metric_stories.test.ts-snapshots/metric/metric-none-type/should-render-metric-with-transparent-bg-color-dark-theme-chrome-linux.png differ
diff --git a/e2e/screenshots/metric_stories.test.ts-snapshots/metric/metric-trend-type/should-render-metric-with-transparent-bg-color-dark-theme-chrome-linux.png b/e2e/screenshots/metric_stories.test.ts-snapshots/metric/metric-trend-type/should-render-metric-with-transparent-bg-color-dark-theme-chrome-linux.png
index 11de00a658..1fbe71ab2d 100644
Binary files a/e2e/screenshots/metric_stories.test.ts-snapshots/metric/metric-trend-type/should-render-metric-with-transparent-bg-color-dark-theme-chrome-linux.png and b/e2e/screenshots/metric_stories.test.ts-snapshots/metric/metric-trend-type/should-render-metric-with-transparent-bg-color-dark-theme-chrome-linux.png differ
diff --git a/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/link-label-textcolor-dark-theme/should-show-custom-black-text-color-chrome-linux.png b/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/link-label-textcolor-dark-theme/should-show-custom-black-text-color-chrome-linux.png
index c3ed4b167c..80dc1a07a7 100644
Binary files a/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/link-label-textcolor-dark-theme/should-show-custom-black-text-color-chrome-linux.png and b/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/link-label-textcolor-dark-theme/should-show-custom-black-text-color-chrome-linux.png differ
diff --git a/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/link-label-textcolor-dark-theme/should-show-custom-black-translucent-text-color-chrome-linux.png b/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/link-label-textcolor-dark-theme/should-show-custom-black-translucent-text-color-chrome-linux.png
index db4f66e0f3..36f768f9b4 100644
Binary files a/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/link-label-textcolor-dark-theme/should-show-custom-black-translucent-text-color-chrome-linux.png and b/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/link-label-textcolor-dark-theme/should-show-custom-black-translucent-text-color-chrome-linux.png differ
diff --git a/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/link-label-textcolor-dark-theme/should-show-custom-red-text-color-chrome-linux.png b/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/link-label-textcolor-dark-theme/should-show-custom-red-text-color-chrome-linux.png
index 6ae3e252a8..0432e616cc 100644
Binary files a/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/link-label-textcolor-dark-theme/should-show-custom-red-text-color-chrome-linux.png and b/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/link-label-textcolor-dark-theme/should-show-custom-red-text-color-chrome-linux.png differ
diff --git a/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/link-label-textcolor-dark-theme/should-show-custom-white-text-color-chrome-linux.png b/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/link-label-textcolor-dark-theme/should-show-custom-white-text-color-chrome-linux.png
index 208c1572d2..ebb8622768 100644
Binary files a/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/link-label-textcolor-dark-theme/should-show-custom-white-text-color-chrome-linux.png and b/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/link-label-textcolor-dark-theme/should-show-custom-white-text-color-chrome-linux.png differ
diff --git a/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/link-label-textcolor-dark-theme/should-show-custom-white-translucent-text-color-chrome-linux.png b/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/link-label-textcolor-dark-theme/should-show-custom-white-translucent-text-color-chrome-linux.png
index 55583ecef4..2a62a97884 100644
Binary files a/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/link-label-textcolor-dark-theme/should-show-custom-white-translucent-text-color-chrome-linux.png and b/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/link-label-textcolor-dark-theme/should-show-custom-white-translucent-text-color-chrome-linux.png differ
diff --git a/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/link-label-textcolor-dark-theme/should-show-default-text-color-chrome-linux.png b/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/link-label-textcolor-dark-theme/should-show-default-text-color-chrome-linux.png
index 208c1572d2..9487c4e1ab 100644
Binary files a/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/link-label-textcolor-dark-theme/should-show-default-text-color-chrome-linux.png and b/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/link-label-textcolor-dark-theme/should-show-default-text-color-chrome-linux.png differ
diff --git a/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/link-label-textcolor-light-theme/should-show-custom-black-text-color-chrome-linux.png b/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/link-label-textcolor-light-theme/should-show-custom-black-text-color-chrome-linux.png
index 514fea0869..5e9c1761da 100644
Binary files a/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/link-label-textcolor-light-theme/should-show-custom-black-text-color-chrome-linux.png and b/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/link-label-textcolor-light-theme/should-show-custom-black-text-color-chrome-linux.png differ
diff --git a/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/link-label-textcolor-light-theme/should-show-custom-black-translucent-text-color-chrome-linux.png b/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/link-label-textcolor-light-theme/should-show-custom-black-translucent-text-color-chrome-linux.png
index d1e4140c85..9f9dd9be6b 100644
Binary files a/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/link-label-textcolor-light-theme/should-show-custom-black-translucent-text-color-chrome-linux.png and b/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/link-label-textcolor-light-theme/should-show-custom-black-translucent-text-color-chrome-linux.png differ
diff --git a/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/link-label-textcolor-light-theme/should-show-custom-red-text-color-chrome-linux.png b/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/link-label-textcolor-light-theme/should-show-custom-red-text-color-chrome-linux.png
index eaaf6a6aaa..9c99892e8a 100644
Binary files a/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/link-label-textcolor-light-theme/should-show-custom-red-text-color-chrome-linux.png and b/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/link-label-textcolor-light-theme/should-show-custom-red-text-color-chrome-linux.png differ
diff --git a/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/link-label-textcolor-light-theme/should-show-custom-white-text-color-chrome-linux.png b/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/link-label-textcolor-light-theme/should-show-custom-white-text-color-chrome-linux.png
index b6825a0e4a..f1a1ede703 100644
Binary files a/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/link-label-textcolor-light-theme/should-show-custom-white-text-color-chrome-linux.png and b/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/link-label-textcolor-light-theme/should-show-custom-white-text-color-chrome-linux.png differ
diff --git a/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/link-label-textcolor-light-theme/should-show-custom-white-translucent-text-color-chrome-linux.png b/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/link-label-textcolor-light-theme/should-show-custom-white-translucent-text-color-chrome-linux.png
index da91d33bd5..402823abd9 100644
Binary files a/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/link-label-textcolor-light-theme/should-show-custom-white-translucent-text-color-chrome-linux.png and b/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/link-label-textcolor-light-theme/should-show-custom-white-translucent-text-color-chrome-linux.png differ
diff --git a/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/link-label-textcolor-light-theme/should-show-default-text-color-chrome-linux.png b/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/link-label-textcolor-light-theme/should-show-default-text-color-chrome-linux.png
index 514fea0869..9acfe17a69 100644
Binary files a/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/link-label-textcolor-light-theme/should-show-default-text-color-chrome-linux.png and b/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/link-label-textcolor-light-theme/should-show-default-text-color-chrome-linux.png differ
diff --git a/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/should-render-link-labels-with-fallback-text-color-for-dark-theme-chrome-linux.png b/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/should-render-link-labels-with-fallback-text-color-for-dark-theme-chrome-linux.png
index 4e06c75c60..244ff9e48c 100644
Binary files a/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/should-render-link-labels-with-fallback-text-color-for-dark-theme-chrome-linux.png and b/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/should-render-link-labels-with-fallback-text-color-for-dark-theme-chrome-linux.png differ
diff --git a/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/should-render-link-labels-with-fallback-text-color-for-light-theme-chrome-linux.png b/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/should-render-link-labels-with-fallback-text-color-for-light-theme-chrome-linux.png
index 9be662583d..ac04be7f26 100644
Binary files a/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/should-render-link-labels-with-fallback-text-color-for-light-theme-chrome-linux.png and b/e2e/screenshots/partition_stories.test.ts-snapshots/axis-stories/should-render-link-labels-with-fallback-text-color-for-light-theme-chrome-linux.png differ
diff --git a/e2e/tests/area_stories.test.ts b/e2e/tests/area_stories.test.ts
index f4ab4b3231..b61f074dbf 100644
--- a/e2e/tests/area_stories.test.ts
+++ b/e2e/tests/area_stories.test.ts
@@ -93,7 +93,7 @@ test.describe('Area series stories', () => {
 
   test('small multiples with log scale dont clip', async ({ page }) => {
     await common.expectChartAtUrlToMatchScreenshot(page)(
-      'http://localhost:9001/?path=/story/small-multiples-alpha--vertical-areas&globals=theme:eui-light&knob-Show Legend=true&knob-Use log scale (different data)=true',
+      'http://localhost:9001/?path=/story/small-multiples-alpha--vertical-areas&globals=theme:light&knob-Show Legend=true&knob-Use log scale (different data)=true',
     );
   });
 });
diff --git a/e2e/tests/axis_stories.test.ts b/e2e/tests/axis_stories.test.ts
index 2bfad917d1..d5ec41e21f 100644
--- a/e2e/tests/axis_stories.test.ts
+++ b/e2e/tests/axis_stories.test.ts
@@ -22,79 +22,79 @@ test.describe('Axis stories', () => {
   });
   test('should render hour raster from 00:00 to 23:59', async ({ page }) => {
     await common.expectChartAtUrlToMatchScreenshot(page)(
-      'http://localhost:9001/?path=/story/area-chart--timeslip&globals=theme:eui-light&knob-Bin%20width%20in%20ms%20(0:%20none%20specifed)=0&knob-Minor%20grid%20lines=true&knob-Shift%20time=0&knob-Stretch%20time=2.4&knob-Time%20zoom=120&knob-layerCount=3',
+      'http://localhost:9001/?path=/story/area-chart--timeslip&globals=theme:light&knob-Bin%20width%20in%20ms%20(0:%20none%20specifed)=0&knob-Minor%20grid%20lines=true&knob-Shift%20time=0&knob-Stretch%20time=2.4&knob-Time%20zoom=120&knob-layerCount=3',
     );
   });
   test('should use a decades raster', async ({ page }) => {
     await common.expectChartAtUrlToMatchScreenshot(page)(
-      'http://localhost:9001/?path=/story/area-chart--timeslip&globals=theme:eui-light&knob-Minor%20grid%20lines=true&knob-Shift%20time=0&knob-Shorter%20X%20axis%20minor%20whiskers=true&knob-Stretch%20time=18&knob-Time%20zoom=120&knob-X%20axis%20minor%20whiskers=true&knob-showOverlappingLabels%20time%20axis=true',
+      'http://localhost:9001/?path=/story/area-chart--timeslip&globals=theme:light&knob-Minor%20grid%20lines=true&knob-Shift%20time=0&knob-Shorter%20X%20axis%20minor%20whiskers=true&knob-Stretch%20time=18&knob-Time%20zoom=120&knob-X%20axis%20minor%20whiskers=true&knob-showOverlappingLabels%20time%20axis=true',
     );
   });
   test('should included select annotation y domains', async ({ page }) => {
     await common.expectChartAtUrlToMatchScreenshot(page)(
-      'http://localhost:9001/?path=/story/axes--fit-domain&globals=theme:eui-light&knob-dataset=positive&knob-fit%20Y%20domain%20to%20data=true&knob-Specs%20to%20fit%20(yDomain)[0]=theshold&knob-Specs%20to%20fit%20(yDomain)[1]=rect&knob-constrain%20padding=true&knob-domain%20padding=0.1&knob-Domain%20padding%20unit=domainRatio&knob-thesholds%20-%20line[0]=1300&knob-theshold%20-%20rect={%22y0%22:-200,%22y1%22:null}',
+      'http://localhost:9001/?path=/story/axes--fit-domain&globals=theme:light&knob-dataset=positive&knob-fit%20Y%20domain%20to%20data=true&knob-Specs%20to%20fit%20(yDomain)[0]=theshold&knob-Specs%20to%20fit%20(yDomain)[1]=rect&knob-constrain%20padding=true&knob-domain%20padding=0.1&knob-Domain%20padding%20unit=domainRatio&knob-thesholds%20-%20line[0]=1300&knob-theshold%20-%20rect={%22y0%22:-200,%22y1%22:null}',
     );
   });
   test('should have st nd rd th after day-of-month numbers', async ({ page }) => {
     await common.expectChartAtUrlToMatchScreenshot(page)(
-      'http://localhost:9001/?path=/story/area-chart--timeslip&globals=theme:eui-light&knob-Minor%20grid%20lines=true&knob-Shift%20time=-4.3&knob-Shorter%20X%20axis%20minor%20whiskers=true&knob-Stretch%20time=4.8&knob-Time%20zoom=120&knob-X%20axis%20minor%20whiskers=true&knob-showOverlappingLabels%20time%20axis=true&knob-showOverlappingTicks%20time%20axis=true',
+      'http://localhost:9001/?path=/story/area-chart--timeslip&globals=theme:light&knob-Minor%20grid%20lines=true&knob-Shift%20time=-4.3&knob-Shorter%20X%20axis%20minor%20whiskers=true&knob-Stretch%20time=4.8&knob-Time%20zoom=120&knob-X%20axis%20minor%20whiskers=true&knob-showOverlappingLabels%20time%20axis=true&knob-showOverlappingTicks%20time%20axis=true',
     );
   });
   test('should have st nd rd th after day-of-month numbers even for the 20s', async ({ page }) => {
     await common.expectChartAtUrlToMatchScreenshot(page)(
-      'http://localhost:9001/?path=/story/area-chart--timeslip&globals=theme:eui-light&knob-Minor%20grid%20lines=true&knob-Shift%20time=8.5&knob-Shorter%20X%20axis%20minor%20whiskers=true&knob-Stretch%20time=4.8&knob-Time%20zoom=120&knob-X%20axis%20minor%20whiskers=true&knob-showOverlappingLabels%20time%20axis=true&knob-showOverlappingTicks%20time%20axis=true',
+      'http://localhost:9001/?path=/story/area-chart--timeslip&globals=theme:light&knob-Minor%20grid%20lines=true&knob-Shift%20time=8.5&knob-Shorter%20X%20axis%20minor%20whiskers=true&knob-Stretch%20time=4.8&knob-Time%20zoom=120&knob-X%20axis%20minor%20whiskers=true&knob-showOverlappingLabels%20time%20axis=true&knob-showOverlappingTicks%20time%20axis=true',
     );
   });
   test('should not show a raster that is finer than the bin width (minInterval)', async ({ page }) => {
     await common.expectChartAtUrlToMatchScreenshot(page)(
-      'http://localhost:9001/?path=/story/area-chart--timeslip&Bin%20width%20in%20ms%20(0:%20none%20specifed)=60000&Minor%20grid%20lines=on&Shift%20time=0&Stretch%20time=-0.4&Time%20zoom=2&globals=theme:eui-light&knob-Bin%20width%20in%20ms%20(0:%20none%20specifed)=60000&knob-Minor%20grid%20lines=true&knob-Shift%20time=0&knob-Stretch%20time=-0.4&knob-Time%20zoom=2&knob-layerCount=3&layerCount=3',
+      'http://localhost:9001/?path=/story/area-chart--timeslip&Bin%20width%20in%20ms%20(0:%20none%20specifed)=60000&Minor%20grid%20lines=on&Shift%20time=0&Stretch%20time=-0.4&Time%20zoom=2&globals=theme:light&knob-Bin%20width%20in%20ms%20(0:%20none%20specifed)=60000&knob-Minor%20grid%20lines=true&knob-Shift%20time=0&knob-Stretch%20time=-0.4&knob-Time%20zoom=2&knob-layerCount=3&layerCount=3',
     );
   });
   test('can show a finer raster than the data bin width if minInterval is expressly specified to be low', async ({
     page,
   }) => {
     await common.expectChartAtUrlToMatchScreenshot(page)(
-      'http://localhost:9001/?path=/story/area-chart--timeslip&Bin%20width%20in%20ms%20(0:%20none%20specifed)=1&Minor%20grid%20lines=on&Shift%20time=0&Stretch%20time=-0.4&Time%20zoom=2&globals=theme:eui-light&knob-Bin%20width%20in%20ms%20(0:%20none%20specifed)=1&knob-Minor%20grid%20lines=true&knob-Shift%20time=0&knob-Stretch%20time=-0.4&knob-Time%20zoom=2&knob-layerCount=3&layerCount=3',
+      'http://localhost:9001/?path=/story/area-chart--timeslip&Bin%20width%20in%20ms%20(0:%20none%20specifed)=1&Minor%20grid%20lines=on&Shift%20time=0&Stretch%20time=-0.4&Time%20zoom=2&globals=theme:light&knob-Bin%20width%20in%20ms%20(0:%20none%20specifed)=1&knob-Minor%20grid%20lines=true&knob-Shift%20time=0&knob-Stretch%20time=-0.4&knob-Time%20zoom=2&knob-layerCount=3&layerCount=3',
     );
   });
   test('can render multilayer time axis on top', async ({ page }) => {
     await common.expectChartAtUrlToMatchScreenshot(page)(
-      'http://localhost:9001/?path=/story/area-chart--timeslip&globals=theme:eui-light&knob-Bin width in ms (0: none specifed)=0&knob-Minor grid lines=true&knob-Shift time=8.5&knob-Shorter X axis minor whiskers=true&knob-Stretch time=6.8&knob-Time zoom=120&knob-X axis minor whiskers=true&knob-fallback placement=left-start&knob-layerCount=3&knob-placement=left&knob-placement offset=5&knob-showOverlappingLabels time axis=true&knob-showOverlappingTicks time axis=true&knob-stickTo=MousePosition&knob-Horizontal axis title=&knob-Top X axis=true',
+      'http://localhost:9001/?path=/story/area-chart--timeslip&globals=theme:light&knob-Bin width in ms (0: none specifed)=0&knob-Minor grid lines=true&knob-Shift time=8.5&knob-Shorter X axis minor whiskers=true&knob-Stretch time=6.8&knob-Time zoom=120&knob-X axis minor whiskers=true&knob-fallback placement=left-start&knob-layerCount=3&knob-placement=left&knob-placement offset=5&knob-showOverlappingLabels time axis=true&knob-showOverlappingTicks time axis=true&knob-stickTo=MousePosition&knob-Horizontal axis title=&knob-Top X axis=true',
     );
   });
   test('uses proper english ending at a daily resolution, 30th....14th', async ({ page }) => {
     await common.expectChartAtUrlToMatchScreenshot(page)(
-      'http://localhost:9001/?path=/story/area-chart--timeslip&globals=theme:eui-light&knob-Bin width in ms (0: none specifed)=0&knob-Minor grid lines=true&knob-Shift time=-7.1&knob-Stretch time=6.6&knob-Time zoom=120&knob-layerCount=3&knob-Horizontal axis title=&knob-Top X axis=&knob-showOverlappingTicks time axis=&knob-showOverlappingLabels time axis=',
+      'http://localhost:9001/?path=/story/area-chart--timeslip&globals=theme:light&knob-Bin width in ms (0: none specifed)=0&knob-Minor grid lines=true&knob-Shift time=-7.1&knob-Stretch time=6.6&knob-Time zoom=120&knob-layerCount=3&knob-Horizontal axis title=&knob-Top X axis=&knob-showOverlappingTicks time axis=&knob-showOverlappingLabels time axis=',
     );
   });
   test('uses proper english ending at a daily resolution, 10th...25th', async ({ page }) => {
     await common.expectChartAtUrlToMatchScreenshot(page)(
-      'http://localhost:9001/?path=/story/area-chart--timeslip&globals=theme:eui-light&knob-Bin width in ms (0: none specifed)=0&knob-Minor grid lines=true&knob-Shift time=-9.8&knob-Stretch time=6.6&knob-Time zoom=120&knob-layerCount=3&knob-Horizontal axis title=&knob-Top X axis=&knob-showOverlappingTicks time axis=&knob-showOverlappingLabels time axis=',
+      'http://localhost:9001/?path=/story/area-chart--timeslip&globals=theme:light&knob-Bin width in ms (0: none specifed)=0&knob-Minor grid lines=true&knob-Shift time=-9.8&knob-Stretch time=6.6&knob-Time zoom=120&knob-layerCount=3&knob-Horizontal axis title=&knob-Top X axis=&knob-showOverlappingTicks time axis=&knob-showOverlappingLabels time axis=',
     );
   });
   test('uses proper english ending at a weekly resolution', async ({ page }) => {
     await common.expectChartAtUrlToMatchScreenshot(page)(
-      'http://localhost:9001/?path=/story/area-chart--timeslip&globals=theme:eui-light&knob-Bin width in ms (0: none specifed)=0&knob-Minor grid lines=true&knob-Shift time=-8.3&knob-Stretch time=10&knob-Time zoom=120&knob-layerCount=3&knob-Horizontal axis title=&knob-Top X axis=&knob-showOverlappingTicks time axis=&knob-showOverlappingLabels time axis=',
+      'http://localhost:9001/?path=/story/area-chart--timeslip&globals=theme:light&knob-Bin width in ms (0: none specifed)=0&knob-Minor grid lines=true&knob-Shift time=-8.3&knob-Stretch time=10&knob-Time zoom=120&knob-layerCount=3&knob-Horizontal axis title=&knob-Top X axis=&knob-showOverlappingTicks time axis=&knob-showOverlappingLabels time axis=',
     );
   });
   test('should extend the domain on the right with one bin width with custom bin width', async ({ page }) => {
     await common.expectChartAtUrlToMatchScreenshot(page)(
-      'http://localhost:9001/?path=/story/bar-chart--test-discover&globals=theme:eui-light&knob-Minor%20grid%20lines=true&knob-Pan%20time=0&knob-Shift%20time=0&knob-Shorter%20X%20axis%20minor%20whiskers=true&knob-Stretch%20time=3.8&knob-Time%20zoom=120&knob-X%20axis%20minor%20whiskers=true&knob-layerCount=3&knob-showOverlappingLabels%20time%20axis=true&knob-showOverlappingTicks%20time%20axis=true&knob-use%20custom%20minInterval%20of%2030s=true&knob-use%20multilayer%20time%20axis=true',
+      'http://localhost:9001/?path=/story/bar-chart--test-discover&globals=theme:light&knob-Minor%20grid%20lines=true&knob-Pan%20time=0&knob-Shift%20time=0&knob-Shorter%20X%20axis%20minor%20whiskers=true&knob-Stretch%20time=3.8&knob-Time%20zoom=120&knob-X%20axis%20minor%20whiskers=true&knob-layerCount=3&knob-showOverlappingLabels%20time%20axis=true&knob-showOverlappingTicks%20time%20axis=true&knob-use%20custom%20minInterval%20of%2030s=true&knob-use%20multilayer%20time%20axis=true',
     );
   });
   test('should extend the domain on the right with one bin width without custom bin width', async ({ page }) => {
     await common.expectChartAtUrlToMatchScreenshot(page)(
-      'http://localhost:9001/?path=/story/bar-chart--test-discover&globals=theme:eui-light&knob-Minor%20grid%20lines=true&knob-Pan%20time=0&knob-Shift%20time=0&knob-Shorter%20X%20axis%20minor%20whiskers=true&knob-Stretch%20time=3.8&knob-Time%20zoom=120&knob-X%20axis%20minor%20whiskers=true&knob-layerCount=3&knob-showOverlappingLabels%20time%20axis=true&knob-showOverlappingTicks%20time%20axis=true&knob-use%20custom%20minInterval%20of%2030s=false&knob-use%20multilayer%20time%20axis=true',
+      'http://localhost:9001/?path=/story/bar-chart--test-discover&globals=theme:light&knob-Minor%20grid%20lines=true&knob-Pan%20time=0&knob-Shift%20time=0&knob-Shorter%20X%20axis%20minor%20whiskers=true&knob-Stretch%20time=3.8&knob-Time%20zoom=120&knob-X%20axis%20minor%20whiskers=true&knob-layerCount=3&knob-showOverlappingLabels%20time%20axis=true&knob-showOverlappingTicks%20time%20axis=true&knob-use%20custom%20minInterval%20of%2030s=false&knob-use%20multilayer%20time%20axis=true',
     );
   });
   test('renders multilayer time axis with a single point and an arbitrary non-degenerate domain', async ({ page }) => {
     await common.expectChartAtUrlToMatchScreenshot(page)(
-      'http://localhost:9001/?path=/story/bar-chart--test-single-histogram-bar-chart&globals=theme:eui-light&knob-non-round time domain start=true&knob-use multilayer time axis=true&knob-use lines instead of bars=true',
+      'http://localhost:9001/?path=/story/bar-chart--test-single-histogram-bar-chart&globals=theme:light&knob-non-round time domain start=true&knob-use multilayer time axis=true&knob-use lines instead of bars=true',
     );
   });
   test('renders multilayer time axis with a single point and a degenerate, zero width domain', async ({ page }) => {
     await common.expectChartAtUrlToMatchScreenshot(page)(
-      'http://localhost:9001/?path=/story/bar-chart--test-single-histogram-bar-chart&globals=theme:eui-light&knob-non-round time domain start=&knob-use multilayer time axis=true&knob-use lines instead of bars=true',
+      'http://localhost:9001/?path=/story/bar-chart--test-single-histogram-bar-chart&globals=theme:light&knob-non-round time domain start=&knob-use multilayer time axis=true&knob-use lines instead of bars=true',
     );
   });
   test('should render proper tick count', async ({ page }) => {
@@ -202,12 +202,12 @@ test.describe('Axis stories', () => {
   test.describe('Timeslip/Multilayer time axis', () => {
     test('should show start of week label on last month when tick is inside extents', async ({ page }) => {
       await common.expectChartAtUrlToMatchScreenshot(page)(
-        'http://localhost:9001/?path=/story/area-chart--timeslip&globals=theme:eui-light&knob-Bin width in ms (0: none specifed)=0&knob-Minor grid lines=true&knob-Shift time=0.3&knob-Stretch time=8.6&knob-Time zoom=78&knob-layerCount=2&knob-Show legend=&knob-Horizontal axis title=&knob-Top X axis=&knob-showOverlappingTicks time axis=&knob-showOverlappingLabels time axis=',
+        'http://localhost:9001/?path=/story/area-chart--timeslip&globals=theme:light&knob-Bin width in ms (0: none specifed)=0&knob-Minor grid lines=true&knob-Shift time=0.3&knob-Stretch time=8.6&knob-Time zoom=78&knob-layerCount=2&knob-Show legend=&knob-Horizontal axis title=&knob-Top X axis=&knob-showOverlappingTicks time axis=&knob-showOverlappingLabels time axis=',
       );
     });
     test('should shide start of week label on last month when tick is outside extents', async ({ page }) => {
       await common.expectChartAtUrlToMatchScreenshot(page)(
-        'http://localhost:9001/?path=/story/area-chart--timeslip&globals=theme:eui-light&knob-Bin width in ms (0: none specifed)=0&knob-Minor grid lines=true&knob-Shift time=0.25&knob-Stretch time=8.6&knob-Time zoom=78&knob-layerCount=2&knob-Show legend=&knob-Horizontal axis title=&knob-Top X axis=&knob-showOverlappingTicks time axis=&knob-showOverlappingLabels time axis=',
+        'http://localhost:9001/?path=/story/area-chart--timeslip&globals=theme:light&knob-Bin width in ms (0: none specifed)=0&knob-Minor grid lines=true&knob-Shift time=0.25&knob-Stretch time=8.6&knob-Time zoom=78&knob-layerCount=2&knob-Show legend=&knob-Horizontal axis title=&knob-Top X axis=&knob-showOverlappingTicks time axis=&knob-showOverlappingLabels time axis=',
       );
     });
   });
diff --git a/e2e/tests/bar_stories.test.ts b/e2e/tests/bar_stories.test.ts
index fb55977d6b..cc4977e223 100644
--- a/e2e/tests/bar_stories.test.ts
+++ b/e2e/tests/bar_stories.test.ts
@@ -132,7 +132,7 @@ test.describe('Bar series stories', () => {
           ])(
             (h) => `Horizontal Alignment - ${h}`,
             (horizontalAlignment) => {
-              const url = `http://localhost:9001/?path=/story/bar-chart--data-value&args=&globals=theme:eui-light&knob-chartRotation=${rotation}&knob-Horizontal alignment=${horizontalAlignment}&knob-Vertical alignment=${verticalAlignment}`;
+              const url = `http://localhost:9001/?path=/story/bar-chart--data-value&args=&globals=theme:light&knob-chartRotation=${rotation}&knob-Horizontal alignment=${horizontalAlignment}&knob-Vertical alignment=${verticalAlignment}`;
               test('place the value labels on the correct area', async ({ page }) => {
                 await common.expectChartAtUrlToMatchScreenshot(page)(url);
               });
@@ -237,28 +237,28 @@ test.describe('Bar series stories', () => {
   test.describe('Stacked bars configs', () => {
     test('percentage stacked with internal fn', async ({ page }) => {
       await common.expectChartAtUrlToMatchScreenshot(page)(
-        'http://localhost:9001/?path=/story/bar-chart--stacked-as-percentage&globals=theme:eui-light&knob-mode=stackAsPercentage&knob-use computeRatioByGroups fn=',
+        'http://localhost:9001/?path=/story/bar-chart--stacked-as-percentage&globals=theme:light&knob-mode=stackAsPercentage&knob-use computeRatioByGroups fn=',
       );
     });
     test('percentage stacked with external fn', async ({ page }) => {
       await common.expectChartAtUrlToMatchScreenshot(page)(
-        'http://localhost:9001/?path=/story/bar-chart--stacked-as-percentage&globals=theme:eui-light&knob-mode=stackAsPercentage&knob-use computeRatioByGroups fn=true',
+        'http://localhost:9001/?path=/story/bar-chart--stacked-as-percentage&globals=theme:light&knob-mode=stackAsPercentage&knob-use computeRatioByGroups fn=true',
       );
     });
     test('non stacked with external fn', async ({ page }) => {
       await common.expectChartAtUrlToMatchScreenshot(page)(
-        'http://localhost:9001/?path=/story/bar-chart--stacked-as-percentage&globals=theme:eui-light&knob-mode=unstacked&knob-use computeRatioByGroups fn=true',
+        'http://localhost:9001/?path=/story/bar-chart--stacked-as-percentage&globals=theme:light&knob-mode=unstacked&knob-use computeRatioByGroups fn=true',
       );
     });
 
     test('percentage stacked with external fn multi Y', async ({ page }) => {
       await common.expectChartAtUrlToMatchScreenshot(page)(
-        'http://localhost:9001/?path=/story/bar-chart--stacked-as-percentage&globals=theme:eui-light&knob-mode=stackAsPercentage&knob-use computeRatioByGroups fn=true&knob-use multiple Y accessors=true',
+        'http://localhost:9001/?path=/story/bar-chart--stacked-as-percentage&globals=theme:light&knob-mode=stackAsPercentage&knob-use computeRatioByGroups fn=true&knob-use multiple Y accessors=true',
       );
     });
     test('non stacked with external fn multi Y', async ({ page }) => {
       await common.expectChartAtUrlToMatchScreenshot(page)(
-        'http://localhost:9001/?path=/story/bar-chart--stacked-as-percentage&globals=theme:eui-light&knob-mode=unstacked&knob-use computeRatioByGroups fn=true&knob-use multiple Y accessors=true',
+        'http://localhost:9001/?path=/story/bar-chart--stacked-as-percentage&globals=theme:light&knob-mode=unstacked&knob-use computeRatioByGroups fn=true&knob-use multiple Y accessors=true',
       );
     });
   });
diff --git a/e2e/tests/dark_mode.test.ts b/e2e/tests/dark_mode.test.ts
index c44bb23cf1..66d8b106a0 100644
--- a/e2e/tests/dark_mode.test.ts
+++ b/e2e/tests/dark_mode.test.ts
@@ -13,7 +13,7 @@ import { common } from '../page_objects/common';
 test.describe('Small multiples - dark mode', () => {
   test('renders panel titles', async ({ page }) => {
     await common.expectChartAtUrlToMatchScreenshot(page)(
-      `http://localhost:9001/?path=/story/small-multiples-alpha--sunbursts&globals=theme:eui-dark;background:black`,
+      `http://localhost:9001/?path=/story/small-multiples-alpha--sunbursts&globals=theme:dark`,
     );
   });
 });
diff --git a/e2e/tests/flame_stories.test.ts b/e2e/tests/flame_stories.test.ts
index dfe4386b32..2e6aff30af 100644
--- a/e2e/tests/flame_stories.test.ts
+++ b/e2e/tests/flame_stories.test.ts
@@ -31,7 +31,7 @@ test.describe('Flame stories', () => {
   });
   test('should focus on searched terms', async ({ page }) => {
     await common.expectChartAtUrlToMatchScreenshot(page)(
-      `http://localhost:9001/?path=/story/flame-alpha--cpu-profile-g-l-flame-chart&globals=theme:eui-light&knob-Text%20to%20search=gotype`,
+      `http://localhost:9001/?path=/story/flame-alpha--cpu-profile-g-l-flame-chart&globals=theme:light&knob-Text%20to%20search=gotype`,
       {
         // replace this with render count selector when render count fixed
         delay: 300, // wait for tweening and blinking to finish
diff --git a/e2e/tests/goal_stories.test.ts b/e2e/tests/goal_stories.test.ts
index ce01eddb14..afbc9ca459 100644
--- a/e2e/tests/goal_stories.test.ts
+++ b/e2e/tests/goal_stories.test.ts
@@ -20,7 +20,7 @@ test.describe('Goal stories', () => {
 
   test('should render actual tooltip color on hover', async ({ page }) => {
     await common.expectChartWithMouseAtUrlToMatchScreenshot(page)(
-      'http://localhost:9001/?path=/story/goal-alpha--gaps&knob-show target=false&knob-target=260&globals=background:white',
+      'http://localhost:9001/?path=/story/goal-alpha--gaps&knob-show target=false&knob-target=260',
       { right: 245, bottom: 120 },
     );
   });
@@ -78,13 +78,13 @@ test.describe('Goal stories', () => {
 
   test('should prevent overlapping angles - clockwise', async ({ page }) => {
     await common.expectChartAtUrlToMatchScreenshot(page)(
-      'http://localhost:9001/?path=/story/goal-alpha--full-circle&globals=theme:eui-light&knob-endAngle%20(%CF%80)=-0.625&knob-startAngle%20(%CF%80)=1.5',
+      'http://localhost:9001/?path=/story/goal-alpha--full-circle&globals=theme:light&knob-endAngle%20(%CF%80)=-0.625&knob-startAngle%20(%CF%80)=1.5',
     );
   });
 
   test('should prevent overlapping angles - counterclockwise', async ({ page }) => {
     await common.expectChartAtUrlToMatchScreenshot(page)(
-      'http://localhost:9001/?path=/story/goal-alpha--full-circle&globals=theme:eui-light&knob-endAngle%20(%CF%80)=1.625&knob-startAngle%20(%CF%80)=-0.5',
+      'http://localhost:9001/?path=/story/goal-alpha--full-circle&globals=theme:light&knob-endAngle%20(%CF%80)=1.625&knob-startAngle%20(%CF%80)=-0.5',
     );
   });
 
@@ -112,7 +112,7 @@ test.describe('Goal stories', () => {
       ([p]) => `should apply correct top shift (${p})`,
       async (page, [, startAngle, endAngle]) => {
         await common.expectChartAtUrlToMatchScreenshot(page)(
-          `http://localhost:9001/?path=/story/goal-alpha--full-circle&globals=theme:eui-light&knob-startAngle%20(%CF%80)=${startAngle}&knob-endAngle%20(%CF%80)=${endAngle}`,
+          `http://localhost:9001/?path=/story/goal-alpha--full-circle&globals=theme:light&knob-startAngle%20(%CF%80)=${startAngle}&knob-endAngle%20(%CF%80)=${endAngle}`,
         );
       },
     );
@@ -128,7 +128,7 @@ test.describe('Goal stories', () => {
       ([p]) => `should apply correct bottom shift (${p})`,
       async (page, [, startAngle, endAngle]) => {
         await common.expectChartAtUrlToMatchScreenshot(page)(
-          `http://localhost:9001/?path=/story/goal-alpha--full-circle&globals=theme:eui-light&knob-startAngle%20(%CF%80)=${startAngle}&knob-endAngle%20(%CF%80)=${endAngle}`,
+          `http://localhost:9001/?path=/story/goal-alpha--full-circle&globals=theme:light&knob-startAngle%20(%CF%80)=${startAngle}&knob-endAngle%20(%CF%80)=${endAngle}`,
         );
       },
     );
diff --git a/e2e/tests/heatmap_stories.test.ts b/e2e/tests/heatmap_stories.test.ts
index 2f57aca5fd..9adfb406ff 100644
--- a/e2e/tests/heatmap_stories.test.ts
+++ b/e2e/tests/heatmap_stories.test.ts
@@ -55,7 +55,7 @@ test.describe('Heatmap stories', () => {
     async (page, dataset) => {
       await page.setViewportSize({ width: 785, height: 600 });
       await common.expectChartAtUrlToMatchScreenshot(page)(
-        `http://localhost:9001/?path=/story/heatmap-alpha--time-snap&globals=theme:eui-light&knob-dataset=${dataset}`,
+        `http://localhost:9001/?path=/story/heatmap-alpha--time-snap&globals=theme:light&knob-dataset=${dataset}`,
       );
     },
   );
@@ -68,19 +68,19 @@ test.describe('Heatmap stories', () => {
 
   test('rotate categorical axis labels', async ({ page }) => {
     await common.expectChartAtUrlToMatchScreenshot(page)(
-      'http://localhost:9001/?path=/story/heatmap-alpha--label-rotation&globals=theme:eui-light&knob-Y-axis auto width=true&knob-Y-axis width=50&knob-X-Axis visible=true&knob-X-Axis label fontSize=12&knob-X-Axis label padding=6&knob-X-Axis label rotation=45&knob-Use categorical data=true&knob-Show legend=',
+      'http://localhost:9001/?path=/story/heatmap-alpha--label-rotation&globals=theme:light&knob-Y-axis auto width=true&knob-Y-axis width=50&knob-X-Axis visible=true&knob-X-Axis label fontSize=12&knob-X-Axis label padding=6&knob-X-Axis label rotation=45&knob-Use categorical data=true&knob-Show legend=',
     );
   });
 
   test('rotate time axis labels', async ({ page }) => {
     await common.expectChartAtUrlToMatchScreenshot(page)(
-      'http://localhost:9001/?path=/story/heatmap-alpha--label-rotation&globals=theme:eui-light&knob-Y-axis auto width=true&knob-Y-axis width=50&knob-X-Axis visible=true&knob-X-Axis label fontSize=12&knob-X-Axis label padding=6&knob-X-Axis label rotation=45&knob-Use categorical data=&knob-Show legend=',
+      'http://localhost:9001/?path=/story/heatmap-alpha--label-rotation&globals=theme:light&knob-Y-axis auto width=true&knob-Y-axis width=50&knob-X-Axis visible=true&knob-X-Axis label fontSize=12&knob-X-Axis label padding=6&knob-X-Axis label rotation=45&knob-Use categorical data=&knob-Show legend=',
     );
   });
 
   test('render table with all nulls', async ({ page }) => {
     await common.expectChartAtUrlToMatchScreenshot(page)(
-      'http://localhost:9001/?path=/story/heatmap-alpha--sorting&globals=theme:eui-light&knob-Fill gaps with nulls=true&knob-Fill everything with nulls=true&knob-X sorting predicate=dataIndex&knob-Y sorting predicate=dataIndex',
+      'http://localhost:9001/?path=/story/heatmap-alpha--sorting&globals=theme:light&knob-Fill gaps with nulls=true&knob-Fill everything with nulls=true&knob-X sorting predicate=dataIndex&knob-Y sorting predicate=dataIndex',
     );
   });
 
@@ -121,7 +121,7 @@ test.describe('Heatmap stories', () => {
         const showAxesTitles = hiddenTitles !== 'axes' && hiddenTitles !== 'both';
         const showPanelTitles = hiddenTitles !== 'panel' && hiddenTitles !== 'both';
         await common.expectChartAtUrlToMatchScreenshot(page)(
-          `http://localhost:9001/?path=/story/small-multiples-alpha--heatmap&globals=background:white;theme:eui-light&knob-Hide_left=true&knob-Hide_right=true&knob-Hide_top=true&knob-Horizontal inner pad=0.1&knob-Horizontal inner pad_SmallMultiples Styles=0.05&knob-Horizontal outer pad=0&knob-Horizontal outer pad_SmallMultiples Styles=0&knob-Persist cells selection=true&knob-Show Legend=true&knob-Show axes title_SmallMultiples Styles=${showAxesTitles}&knob-Show axes panel titles_SmallMultiples Styles=${showPanelTitles}&knob-Show grid line_bottom=true&knob-Show grid line_left=true&knob-Show x axis title_SmallMultiples Styles=true&knob-Show y axis title_SmallMultiples Styles=true&knob-Time data=${timeData}&knob-Title_bottom=Hosts - Bottom&knob-Title_left=Metrics - Left&knob-Title_right=Metrics - Right&knob-Title_top=Hosts - Top&knob-Vertical inner pad=0.3&knob-Vertical inner pad_SmallMultiples Styles=0.1&knob-Vertical outer pad=0&knob-Vertical outer pad_SmallMultiples Styles=0&knob-categories_Data=4&knob-cell%20density(%)_Data=${density}&knob-density(%)_Data=100&knob-density_Data=2&knob-group count_Data=9&knob-h - split count_Data=${
+          `http://localhost:9001/?path=/story/small-multiples-alpha--heatmap&globals=theme:light&knob-Hide_left=true&knob-Hide_right=true&knob-Hide_top=true&knob-Horizontal inner pad=0.1&knob-Horizontal inner pad_SmallMultiples Styles=0.05&knob-Horizontal outer pad=0&knob-Horizontal outer pad_SmallMultiples Styles=0&knob-Persist cells selection=true&knob-Show Legend=true&knob-Show axes title_SmallMultiples Styles=${showAxesTitles}&knob-Show axes panel titles_SmallMultiples Styles=${showPanelTitles}&knob-Show grid line_bottom=true&knob-Show grid line_left=true&knob-Show x axis title_SmallMultiples Styles=true&knob-Show y axis title_SmallMultiples Styles=true&knob-Time data=${timeData}&knob-Title_bottom=Hosts - Bottom&knob-Title_left=Metrics - Left&knob-Title_right=Metrics - Right&knob-Title_top=Hosts - Top&knob-Vertical inner pad=0.3&knob-Vertical inner pad_SmallMultiples Styles=0.1&knob-Vertical outer pad=0&knob-Vertical outer pad_SmallMultiples Styles=0&knob-categories_Data=4&knob-cell%20density(%)_Data=${density}&knob-density(%)_Data=100&knob-density_Data=2&knob-group count_Data=9&knob-h - split count_Data=${
             hSplit ?? 0
           }&knob-h - split_Data=${Number.isFinite(hSplit)}&knob-number of groups_Data=4&knob-v - split count_Data=${
             vSplit ?? 0
@@ -137,14 +137,14 @@ test.describe('Heatmap stories', () => {
 
     test('should render tooltip over correct panel', async ({ page }) => {
       await common.expectChartWithMouseAtUrlToMatchScreenshot(page)(
-        'http://localhost:9001/?path=/story/small-multiples-alpha--heatmap&globals=theme:eui-light&knob-Hide_left=true&knob-Hide_right=true&knob-Hide_top=true&knob-Horizontal inner pad=0.1&knob-Horizontal inner pad_SmallMultiples Styles=0.05&knob-Horizontal outer pad=0&knob-Horizontal outer pad_SmallMultiples Styles=0&knob-Persist cells selection=true&knob-Show Legend=true&knob-Show axes title_SmallMultiples Styles=true&knob-Show axis panel titles=true&knob-Show axis panel titles_SmallMultiples Styles=true&knob-Show grid line_bottom=true&knob-Show grid line_left=true&knob-Show x axis title_SmallMultiples Styles=true&knob-Show y axis title_SmallMultiples Styles=true&knob-Time data=true&knob-Title_bottom=Hosts - Bottom&knob-Title_left=Metrics - Left&knob-Title_right=Metrics - Right&knob-Title_top=Hosts - Top&knob-Vertical inner pad=0.3&knob-Vertical inner pad_SmallMultiples Styles=0.1&knob-Vertical outer pad=0&knob-Vertical outer pad_SmallMultiples Styles=0&knob-categories_Data=4&knob-cell%20density(%)_Data[0]=20&knob-cell%20density(%)_Data[1]=20,60,20,20,50,20,5,25,20,25,50,50,50,50,25,20,20&knob-density(%)_Data=100&knob-density_Data=2&knob-group count_Data=9&knob-h - split count_Data=2&knob-h - split_Data=true&knob-number of groups_Data=4&knob-v - split count_Data=2&knob-v - split_Data=true&knob-Debug=&knob-cell density(%)_Data=100',
+        'http://localhost:9001/?path=/story/small-multiples-alpha--heatmap&globals=theme:light&knob-Hide_left=true&knob-Hide_right=true&knob-Hide_top=true&knob-Horizontal inner pad=0.1&knob-Horizontal inner pad_SmallMultiples Styles=0.05&knob-Horizontal outer pad=0&knob-Horizontal outer pad_SmallMultiples Styles=0&knob-Persist cells selection=true&knob-Show Legend=true&knob-Show axes title_SmallMultiples Styles=true&knob-Show axis panel titles=true&knob-Show axis panel titles_SmallMultiples Styles=true&knob-Show grid line_bottom=true&knob-Show grid line_left=true&knob-Show x axis title_SmallMultiples Styles=true&knob-Show y axis title_SmallMultiples Styles=true&knob-Time data=true&knob-Title_bottom=Hosts - Bottom&knob-Title_left=Metrics - Left&knob-Title_right=Metrics - Right&knob-Title_top=Hosts - Top&knob-Vertical inner pad=0.3&knob-Vertical inner pad_SmallMultiples Styles=0.1&knob-Vertical outer pad=0&knob-Vertical outer pad_SmallMultiples Styles=0&knob-categories_Data=4&knob-cell%20density(%)_Data[0]=20&knob-cell%20density(%)_Data[1]=20,60,20,20,50,20,5,25,20,25,50,50,50,50,25,20,20&knob-density(%)_Data=100&knob-density_Data=2&knob-group count_Data=9&knob-h - split count_Data=2&knob-h - split_Data=true&knob-number of groups_Data=4&knob-v - split count_Data=2&knob-v - split_Data=true&knob-Debug=&knob-cell density(%)_Data=100',
         { left: 464, top: 212 },
       );
     });
 
     test('should constrain brush to active panel', async ({ page }) => {
       await common.expectChartWithDragAtUrlToMatchScreenshot(page)(
-        'http://localhost:9001/?path=/story/small-multiples-alpha--heatmap&globals=background:white;theme:eui-light&knob-Enable%20debug%20state=true&knob-Grid%20stroke_SmallMultiples%20Styles=1&knob-Horizontal%20inner%20pad_SmallMultiples%20Styles=0.05&knob-Horizontal%20outer%20pad_SmallMultiples%20Styles=0&knob-Persist%20cells%20selection=true&knob-Show%20axes%20panel%20titles_SmallMultiples%20Styles=true&knob-Show%20axes%20title_SmallMultiples%20Styles=true&knob-Vertical%20inner%20pad_SmallMultiples%20Styles=0.1&knob-Vertical%20outer%20pad_SmallMultiples%20Styles=0&knob-categories_Data=4&knob-cell%20density(%)_Data=75&knob-h%20-%20split%20count_Data=2&knob-h%20-%20split_Data=true&knob-v%20-%20split%20count_Data=2&knob-v%20-%20split_Data=true&knob-xScaleType_Data=linear',
+        'http://localhost:9001/?path=/story/small-multiples-alpha--heatmap&globals=theme:light&knob-Enable%20debug%20state=true&knob-Grid%20stroke_SmallMultiples%20Styles=1&knob-Horizontal%20inner%20pad_SmallMultiples%20Styles=0.05&knob-Horizontal%20outer%20pad_SmallMultiples%20Styles=0&knob-Persist%20cells%20selection=true&knob-Show%20axes%20panel%20titles_SmallMultiples%20Styles=true&knob-Show%20axes%20title_SmallMultiples%20Styles=true&knob-Vertical%20inner%20pad_SmallMultiples%20Styles=0.1&knob-Vertical%20outer%20pad_SmallMultiples%20Styles=0&knob-categories_Data=4&knob-cell%20density(%)_Data=75&knob-h%20-%20split%20count_Data=2&knob-h%20-%20split_Data=true&knob-v%20-%20split%20count_Data=2&knob-v%20-%20split_Data=true&knob-xScaleType_Data=linear',
         { left: 320, top: 100 },
         { left: 630, top: 245 },
       );
@@ -152,7 +152,7 @@ test.describe('Heatmap stories', () => {
 
     test('should brush panel with time data', async ({ page }) => {
       await common.expectChartWithDragAtUrlToMatchScreenshot(page)(
-        'http://localhost:9001/?path=/story/small-multiples-alpha--heatmap&globals=background:white;theme:eui-light&knob-Hide_left=true&knob-Hide_right=true&knob-Hide_top=true&knob-Horizontal inner pad=0.1&knob-Horizontal inner pad_SmallMultiples Styles=0.05&knob-Horizontal outer pad=0&knob-Horizontal outer pad_SmallMultiples Styles=0&knob-Persist cells selection=true&knob-Show Legend=&knob-Show axes title_SmallMultiples Styles=true&knob-Show axis panel titles=true&knob-Show axis panel titles_SmallMultiples Styles=true&knob-Show grid line_bottom=true&knob-Show grid line_left=true&knob-Show x axis title_SmallMultiples Styles=true&knob-Show y axis title_SmallMultiples Styles=true&knob-Time data=true&knob-Title_bottom=Hosts - Bottom&knob-Title_left=Metrics - Left&knob-Title_right=Metrics - Right&knob-Title_top=Hosts - Top&knob-Vertical inner pad=0.3&knob-Vertical inner pad_SmallMultiples Styles=0.1&knob-Vertical outer pad=0&knob-Vertical outer pad_SmallMultiples Styles=0&knob-categories_Data=4&knob-group count_Data=9&knob-h - split count_Data=2&knob-h - split_Data=true&knob-number of groups_Data=4&knob-v - split count_Data=2&knob-v - split_Data=true&knob-Debug=&knob-Enable debug state=true&knob-xScaleType_Data=linear&knob-Show axes panel titles_SmallMultiples Styles=true&knob-Grid stroke_SmallMultiples Styles=1&knob-cell density(%)_Data=50',
+        'http://localhost:9001/?path=/story/small-multiples-alpha--heatmap&globals=theme:light&knob-Hide_left=true&knob-Hide_right=true&knob-Hide_top=true&knob-Horizontal inner pad=0.1&knob-Horizontal inner pad_SmallMultiples Styles=0.05&knob-Horizontal outer pad=0&knob-Horizontal outer pad_SmallMultiples Styles=0&knob-Persist cells selection=true&knob-Show Legend=&knob-Show axes title_SmallMultiples Styles=true&knob-Show axis panel titles=true&knob-Show axis panel titles_SmallMultiples Styles=true&knob-Show grid line_bottom=true&knob-Show grid line_left=true&knob-Show x axis title_SmallMultiples Styles=true&knob-Show y axis title_SmallMultiples Styles=true&knob-Time data=true&knob-Title_bottom=Hosts - Bottom&knob-Title_left=Metrics - Left&knob-Title_right=Metrics - Right&knob-Title_top=Hosts - Top&knob-Vertical inner pad=0.3&knob-Vertical inner pad_SmallMultiples Styles=0.1&knob-Vertical outer pad=0&knob-Vertical outer pad_SmallMultiples Styles=0&knob-categories_Data=4&knob-group count_Data=9&knob-h - split count_Data=2&knob-h - split_Data=true&knob-number of groups_Data=4&knob-v - split count_Data=2&knob-v - split_Data=true&knob-Debug=&knob-Enable debug state=true&knob-xScaleType_Data=linear&knob-Show axes panel titles_SmallMultiples Styles=true&knob-Grid stroke_SmallMultiples Styles=1&knob-cell density(%)_Data=50',
         { left: 520, top: 210 },
         { left: 710, top: 280 },
       );
@@ -160,14 +160,14 @@ test.describe('Heatmap stories', () => {
 
     test('should select single cell on click with time data', async ({ page }) => {
       await common.expectChartWithClickAtUrlToMatchScreenshot(page)(
-        'http://localhost:9001/?path=/story/small-multiples-alpha--heatmap&globals=background:white;theme:eui-light&knob-Enable debug state=true&knob-Grid stroke_SmallMultiples Styles=1&knob-Hide_left=true&knob-Hide_right=true&knob-Hide_top=true&knob-Horizontal inner pad=0.1&knob-Horizontal inner pad_SmallMultiples Styles=0.05&knob-Horizontal outer pad=0&knob-Horizontal outer pad_SmallMultiples Styles=0&knob-Persist cells selection=true&knob-Show axes panel titles_SmallMultiples Styles=true&knob-Show axes title_SmallMultiples Styles=true&knob-Show axis panel titles=true&knob-Show axis panel titles_SmallMultiples Styles=true&knob-Show grid line_bottom=true&knob-Show grid line_left=true&knob-Show x axis title_SmallMultiples Styles=true&knob-Show y axis title_SmallMultiples Styles=true&knob-Time data=true&knob-Title_bottom=Hosts - Bottom&knob-Title_left=Metrics - Left&knob-Title_right=Metrics - Right&knob-Title_top=Hosts - Top&knob-Vertical inner pad=0.3&knob-Vertical inner pad_SmallMultiples Styles=0.1&knob-Vertical outer pad=0&knob-Vertical outer pad_SmallMultiples Styles=0&knob-categories_Data=4&knob-group count_Data=9&knob-h - split count_Data=2&knob-h - split_Data=true&knob-number of groups_Data=4&knob-v - split count_Data=2&knob-v - split_Data=true&knob-xScaleType_Data=linear&knob-Debug=&knob-Show Legend=&knob-cell density(%)_Data=100',
+        'http://localhost:9001/?path=/story/small-multiples-alpha--heatmap&globals=theme:light&knob-Enable debug state=true&knob-Grid stroke_SmallMultiples Styles=1&knob-Hide_left=true&knob-Hide_right=true&knob-Hide_top=true&knob-Horizontal inner pad=0.1&knob-Horizontal inner pad_SmallMultiples Styles=0.05&knob-Horizontal outer pad=0&knob-Horizontal outer pad_SmallMultiples Styles=0&knob-Persist cells selection=true&knob-Show axes panel titles_SmallMultiples Styles=true&knob-Show axes title_SmallMultiples Styles=true&knob-Show axis panel titles=true&knob-Show axis panel titles_SmallMultiples Styles=true&knob-Show grid line_bottom=true&knob-Show grid line_left=true&knob-Show x axis title_SmallMultiples Styles=true&knob-Show y axis title_SmallMultiples Styles=true&knob-Time data=true&knob-Title_bottom=Hosts - Bottom&knob-Title_left=Metrics - Left&knob-Title_right=Metrics - Right&knob-Title_top=Hosts - Top&knob-Vertical inner pad=0.3&knob-Vertical inner pad_SmallMultiples Styles=0.1&knob-Vertical outer pad=0&knob-Vertical outer pad_SmallMultiples Styles=0&knob-categories_Data=4&knob-group count_Data=9&knob-h - split count_Data=2&knob-h - split_Data=true&knob-number of groups_Data=4&knob-v - split count_Data=2&knob-v - split_Data=true&knob-xScaleType_Data=linear&knob-Debug=&knob-Show Legend=&knob-cell density(%)_Data=100',
         { left: 340, top: 250 },
       );
     });
 
     test('should select single cell on click with categorical data', async ({ page }) => {
       await common.expectChartWithClickAtUrlToMatchScreenshot(page)(
-        'http://localhost:9001/?path=/story/small-multiples-alpha--heatmap&globals=background:white;theme:eui-light&knob-Enable debug state=true&knob-Grid stroke_SmallMultiples Styles=1&knob-Hide_left=true&knob-Hide_right=true&knob-Hide_top=true&knob-Horizontal inner pad=0.1&knob-Horizontal inner pad_SmallMultiples Styles=0.05&knob-Horizontal outer pad=0&knob-Horizontal outer pad_SmallMultiples Styles=0&knob-Persist cells selection=true&knob-Show axes panel titles_SmallMultiples Styles=true&knob-Show axes title_SmallMultiples Styles=true&knob-Show axis panel titles=true&knob-Show axis panel titles_SmallMultiples Styles=true&knob-Show grid line_bottom=true&knob-Show grid line_left=true&knob-Show x axis title_SmallMultiples Styles=true&knob-Show y axis title_SmallMultiples Styles=true&knob-Time data=false&knob-Title_bottom=Hosts - Bottom&knob-Title_left=Metrics - Left&knob-Title_right=Metrics - Right&knob-Title_top=Hosts - Top&knob-Vertical inner pad=0.3&knob-Vertical inner pad_SmallMultiples Styles=0.1&knob-Vertical outer pad=0&knob-Vertical outer pad_SmallMultiples Styles=0&knob-categories_Data=4&knob-group count_Data=9&knob-h - split count_Data=2&knob-h - split_Data=true&knob-number of groups_Data=4&knob-v - split count_Data=2&knob-v - split_Data=true&knob-xScaleType_Data=linear&knob-Debug=&knob-Show Legend=&knob-cell density(%)_Data=100',
+        'http://localhost:9001/?path=/story/small-multiples-alpha--heatmap&globals=theme:light&knob-Enable debug state=true&knob-Grid stroke_SmallMultiples Styles=1&knob-Hide_left=true&knob-Hide_right=true&knob-Hide_top=true&knob-Horizontal inner pad=0.1&knob-Horizontal inner pad_SmallMultiples Styles=0.05&knob-Horizontal outer pad=0&knob-Horizontal outer pad_SmallMultiples Styles=0&knob-Persist cells selection=true&knob-Show axes panel titles_SmallMultiples Styles=true&knob-Show axes title_SmallMultiples Styles=true&knob-Show axis panel titles=true&knob-Show axis panel titles_SmallMultiples Styles=true&knob-Show grid line_bottom=true&knob-Show grid line_left=true&knob-Show x axis title_SmallMultiples Styles=true&knob-Show y axis title_SmallMultiples Styles=true&knob-Time data=false&knob-Title_bottom=Hosts - Bottom&knob-Title_left=Metrics - Left&knob-Title_right=Metrics - Right&knob-Title_top=Hosts - Top&knob-Vertical inner pad=0.3&knob-Vertical inner pad_SmallMultiples Styles=0.1&knob-Vertical outer pad=0&knob-Vertical outer pad_SmallMultiples Styles=0&knob-categories_Data=4&knob-group count_Data=9&knob-h - split count_Data=2&knob-h - split_Data=true&knob-number of groups_Data=4&knob-v - split count_Data=2&knob-v - split_Data=true&knob-xScaleType_Data=linear&knob-Debug=&knob-Show Legend=&knob-cell density(%)_Data=100',
         { left: 340, top: 250 },
       );
     });
diff --git a/e2e/tests/interactions.test.ts b/e2e/tests/interactions.test.ts
index fdfc09fee6..90a930339d 100644
--- a/e2e/tests/interactions.test.ts
+++ b/e2e/tests/interactions.test.ts
@@ -10,7 +10,7 @@ import { test } from '@playwright/test';
 import { camelCase } from 'change-case';
 
 import { Placement } from '../constants';
-import { eachRotation, pwEach } from '../helpers';
+import { eachRotation, eachTheme, pwEach } from '../helpers';
 import { common } from '../page_objects';
 
 test.describe('Interactions', () => {
@@ -400,24 +400,24 @@ test.describe('Interactions', () => {
   });
 
   test.describe('mouse cursor', () => {
-    pwEach.test<string>(['eui-light', 'eui-dark'])(
-      (t) => `should show cursor when background is set with ${t} theme`,
-      async (page, theme) => {
+    eachTheme.test(
+      async ({ page, urlParam }) => {
         await common.expectChartWithMouseAtUrlToMatchScreenshot(page)(
-          `http://localhost:9001/?path=/story/mixed-charts--lines-and-areas&globals=theme:${theme}&knob-Fit%20domain_Y%20-%20Axis=true&knob-Log%20base_Y%20-%20Axis=natural&knob-Use%20default%20limit_Y%20-%20Axis=true&knob-Use%20negative%20values_Y%20-%20Axis=false`,
+          `http://localhost:9001/?path=/story/mixed-charts--lines-and-areas&${urlParam}&knob-Fit%20domain_Y%20-%20Axis=true&knob-Log%20base_Y%20-%20Axis=natural&knob-Use%20default%20limit_Y%20-%20Axis=true&knob-Use%20negative%20values_Y%20-%20Axis=false`,
           { top: 150, left: 250 },
         );
       },
+      (t) => `should show cursor when background is set with ${t} theme`,
     );
 
-    pwEach.test<string>(['eui-light', 'eui-dark'])(
-      (t) => `should show cursor band when background is set with ${t} theme`,
-      async (page, theme) => {
+    eachTheme.test(
+      async ({ page, urlParam }) => {
         await common.expectChartWithMouseAtUrlToMatchScreenshot(page)(
-          `http://localhost:9001/?path=/story/mixed-charts--bars-and-lines&globals=theme:${theme}&knob-Fit%20domain_Y%20-%20Axis=true&knob-Log%20base_Y%20-%20Axis=natural&knob-Use%20default%20limit_Y%20-%20Axis=true&knob-Use%20negative%20values_Y%20-%20Axis=false`,
+          `http://localhost:9001/?path=/story/mixed-charts--bars-and-lines&${urlParam}&knob-Fit%20domain_Y%20-%20Axis=true&knob-Log%20base_Y%20-%20Axis=natural&knob-Use%20default%20limit_Y%20-%20Axis=true&knob-Use%20negative%20values_Y%20-%20Axis=false`,
           { top: 150, left: 150 },
         );
       },
+      (t) => `should show cursor band when background is set with ${t} theme`,
     );
   });
   // currently wrong due to https://github.com/elastic/elastic-charts/issues/1921
@@ -435,7 +435,7 @@ test.describe('Interactions', () => {
       top: 200,
     };
     await common.expectChartAtUrlToMatchScreenshot(page)(
-      'http://localhost:9001/?path=/story/interactions--brush-tool&globals=theme:eui-light&knob-Debug=true&knob-Enable debug state=true&knob-Grid stroke_SmallMultiples Styles=1&knob-Hide_left=true&knob-Hide_right=true&knob-Hide_top=true&knob-Horizontal inner pad=0.1&knob-Horizontal inner pad_SmallMultiples Styles=0.05&knob-Horizontal outer pad=0&knob-Horizontal outer pad_SmallMultiples Styles=0&knob-Persist cells selection=true&knob-Show Legend=true&knob-Show axes panel titles_SmallMultiples Styles=true&knob-Show axes title_SmallMultiples Styles=true&knob-Show axis panel titles=true&knob-Show axis panel titles_SmallMultiples Styles=true&knob-Show grid line_bottom=true&knob-Show grid line_left=true&knob-Show x axis title_SmallMultiples Styles=true&knob-Show y axis title_SmallMultiples Styles=true&knob-Time data=true&knob-Title_bottom=Hosts - Bottom&knob-Title_left=Metrics - Left&knob-Title_right=Metrics - Right&knob-Title_top=Hosts - Top&knob-Use custom tooltip=true&knob-Vertical inner pad=0.3&knob-Vertical inner pad_SmallMultiples Styles=0.1&knob-Vertical outer pad=0&knob-Vertical outer pad_SmallMultiples Styles=0&knob-categories_Data=4&knob-cell%20density(%)_Data=75,75,75,75,20,20,60,20,20,50,20,5,25,20,25,50,50,50,50,25,20,20,20,20,75&knob-dataset=7&knob-density(%)_Data=100&knob-density_Data=2&knob-group count_Data=9&knob-h - split count_Data=2&knob-h - split_Data=true&knob-number of groups_Data=4&knob-v - split count_Data=2&knob-v - split_Data=true&knob-xScaleType_Data=linear&knob-brush axis=both&knob-chartRotation=0',
+      'http://localhost:9001/?path=/story/interactions--brush-tool&globals=theme:light&knob-Debug=true&knob-Enable debug state=true&knob-Grid stroke_SmallMultiples Styles=1&knob-Hide_left=true&knob-Hide_right=true&knob-Hide_top=true&knob-Horizontal inner pad=0.1&knob-Horizontal inner pad_SmallMultiples Styles=0.05&knob-Horizontal outer pad=0&knob-Horizontal outer pad_SmallMultiples Styles=0&knob-Persist cells selection=true&knob-Show Legend=true&knob-Show axes panel titles_SmallMultiples Styles=true&knob-Show axes title_SmallMultiples Styles=true&knob-Show axis panel titles=true&knob-Show axis panel titles_SmallMultiples Styles=true&knob-Show grid line_bottom=true&knob-Show grid line_left=true&knob-Show x axis title_SmallMultiples Styles=true&knob-Show y axis title_SmallMultiples Styles=true&knob-Time data=true&knob-Title_bottom=Hosts - Bottom&knob-Title_left=Metrics - Left&knob-Title_right=Metrics - Right&knob-Title_top=Hosts - Top&knob-Use custom tooltip=true&knob-Vertical inner pad=0.3&knob-Vertical inner pad_SmallMultiples Styles=0.1&knob-Vertical outer pad=0&knob-Vertical outer pad_SmallMultiples Styles=0&knob-categories_Data=4&knob-cell%20density(%)_Data=75,75,75,75,20,20,60,20,20,50,20,5,25,20,25,50,50,50,50,25,20,20,20,20,75&knob-dataset=7&knob-density(%)_Data=100&knob-density_Data=2&knob-group count_Data=9&knob-h - split count_Data=2&knob-h - split_Data=true&knob-number of groups_Data=4&knob-v - split count_Data=2&knob-v - split_Data=true&knob-xScaleType_Data=linear&knob-brush axis=both&knob-chartRotation=0',
       {
         action: async () => {
           await common.dragMouseRelativeToDOMElement(page)(
diff --git a/e2e/tests/legend_stories.test.ts b/e2e/tests/legend_stories.test.ts
index e0cebc926d..f13707778d 100644
--- a/e2e/tests/legend_stories.test.ts
+++ b/e2e/tests/legend_stories.test.ts
@@ -41,7 +41,7 @@ test.describe('Legend stories', () => {
 
   test('should correctly render multiline nested legend labels', async ({ page }) => {
     await common.expectChartAtUrlToMatchScreenshot(page)(
-      'http://localhost:9001/?path=/story/legend--piechart&globals=background:white;theme:eui-light&knob-Hide color picker=true&knob-Hide color picker_Legend=true&knob-Legend position=right&knob-Legend position_Legend=right&knob-max legend label lines=0&knob-Number of series=5&knob-Popover position=leftCenter&knob-Popover position_Legend=leftCenter&knob-Series with long name=3&knob-direction_Legend=vertical&knob-floating columns_Legend=2&knob-hAlign_Legend=right&knob-legend buffer value=80&knob-legend margins=20&knob-long label text_Legend=Non do aliqua veniam dolore ipsum eu aliquip. Culpa in duis amet non velit qui non ullamco sit adipisicing. Ut sunt Lorem mollit exercitation deserunt officia sunt ipsum eu amet.&knob-multiline Legend labels=true&knob-vAlign_Legend=bottom&knob-Partition Layout=sunburst&knob-flatLegend=&knob-showLegendExtra=&knob-legendMaxDepth=2&knob-legendStrategy=key',
+      'http://localhost:9001/?path=/story/legend--piechart&globals=theme:light&knob-Hide color picker=true&knob-Hide color picker_Legend=true&knob-Legend position=right&knob-Legend position_Legend=right&knob-max legend label lines=0&knob-Number of series=5&knob-Popover position=leftCenter&knob-Popover position_Legend=leftCenter&knob-Series with long name=3&knob-direction_Legend=vertical&knob-floating columns_Legend=2&knob-hAlign_Legend=right&knob-legend buffer value=80&knob-legend margins=20&knob-long label text_Legend=Non do aliqua veniam dolore ipsum eu aliquip. Culpa in duis amet non velit qui non ullamco sit adipisicing. Ut sunt Lorem mollit exercitation deserunt officia sunt ipsum eu amet.&knob-multiline Legend labels=true&knob-vAlign_Legend=bottom&knob-Partition Layout=sunburst&knob-flatLegend=&knob-showLegendExtra=&knob-legendMaxDepth=2&knob-legendStrategy=key',
     );
   });
 
@@ -59,14 +59,14 @@ test.describe('Legend stories', () => {
 
   test('should break multiline legends with long url characters', async ({ page }) => {
     await common.expectChartWithMouseAtUrlToMatchScreenshot(page)(
-      'http://localhost:9001/?path=/story/legend--inside-chart&globals=theme:eui-light&knob-Number of series=5&knob-Series with long name=3&knob-Inside chart_Legend=false&knob-Show legend action_Legend=true&knob-floating columns_Legend=1&knob-vAlign_Legend=bottom&knob-hAlign_Legend=right&knob-direction_Legend=vertical&knob-max label lines_Legend=0&knob-long label_Legend=/people/type:astronauts/name:gregory-chamitoff/profile',
+      'http://localhost:9001/?path=/story/legend--inside-chart&globals=theme:light&knob-Number of series=5&knob-Series with long name=3&knob-Inside chart_Legend=false&knob-Show legend action_Legend=true&knob-floating columns_Legend=1&knob-vAlign_Legend=bottom&knob-hAlign_Legend=right&knob-direction_Legend=vertical&knob-max label lines_Legend=0&knob-long label_Legend=/people/type:astronauts/name:gregory-chamitoff/profile',
       { left: 182, top: 178 },
     );
   });
 
   test('should render long floating legends inside chart', async ({ page }) => {
     await common.expectChartAtUrlToMatchScreenshot(page)(
-      'http://localhost:9001/?path=/story/legend--inside-chart&globals=theme:eui-light&knob-Number of series=40&knob-Series with long name=0&knob-Inside chart_Legend=true&knob-floating columns_Legend=1&knob-vAlign_Legend=bottom&knob-hAlign_Legend=right&knob-direction_Legend=vertical&knob-max label lines_Legend=1&knob-long label_Legend=long name',
+      'http://localhost:9001/?path=/story/legend--inside-chart&globals=theme:light&knob-Number of series=40&knob-Series with long name=0&knob-Inside chart_Legend=true&knob-floating columns_Legend=1&knob-vAlign_Legend=bottom&knob-hAlign_Legend=right&knob-direction_Legend=vertical&knob-max label lines_Legend=1&knob-long label_Legend=long name',
     );
   });
 
@@ -222,7 +222,7 @@ test.describe('Legend stories', () => {
     ])(
       ([p1, p2]) => `should correctly display ${p1} ${p2}`,
       async (page, [p1, p2]) => {
-        await common.expectChartAtUrlToMatchScreenshot(page)(getPositionalUrl(p1, p2, '&globals=theme:eui-light'));
+        await common.expectChartAtUrlToMatchScreenshot(page)(getPositionalUrl(p1, p2, '&globals=theme:light'));
       },
     );
 
@@ -234,7 +234,7 @@ test.describe('Legend stories', () => {
     ])(
       ([p1, p2]) => `should correctly display ${p1} ${p2} in dark mode`,
       async (page, [p1, p2]) => {
-        await common.expectChartAtUrlToMatchScreenshot(page)(getPositionalUrl(p1, p2, '&globals=theme:eui-dark'));
+        await common.expectChartAtUrlToMatchScreenshot(page)(getPositionalUrl(p1, p2, '&globals=theme:dark'));
       },
     );
 
diff --git a/e2e/tests/metric_stories.test.ts b/e2e/tests/metric_stories.test.ts
index 2e095c4c0a..613207799b 100644
--- a/e2e/tests/metric_stories.test.ts
+++ b/e2e/tests/metric_stories.test.ts
@@ -14,37 +14,37 @@ import { common } from '../page_objects';
 test.describe('Metric', () => {
   test('should render horizontal progress bar', async ({ page }) => {
     await common.expectChartAtUrlToMatchScreenshot(page)(
-      'http://localhost:9001/?path=/story/metric-alpha--grid&globals=theme:eui-light&knob-use progress bar=true&knob-progress bar direction=horizontal&knob-max trend data points=30&knob-layout=grid',
+      'http://localhost:9001/?path=/story/metric-alpha--grid&globals=theme:light&knob-use progress bar=true&knob-progress bar direction=horizontal&knob-max trend data points=30&knob-layout=grid',
     );
   });
   test('should render no progress bar', async ({ page }) => {
     await common.expectChartAtUrlToMatchScreenshot(page)(
-      'http://localhost:9001/?path=/story/metric-alpha--grid&globals=theme:eui-light&knob-use progress bar=&knob-progress bar direction=horizontal&knob-max trend data points=30&knob-layout=grid',
+      'http://localhost:9001/?path=/story/metric-alpha--grid&globals=theme:light&knob-use progress bar=&knob-progress bar direction=horizontal&knob-max trend data points=30&knob-layout=grid',
     );
   });
   test('should render vertical progress bar in dark mode', async ({ page }) => {
     await common.expectChartAtUrlToMatchScreenshot(page)(
-      'http://localhost:9001/?path=/story/metric-alpha--grid&globals=theme:eui-dark&knob-layout=grid&knob-max trend data points=30&knob-progress bar direction=vertical&knob-use progress bar=true',
+      'http://localhost:9001/?path=/story/metric-alpha--grid&globals=theme:dark&knob-layout=grid&knob-max trend data points=30&knob-progress bar direction=vertical&knob-use progress bar=true',
     );
   });
   test('should render horizontal progress bar in dark mode', async ({ page }) => {
     await common.expectChartAtUrlToMatchScreenshot(page)(
-      'http://localhost:9001/?path=/story/metric-alpha--grid&globals=theme:eui-dark&knob-layout=grid&knob-max trend data points=30&knob-progress bar direction=horizontal&knob-use progress bar=true',
+      'http://localhost:9001/?path=/story/metric-alpha--grid&globals=theme:dark&knob-layout=grid&knob-max trend data points=30&knob-progress bar direction=horizontal&knob-use progress bar=true',
     );
   });
   test('should render no progress bar in dark mode', async ({ page }) => {
     await common.expectChartAtUrlToMatchScreenshot(page)(
-      'http://localhost:9001/?path=/story/metric-alpha--grid&globals=theme:eui-dark&knob-layout=grid&knob-max trend data points=30&knob-progress bar direction=horizontal&knob-use progress bar=',
+      'http://localhost:9001/?path=/story/metric-alpha--grid&globals=theme:dark&knob-layout=grid&knob-max trend data points=30&knob-progress bar direction=horizontal&knob-use progress bar=',
     );
   });
   test('text value with trend', async ({ page }) => {
     await common.expectChartAtUrlToMatchScreenshot(page)(
-      'http://localhost:9001/?path=/story/metric-alpha--basic&globals=theme:eui-light&knob-EUI icon glyph name=warning&knob-color=rgba(166, 219, 208, 1)&knob-extra=1310 (-74% week before)&knob-is numeric metric=false&knob-progress bar direction=vertical&knob-progress max=100&knob-progress or trend=trend&knob-subtitle=&knob-title=Most used in&knob-trend a11y description=The trend shows a peak of CPU usage in the last 5 minutes&knob-trend a11y title=The Cluster CPU Usage trend&knob-trend data points=30&knob-trend shape=area&knob-value=United States&knob-value postfix=&knob-value prefix=&knob-show icon=',
+      'http://localhost:9001/?path=/story/metric-alpha--basic&globals=theme:light&knob-EUI icon glyph name=warning&knob-color=rgba(166, 219, 208, 1)&knob-extra=1310 (-74% week before)&knob-is numeric metric=false&knob-progress bar direction=vertical&knob-progress max=100&knob-progress or trend=trend&knob-subtitle=&knob-title=Most used in&knob-trend a11y description=The trend shows a peak of CPU usage in the last 5 minutes&knob-trend a11y title=The Cluster CPU Usage trend&knob-trend data points=30&knob-trend shape=area&knob-value=United States&knob-value postfix=&knob-value prefix=&knob-show icon=',
     );
   });
   test('value icon and value color', async ({ page }) => {
     await common.expectChartAtUrlToMatchScreenshot(page)(
-      'http://localhost:9001/?path=/story/metric-alpha--basic&globals=theme:eui-light&knob-title=Network out&knob-subtitle=host: 1dc4e&knob-progress or trend=trend&knob-progress bar direction=vertical&knob-trend data points=30&knob-trend shape=area&knob-trend a11y title=The Cluster CPU Usage trend&knob-trend a11y description=The trend shows a peak of CPU usage in the last 5 minutes&knob-extra=last <b>5m</b>&knob-progress max=100&knob-is numeric metric=true&knob-value=55.23&knob-value prefix=&knob-value postfix=GB&knob-color=rgba(255, 255, 255, 1)&knob-use value color=true&knob-value color=rgba(189, 0, 0, 1)&knob-show icon=true&knob-EUI icon glyph name=warning&knob-show value icon=true&knob-EUI value icon glyph name=sortUp',
+      'http://localhost:9001/?path=/story/metric-alpha--basic&globals=theme:light&knob-title=Network out&knob-subtitle=host: 1dc4e&knob-progress or trend=trend&knob-progress bar direction=vertical&knob-trend data points=30&knob-trend shape=area&knob-trend a11y title=The Cluster CPU Usage trend&knob-trend a11y description=The trend shows a peak of CPU usage in the last 5 minutes&knob-extra=last <b>5m</b>&knob-progress max=100&knob-is numeric metric=true&knob-value=55.23&knob-value prefix=&knob-value postfix=GB&knob-color=rgba(255, 255, 255, 1)&knob-use value color=true&knob-value color=rgba(189, 0, 0, 1)&knob-show icon=true&knob-EUI icon glyph name=warning&knob-show value icon=true&knob-EUI value icon glyph name=sortUp',
     );
   });
 
diff --git a/e2e/tests/mixed_stories.test.ts b/e2e/tests/mixed_stories.test.ts
index 2101158532..861621a942 100644
--- a/e2e/tests/mixed_stories.test.ts
+++ b/e2e/tests/mixed_stories.test.ts
@@ -210,7 +210,7 @@ test.describe('Mixed series stories', () => {
             (type) => {
               test('should display correct stacking', async ({ page }) => {
                 await common.expectChartAtUrlToMatchScreenshot(page)(
-                  `http://localhost:9001/?path=/story/mixed-charts--polarized-stacked&globals=theme:eui-light&knob-stacked=true&knob-data polarity=${polarity}&knob-custom domain=false&knob-stackMode=${mode}&knob-SeriesType=${type}`,
+                  `http://localhost:9001/?path=/story/mixed-charts--polarized-stacked&globals=theme:light&knob-stacked=true&knob-data polarity=${polarity}&knob-custom domain=false&knob-stackMode=${mode}&knob-SeriesType=${type}`,
                 );
               });
 
@@ -219,7 +219,7 @@ test.describe('Mixed series stories', () => {
                   await page.click('.echLegendItem:nth-child(2) .echLegendItem__label');
                 };
                 await common.expectChartWithMouseAtUrlToMatchScreenshot(page)(
-                  `http://localhost:9001/?path=/story/mixed-charts--polarized-stacked&globals=theme:eui-light&knob-stacked=true&knob-data polarity=${polarity}&knob-custom domain=false&knob-stackMode=${mode}&knob-SeriesType=${type}`,
+                  `http://localhost:9001/?path=/story/mixed-charts--polarized-stacked&globals=theme:light&knob-stacked=true&knob-data polarity=${polarity}&knob-custom domain=false&knob-stackMode=${mode}&knob-SeriesType=${type}`,
                   { top: 170, left: 490 },
                   { action },
                 );
diff --git a/e2e/tests/partition_stories.test.ts b/e2e/tests/partition_stories.test.ts
index 92431e6749..864c80bd66 100644
--- a/e2e/tests/partition_stories.test.ts
+++ b/e2e/tests/partition_stories.test.ts
@@ -15,12 +15,12 @@ import { common } from '../page_objects';
 test.describe('Axis stories', () => {
   test('should sort the first layer too', async ({ page }) => {
     await common.expectChartAtUrlToMatchScreenshot(page)(
-      'http://localhost:9001/?path=/story/mosaic-alpha--other-slices&globals=background:white;theme:eui-light&knob-"Other" on bottom even if not the smallest=true&knob-Alphabetical outer group sorting=true',
+      'http://localhost:9001/?path=/story/mosaic-alpha--other-slices&globals=theme:light&knob-"Other" on bottom even if not the smallest=true&knob-Alphabetical outer group sorting=true',
     );
   });
   test('should sort just the first layer', async ({ page }) => {
     await common.expectChartAtUrlToMatchScreenshot(page)(
-      'http://localhost:9001/?path=/story/mosaic-alpha--other-slices&globals=background:white;theme:eui-light&knob-"Other" on bottom even if not the smallest=false&knob-Alphabetical outer group sorting=true',
+      'http://localhost:9001/?path=/story/mosaic-alpha--other-slices&globals=theme:light&knob-"Other" on bottom even if not the smallest=false&knob-Alphabetical outer group sorting=true',
     );
   });
 
diff --git a/e2e/tests/scales_stories.test.ts b/e2e/tests/scales_stories.test.ts
index 11cd188b27..9a7c55e23f 100644
--- a/e2e/tests/scales_stories.test.ts
+++ b/e2e/tests/scales_stories.test.ts
@@ -48,7 +48,7 @@ test.describe('Scales stories', () => {
   );
   test('should render linear binary with nicing', async ({ page }) => {
     await common.expectChartAtUrlToMatchScreenshot(page)(
-      `http://localhost:9001/?path=/story/scales--linear-binary&globals=theme:eui-light&knob-Data type=Base 2&knob-yScaleType=linear_binary&knob-Nice y ticks=true`,
+      `http://localhost:9001/?path=/story/scales--linear-binary&globals=theme:light&knob-Data type=Base 2&knob-yScaleType=linear_binary&knob-Nice y ticks=true`,
     );
   });
 });
diff --git a/e2e/tests/stylings_stories.test.ts b/e2e/tests/stylings_stories.test.ts
index 271900a243..c66325e7ae 100644
--- a/e2e/tests/stylings_stories.test.ts
+++ b/e2e/tests/stylings_stories.test.ts
@@ -44,28 +44,28 @@ test.describe('Stylings stories', () => {
   test.describe('Fit function styling', () => {
     test('can style the line', async ({ page }) => {
       await common.expectChartAtUrlToMatchScreenshot(page)(
-        'http://localhost:9001/?path=/story/mixed-charts--fitting-functions-non-stacked-series&globals=theme:eui-light&knob-Curve=0&knob-End value=none&knob-Explicit value (using Fit.Explicit)=5&knob-dataset=all&knob-fit area color_fit style=rgba(0,0,0,1)&knob-fit area opacity_fit style=0.15&knob-fit line color_fit style=rgba(5, 5, 5, 1)&knob-fit line dash array_fit style=5,10,1,10&knob-fit line opacity_fit style=0.4&knob-fitting function=average&knob-seriesType=line&knob-use series color for area_fit style=true&knob-use series color for line_fit style=&knob-use texture on area_fit style=',
+        'http://localhost:9001/?path=/story/mixed-charts--fitting-functions-non-stacked-series&globals=theme:light&knob-Curve=0&knob-End value=none&knob-Explicit value (using Fit.Explicit)=5&knob-dataset=all&knob-fit area color_fit style=rgba(0,0,0,1)&knob-fit area opacity_fit style=0.15&knob-fit line color_fit style=rgba(5, 5, 5, 1)&knob-fit line dash array_fit style=5,10,1,10&knob-fit line opacity_fit style=0.4&knob-fitting function=average&knob-seriesType=line&knob-use series color for area_fit style=true&knob-use series color for line_fit style=&knob-use texture on area_fit style=',
       );
     });
     test('can style the area', async ({ page }) => {
       await common.expectChartAtUrlToMatchScreenshot(page)(
-        'http://localhost:9001/?path=/story/mixed-charts--fitting-functions-non-stacked-series&globals=theme:eui-light&knob-Curve=0&knob-End value=none&knob-Explicit value (using Fit.Explicit)=5&knob-dataset=all&knob-fit area color_fit style=rgba(0,0,0,1)&knob-fit area opacity_fit style=0.08&knob-fit line color_fit style=rgba(5, 5, 5, 1)&knob-fit line dash array_fit style=5,10,1,10&knob-fit line opacity_fit style=0&knob-fitting function=average&knob-seriesType=area&knob-use series color for area_fit style=&knob-use series color for line_fit style=&knob-use texture on area_fit style=true',
+        'http://localhost:9001/?path=/story/mixed-charts--fitting-functions-non-stacked-series&globals=theme:light&knob-Curve=0&knob-End value=none&knob-Explicit value (using Fit.Explicit)=5&knob-dataset=all&knob-fit area color_fit style=rgba(0,0,0,1)&knob-fit area opacity_fit style=0.08&knob-fit line color_fit style=rgba(5, 5, 5, 1)&knob-fit line dash array_fit style=5,10,1,10&knob-fit line opacity_fit style=0&knob-fitting function=average&knob-seriesType=area&knob-use series color for area_fit style=&knob-use series color for line_fit style=&knob-use texture on area_fit style=true',
       );
     });
 
     test('should render interpolated line as non-interpolated lines', async ({ page }) => {
       await common.expectChartAtUrlToMatchScreenshot(page)(
-        'http://localhost:9001/?path=/story/mixed-charts--fitting-functions-non-stacked-series&globals=theme:eui-light&knob-Curve=0&knob-End value=nearest&knob-Explicit value (using Fit.Explicit)=5&knob-dataset=all&knob-fit area color_fit style=rgba(0,0,0,1)&knob-fit area opacity_fit style=0.3&knob-fit line color_fit style=rgba(5, 5, 5, 1)&knob-fit line dash array_fit style=&knob-fit line opacity_fit style=1&knob-fitting function=linear&knob-seriesType=line&knob-use series color for area_fit style=true&knob-use series color for line_fit style=true&knob-use texture on area_fit style=',
+        'http://localhost:9001/?path=/story/mixed-charts--fitting-functions-non-stacked-series&globals=theme:light&knob-Curve=0&knob-End value=nearest&knob-Explicit value (using Fit.Explicit)=5&knob-dataset=all&knob-fit area color_fit style=rgba(0,0,0,1)&knob-fit area opacity_fit style=0.3&knob-fit line color_fit style=rgba(5, 5, 5, 1)&knob-fit line dash array_fit style=&knob-fit line opacity_fit style=1&knob-fitting function=linear&knob-seriesType=line&knob-use series color for area_fit style=true&knob-use series color for line_fit style=true&knob-use texture on area_fit style=',
       );
     });
     test('should render interpolated area as non-interpolated areas', async ({ page }) => {
       await common.expectChartAtUrlToMatchScreenshot(page)(
-        'http://localhost:9001/?path=/story/mixed-charts--fitting-functions-non-stacked-series&globals=theme:eui-light&knob-Curve=0&knob-End value=nearest&knob-Explicit value (using Fit.Explicit)=5&knob-dataset=all&knob-fit area color_fit style=rgba(0,0,0,1)&knob-fit area opacity_fit style=0.3&knob-fit line color_fit style=rgba(5, 5, 5, 1)&knob-fit line dash array_fit style=&knob-fit line opacity_fit style=1&knob-fitting function=linear&knob-seriesType=area&knob-use series color for area_fit style=true&knob-use series color for line_fit style=true&knob-use texture on area_fit style=',
+        'http://localhost:9001/?path=/story/mixed-charts--fitting-functions-non-stacked-series&globals=theme:light&knob-Curve=0&knob-End value=nearest&knob-Explicit value (using Fit.Explicit)=5&knob-dataset=all&knob-fit area color_fit style=rgba(0,0,0,1)&knob-fit area opacity_fit style=0.3&knob-fit line color_fit style=rgba(5, 5, 5, 1)&knob-fit line dash array_fit style=&knob-fit line opacity_fit style=1&knob-fitting function=linear&knob-seriesType=area&knob-use series color for area_fit style=true&knob-use series color for line_fit style=true&knob-use texture on area_fit style=',
       );
     });
     test('should render style on stacked areas', async ({ page }) => {
       await common.expectChartAtUrlToMatchScreenshot(page)(
-        'http://localhost:9001/?path=/story/mixed-charts--fitting-functions-stacked-series&globals=theme:eui-light&knob-stackMode=none&knob-dataset=all&knob-fitting function=linear&knob-Curve=0&knob-End value=none&knob-Explicit value (using Fit.Explicit)=5&knob-apply custom fit style=true',
+        'http://localhost:9001/?path=/story/mixed-charts--fitting-functions-stacked-series&globals=theme:light&knob-stackMode=none&knob-dataset=all&knob-fitting function=linear&knob-Curve=0&knob-End value=none&knob-Explicit value (using Fit.Explicit)=5&knob-apply custom fit style=true',
       );
     });
 
@@ -74,7 +74,7 @@ test.describe('Stylings stories', () => {
         await common.moveMouseRelativeToDOMElement(page)({ left: 0, top: 0 }, '.echLegendItem');
       };
       await common.expectChartAtUrlToMatchScreenshot(page)(
-        'http://localhost:9001/?path=/story/mixed-charts--fitting-functions-stacked-series&globals=theme:eui-light&knob-stackMode=none&knob-dataset=all&knob-fitting function=linear&knob-Curve=0&knob-End value=none&knob-Explicit value (using Fit.Explicit)=5&knob-apply custom fit style=true',
+        'http://localhost:9001/?path=/story/mixed-charts--fitting-functions-stacked-series&globals=theme:light&knob-stackMode=none&knob-dataset=all&knob-fitting function=linear&knob-Curve=0&knob-End value=none&knob-Explicit value (using Fit.Explicit)=5&knob-apply custom fit style=true',
         {
           action,
           waitSelector: common.chartWaitSelector,
diff --git a/e2e/tests/test_cases_stories.test.ts b/e2e/tests/test_cases_stories.test.ts
index 270c0eaf58..f4228ae200 100644
--- a/e2e/tests/test_cases_stories.test.ts
+++ b/e2e/tests/test_cases_stories.test.ts
@@ -54,14 +54,14 @@ test.describe('Test cases stories', () => {
               (charSet) => {
                 test('should render with correct direction', async ({ page }) => {
                   await common.expectChartAtUrlToMatchScreenshot(page)(
-                    `http://localhost:9001/?path=/story/test-cases--rtl-text&globals=background:white;theme:eui-light&knob-Chart type=${type}&knob-character set=${charSet}&knob-show legend=true&knob-clockwiseSectors=true&knob-rtl language=${lang}`,
+                    `http://localhost:9001/?path=/story/test-cases--rtl-text&globals=theme:light&knob-Chart type=${type}&knob-character set=${charSet}&knob-show legend=true&knob-clockwiseSectors=true&knob-rtl language=${lang}`,
                   );
                 });
 
                 if (type === PartitionLayout.sunburst) {
                   test('should render with correct direction - clockwiseSectors', async ({ page }) => {
                     await common.expectChartAtUrlToMatchScreenshot(page)(
-                      `http://localhost:9001/?path=/story/test-cases--rtl-text&globals=background:white;theme:eui-light&knob-Chart type=${type}&knob-character set=${charSet}&knob-show legend=true&knob-clockwiseSectors=false&knob-rtl language=${lang}`,
+                      `http://localhost:9001/?path=/story/test-cases--rtl-text&globals=theme:light&knob-Chart type=${type}&knob-character set=${charSet}&knob-show legend=true&knob-clockwiseSectors=false&knob-rtl language=${lang}`,
                     );
                   });
                 }
diff --git a/e2e/tests/timezone.test.ts b/e2e/tests/timezone.test.ts
index 757c5d7857..dbf09f7ee5 100644
--- a/e2e/tests/timezone.test.ts
+++ b/e2e/tests/timezone.test.ts
@@ -13,13 +13,13 @@ import { common } from '../page_objects/common';
 test.describe('Time zone', () => {
   test('UTC plus 8', async ({ page }) => {
     await common.expectChartAtUrlToMatchScreenshot(page)(
-      'http://localhost:9001/?path=/story/scales--timezone-configuration&globals=theme:eui-light&knob-dataset=utc%2B8&knob-tooltip=utc',
+      'http://localhost:9001/?path=/story/scales--timezone-configuration&globals=theme:light&knob-dataset=utc%2B8&knob-tooltip=utc',
     );
   });
 
   test('UTC minus 8', async ({ page }) => {
     await common.expectChartAtUrlToMatchScreenshot(page)(
-      'http://localhost:9001/?path=/story/scales--timezone-configuration&globals=theme:eui-light&knob-dataset=utc-8&knob-tooltip=utc',
+      'http://localhost:9001/?path=/story/scales--timezone-configuration&globals=theme:light&knob-dataset=utc-8&knob-tooltip=utc',
     );
   });
 
diff --git a/e2e/tests/tooltip.test.ts b/e2e/tests/tooltip.test.ts
index 31df4408f4..9ad138d568 100644
--- a/e2e/tests/tooltip.test.ts
+++ b/e2e/tests/tooltip.test.ts
@@ -17,7 +17,7 @@ test.describe('Tooltip', () => {
     test.describe('Cartesian', () => {
       test('pinning without selection', async ({ page }) => {
         await common.expectChartWithClickAtUrlToMatchScreenshot(page)(
-          'http://localhost:9001/?path=/story/components-tooltip--cartesian-charts&globals=theme:eui-light&knob-Chart%20type=treemap&knob-SeriesType=bar&knob-async%20delay%20(ms)=1500&knob-character%20set=rtl&knob-data%20polarity=Mixed&knob-pinned=true&knob-rtl%20language=AR&knob-show%20legend=true&knob-stacked=true&knob-visible=true',
+          'http://localhost:9001/?path=/story/components-tooltip--cartesian-charts&globals=theme:light&knob-Chart%20type=treemap&knob-SeriesType=bar&knob-async%20delay%20(ms)=1500&knob-character%20set=rtl&knob-data%20polarity=Mixed&knob-pinned=true&knob-rtl%20language=AR&knob-show%20legend=true&knob-stacked=true&knob-visible=true',
           { left: 240, bottom: 260 },
           'right',
         );
@@ -25,7 +25,7 @@ test.describe('Tooltip', () => {
 
       test('pinning over selection', async ({ page }) => {
         await common.expectChartWithClickAtUrlToMatchScreenshot(page)(
-          'http://localhost:9001/?path=/story/components-tooltip--cartesian-charts&globals=theme:eui-light&knob-Chart type=treemap&knob-SeriesType=bar&knob-async delay=1000&knob-async delay (ms)=1500&knob-character set=rtl&knob-chart type=line&knob-data polarity=Mixed&knob-pinned=true&knob-rtl language=AR&knob-show legend=true&knob-stacked=true&knob-visible=true&knob-reduce data=true&knob-async actions delay=0',
+          'http://localhost:9001/?path=/story/components-tooltip--cartesian-charts&globals=theme:light&knob-Chart type=treemap&knob-SeriesType=bar&knob-async delay=1000&knob-async delay (ms)=1500&knob-character set=rtl&knob-chart type=line&knob-data polarity=Mixed&knob-pinned=true&knob-rtl language=AR&knob-show legend=true&knob-stacked=true&knob-visible=true&knob-reduce data=true&knob-async actions delay=0',
           { left: 220, bottom: 285 },
           'right',
         );
@@ -33,7 +33,7 @@ test.describe('Tooltip', () => {
 
       test('show loading prompt for async actions', async ({ page }) => {
         await common.expectChartWithClickAtUrlToMatchScreenshot(page)(
-          'http://localhost:9001/?path=/story/components-tooltip--cartesian-charts&globals=theme:eui-light&knob-Chart type=treemap&knob-SeriesType=bar&knob-async delay=1000&knob-async delay (ms)=1500&knob-character set=rtl&knob-chart type=line&knob-data polarity=Mixed&knob-pinned=true&knob-rtl language=AR&knob-show legend=true&knob-stacked=true&knob-visible=true&knob-reduce data=true&knob-async actions delay=1000',
+          'http://localhost:9001/?path=/story/components-tooltip--cartesian-charts&globals=theme:light&knob-Chart type=treemap&knob-SeriesType=bar&knob-async delay=1000&knob-async delay (ms)=1500&knob-character set=rtl&knob-chart type=line&knob-data polarity=Mixed&knob-pinned=true&knob-rtl language=AR&knob-show legend=true&knob-stacked=true&knob-visible=true&knob-reduce data=true&knob-async actions delay=1000',
           { left: 220, bottom: 285 },
           'right',
         );
@@ -41,7 +41,7 @@ test.describe('Tooltip', () => {
 
       test('selecting series on pinned tooltip', async ({ page }) => {
         await common.expectChartAtUrlToMatchScreenshot(page)(
-          'http://localhost:9001/?path=/story/components-tooltip--cartesian-charts&globals=theme:eui-light&knob-Chart type=treemap&knob-SeriesType=bar&knob-async delay=1000&knob-async delay (ms)=1500&knob-character set=rtl&knob-chart type=bar&knob-data polarity=Mixed&knob-pinned=true&knob-rtl language=AR&knob-show legend=true&knob-stacked=true&knob-visible=true&knob-reduce data=true&knob-async actions delay=0',
+          'http://localhost:9001/?path=/story/components-tooltip--cartesian-charts&globals=theme:light&knob-Chart type=treemap&knob-SeriesType=bar&knob-async delay=1000&knob-async delay (ms)=1500&knob-character set=rtl&knob-chart type=bar&knob-data polarity=Mixed&knob-pinned=true&knob-rtl language=AR&knob-show legend=true&knob-stacked=true&knob-visible=true&knob-reduce data=true&knob-async actions delay=0',
           {
             action: async () => {
               await common.clickMouseRelativeToDOMElement(page)({ left: 260, top: 180 }, common.chartSelector, 'right');
@@ -58,7 +58,7 @@ test.describe('Tooltip', () => {
       test('selecting series on pinned tooltip async', async ({ page }) => {
         const delay = 100;
         await common.expectChartAtUrlToMatchScreenshot(page)(
-          `http://localhost:9001/?path=/story/components-tooltip--cartesian-charts&globals=theme:eui-light&knob-Chart type=treemap&knob-SeriesType=bar&knob-async delay=1000&knob-async delay (ms)=1500&knob-character set=rtl&knob-chart type=bar&knob-data polarity=Mixed&knob-pinned=true&knob-rtl language=AR&knob-show legend=true&knob-stacked=true&knob-visible=true&knob-reduce data=true&knob-async actions delay=${delay}`,
+          `http://localhost:9001/?path=/story/components-tooltip--cartesian-charts&globals=theme:light&knob-Chart type=treemap&knob-SeriesType=bar&knob-async delay=1000&knob-async delay (ms)=1500&knob-character set=rtl&knob-chart type=bar&knob-data polarity=Mixed&knob-pinned=true&knob-rtl language=AR&knob-show legend=true&knob-stacked=true&knob-visible=true&knob-reduce data=true&knob-async actions delay=${delay}`,
           {
             action: async () => {
               await common.clickMouseRelativeToDOMElement(page)({ left: 260, top: 180 }, common.chartSelector, 'right');
@@ -75,7 +75,7 @@ test.describe('Tooltip', () => {
     test.describe('Partition', () => {
       test('pinning with selection', async ({ page }) => {
         await common.expectChartWithClickAtUrlToMatchScreenshot(page)(
-          'http://localhost:9001/?path=/story/components-tooltip--partition-charts&globals=background:white;theme:eui-light&knob-Chart%20type=treemap&knob-SeriesType=bar&knob-async%20delay%20(ms)=1500&knob-character%20set=rtl&knob-data%20polarity=Mixed&knob-pinned=true&knob-rtl%20language=AR&knob-show%20legend=true&knob-stacked=true&knob-visible=true',
+          'http://localhost:9001/?path=/story/components-tooltip--partition-charts&globals=theme:light&knob-Chart%20type=treemap&knob-SeriesType=bar&knob-async%20delay%20(ms)=1500&knob-character%20set=rtl&knob-data%20polarity=Mixed&knob-pinned=true&knob-rtl%20language=AR&knob-show%20legend=true&knob-stacked=true&knob-visible=true',
           { left: 245, bottom: 185 },
           'right',
         );
@@ -85,7 +85,7 @@ test.describe('Tooltip', () => {
     test.describe('Heatmap', () => {
       test('pinning with selection', async ({ page }) => {
         await common.expectChartWithClickAtUrlToMatchScreenshot(page)(
-          'http://localhost:9001/?path=/story/components-tooltip--heatmap-chart&globals=theme:eui-light&knob-Chart%20type=treemap&knob-SeriesType=bar&knob-async%20delay%20(ms)=1500&knob-character%20set=rtl&knob-data%20polarity=Mixed&knob-pinned=true&knob-rtl%20language=AR&knob-show%20legend=true&knob-stacked=true&knob-visible=true',
+          'http://localhost:9001/?path=/story/components-tooltip--heatmap-chart&globals=theme:light&knob-Chart%20type=treemap&knob-SeriesType=bar&knob-async%20delay%20(ms)=1500&knob-character%20set=rtl&knob-data%20polarity=Mixed&knob-pinned=true&knob-rtl%20language=AR&knob-show%20legend=true&knob-stacked=true&knob-visible=true',
           { left: 300, bottom: 180 },
           'right',
         );
@@ -95,20 +95,20 @@ test.describe('Tooltip', () => {
     test.describe('Flamegraph', () => {
       test('pinning with selection', async ({ page }) => {
         await common.expectChartWithClickAtUrlToMatchScreenshot(page)(
-          'http://localhost:9001/?path=/story/components-tooltip--flamegraph&globals=theme:eui-light&knob-Chart%20type=treemap&knob-SeriesType=bar&knob-async%20delay%20(ms)=1500&knob-character%20set=rtl&knob-data%20polarity=Mixed&knob-pinned=true&knob-rtl%20language=AR&knob-show%20legend=true&knob-stacked=true&knob-visible=true',
+          'http://localhost:9001/?path=/story/components-tooltip--flamegraph&globals=theme:light&knob-Chart%20type=treemap&knob-SeriesType=bar&knob-async%20delay%20(ms)=1500&knob-character%20set=rtl&knob-data%20polarity=Mixed&knob-pinned=true&knob-rtl%20language=AR&knob-show%20legend=true&knob-stacked=true&knob-visible=true',
           { left: 220, bottom: 220 },
           'right',
         );
       });
       test('show prompt with actions ', async ({ page }) => {
         await common.expectChartWithMouseAtUrlToMatchScreenshot(page)(
-          'http://localhost:9001/?path=/story/components-tooltip--flamegraph&globals=theme:eui-light&knob-Use%20tooltip%20actions=true',
+          'http://localhost:9001/?path=/story/components-tooltip--flamegraph&globals=theme:light&knob-Use%20tooltip%20actions=true',
           { left: 220, bottom: 220 },
         );
       });
       test('hide prompt with no actions ', async ({ page }) => {
         await common.expectChartWithMouseAtUrlToMatchScreenshot(page)(
-          'http://localhost:9001/?path=/story/components-tooltip--flamegraph&globals=theme:eui-light&knob-Use%20tooltip%20actions=false',
+          'http://localhost:9001/?path=/story/components-tooltip--flamegraph&globals=theme:light&knob-Use%20tooltip%20actions=false',
           { left: 220, bottom: 220 },
         );
       });
diff --git a/e2e/tests/waffle_stories.test.ts b/e2e/tests/waffle_stories.test.ts
index 1c11a85acd..e873ccc5ac 100644
--- a/e2e/tests/waffle_stories.test.ts
+++ b/e2e/tests/waffle_stories.test.ts
@@ -13,12 +13,12 @@ import { common } from '../page_objects/common';
 test.describe('Waffle', () => {
   test('should render cells in ascending order', async ({ page }) => {
     await common.expectChartAtUrlToMatchScreenshot(page)(
-      'http://localhost:9001/?path=/story/waffle-alpha--simple&globals=theme:eui-light&knob-show table for debugging=&knob-ascending sort=true',
+      'http://localhost:9001/?path=/story/waffle-alpha--simple&globals=theme:light&knob-show table for debugging=&knob-ascending sort=true',
     );
   });
   test('no stroke artifacts when using semi-transparent colors', async ({ page }) => {
     await common.expectChartAtUrlToMatchScreenshot(page)(
-      'http://localhost:9001/?path=/story/waffle-alpha--test&globals=toggles.showHeader:true;toggles.showChartTitle:false;toggles.showChartDescription:false;theme:eui-light&knob-use alpha=true',
+      'http://localhost:9001/?path=/story/waffle-alpha--test&globals=toggles.showHeader:true;toggles.showChartTitle:false;toggles.showChartDescription:false;theme:light&knob-use alpha=true',
     );
   });
 });
diff --git a/e2e_server/server/mocks/use_global_parameters.ts b/e2e_server/server/mocks/use_global_parameters.ts
index a215a49f19..ff856ba9b0 100644
--- a/e2e_server/server/mocks/use_global_parameters.ts
+++ b/e2e_server/server/mocks/use_global_parameters.ts
@@ -52,8 +52,8 @@ interface GlobalParameters {
 }
 
 export function useGlobalsParameters(): GlobalParameters {
-  const [themeId, setThemeId] = useState<string>(ThemeId.EUILight);
-  const [backgroundId, setBackgroundId] = useState<string | undefined>('white');
+  const [themeId, setThemeId] = useState<string>(ThemeId.Light);
+  const [backgroundId, setBackgroundId] = useState<string | undefined>();
   const [togglesJSON, setTogglesJSON] = useState<string>('{}');
 
   /**
@@ -63,7 +63,7 @@ export function useGlobalsParameters(): GlobalParameters {
     const globals = getGlobalParams(params);
     const backgroundIdFromParams = globals.background ?? parameters?.background?.default ?? backgroundParams.default;
     setBackgroundId(backgroundIdFromParams);
-    const themeIdFromParams = globals.theme ?? parameters?.theme?.default ?? themeParams.default ?? ThemeId.EUILight;
+    const themeIdFromParams = globals.theme ?? parameters?.theme?.default ?? themeParams.default ?? ThemeId.Light;
     setThemeId(themeIdFromParams);
     setTogglesJSON(JSON.stringify(globals.toggles ?? '{}'));
     applyThemeCSS(themeIdFromParams);
diff --git a/package.json b/package.json
index 14be93cfa9..5ed10d0707 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
     "test:e2e:generate": "yarn test:e2e:generate:examples && yarn test:e2e:generate:page",
     "test:e2e:generate:examples": "./e2e_server/scripts/extract_examples.sh",
     "test:e2e:generate:page": "./e2e_server/scripts/compile_vrt_page.sh",
-    "test:e2e:server": "sh ./e2e_server/scripts/start.sh",
+    "test:e2e:server": "export NODE_OPTIONS=--openssl-legacy-provider; sh ./e2e_server/scripts/start.sh",
     "test:e2e:server:build": "export NODE_OPTIONS=--openssl-legacy-provider; cd e2e_server/server && webpack build",
     "typecheck:base": "tsc -p ./tsconfig.base.json --noEmit",
     "typecheck:src": "lerna run --loglevel=silent --scope @elastic/charts typecheck --stream --no-prefix",
diff --git a/storybook/parameters.ts b/storybook/parameters.ts
index f37be1941c..c3f6fe9bcc 100644
--- a/storybook/parameters.ts
+++ b/storybook/parameters.ts
@@ -37,44 +37,34 @@ export const storybookParameters: Parameters = {
     },
   },
   theme: {
-    default: 'eui-light',
+    default: 'light',
     clearable: false,
     selector: 'html',
     themes: [
       {
-        id: 'eui-light',
+        id: 'light',
         title: 'Light - EUI',
         class: ['light-theme', 'eui'],
         color: euiLightVars.euiColorEmptyShade,
         imageUrl: euiLogoUrl,
       },
       {
-        id: 'eui-dark',
+        id: 'dark',
         title: 'Dark - EUI',
         class: ['dark-theme', 'eui'],
         color: euiDarkVars.euiColorEmptyShade,
         imageUrl: euiLogoUrl,
       },
-      {
-        id: 'light',
-        title: 'Light',
-        class: 'light-theme',
-        color: '#fff',
-      },
-      {
-        id: 'dark',
-        title: 'Dark',
-        class: 'dark-theme',
-        color: '#000',
-      },
     ],
   },
   background: {
     clearable: true,
     selector: '#none',
     options: [
-      { id: 'white', title: 'White', color: '#fff' },
+      { id: 'emptyShadeDark', title: 'Empty Shade - Dark', color: euiDarkVars.euiColorEmptyShade },
+      { id: 'emptyShadeLight', title: 'Empty Shade - Light', color: euiLightVars.euiColorEmptyShade },
       { id: 'black', title: 'Black', color: '#000' },
+      { id: 'white', title: 'White', color: '#fff' },
       { id: 'red', title: 'Red', color: '#f04d9a' },
       { id: 'blue', title: 'Blue', color: '#14abf5' },
       { id: 'yellow', title: 'Yellow', color: '#fec709' },
diff --git a/storybook/stories/components/tooltip/11_partition_chart.story.tsx b/storybook/stories/components/tooltip/11_partition_chart.story.tsx
index 821b1bc433..5a9ab73938 100644
--- a/storybook/stories/components/tooltip/11_partition_chart.story.tsx
+++ b/storybook/stories/components/tooltip/11_partition_chart.story.tsx
@@ -166,7 +166,3 @@ export const Example: ChartsStory = (_, { title, description }) => {
     </Chart>
   );
 };
-
-Example.parameters = {
-  background: { default: 'white' },
-};
diff --git a/storybook/stories/icicle/01_unix_icicle.story.tsx b/storybook/stories/icicle/01_unix_icicle.story.tsx
index e4f4f52e76..cfa7e9ab08 100644
--- a/storybook/stories/icicle/01_unix_icicle.story.tsx
+++ b/storybook/stories/icicle/01_unix_icicle.story.tsx
@@ -43,7 +43,3 @@ export const Example: ChartsStory = (_, { title, description }) => {
     </Chart>
   );
 };
-
-Example.parameters = {
-  background: { default: 'white' },
-};
diff --git a/storybook/stories/icicle/02_unix_flame.story.tsx b/storybook/stories/icicle/02_unix_flame.story.tsx
index 5c9e626db4..af4f30f456 100644
--- a/storybook/stories/icicle/02_unix_flame.story.tsx
+++ b/storybook/stories/icicle/02_unix_flame.story.tsx
@@ -45,7 +45,3 @@ export const Example: ChartsStory = (_, { title, description }) => {
     </Chart>
   );
 };
-
-Example.parameters = {
-  background: { default: 'white' },
-};
diff --git a/storybook/stories/icicle/03_cpu_profile_flame.story.tsx b/storybook/stories/icicle/03_cpu_profile_flame.story.tsx
index b7a264737f..6928ba0871 100644
--- a/storybook/stories/icicle/03_cpu_profile_flame.story.tsx
+++ b/storybook/stories/icicle/03_cpu_profile_flame.story.tsx
@@ -65,7 +65,3 @@ export const Example: ChartsStory = (_, { title, description }) => {
     </Chart>
   );
 };
-
-Example.parameters = {
-  background: { default: 'white' },
-};
diff --git a/storybook/stories/interactions/4_sunburst_slice_clicks.story.tsx b/storybook/stories/interactions/4_sunburst_slice_clicks.story.tsx
index 1a2d7dfdaa..ba9c1b7570 100644
--- a/storybook/stories/interactions/4_sunburst_slice_clicks.story.tsx
+++ b/storybook/stories/interactions/4_sunburst_slice_clicks.story.tsx
@@ -82,7 +82,6 @@ export const Example: ChartsStory = (_, { title, description }) => {
 };
 
 Example.parameters = {
-  background: { default: 'white' },
   markdown: `The \`onElementClick\` receive an argument with the following type definition: \`Array<[Array<LayerValue>, SeriesIdentifier]>\`.
 
 Usually the outer array contains only one item but, in a near future, we will group smaller slices into a single one during the interaction.
diff --git a/storybook/stories/legend/10_sunburst.story.tsx b/storybook/stories/legend/10_sunburst.story.tsx
index 48131984cb..8941bed1cd 100644
--- a/storybook/stories/legend/10_sunburst.story.tsx
+++ b/storybook/stories/legend/10_sunburst.story.tsx
@@ -150,7 +150,6 @@ export const Example: ChartsStory = (_, { title, description }) => {
 };
 
 Example.parameters = {
-  background: { default: 'white' },
   markdown: `To flatten a hierarchical legend (like the rendered in a pie chart or a treemap when using a multi-layer configuration) you can
 add the \`flatLegend\` prop into the \`<Settings  baseTheme={useBaseTheme()} />\` component.
 
diff --git a/storybook/stories/legend/10_sunburst_repeated_label.story.tsx b/storybook/stories/legend/10_sunburst_repeated_label.story.tsx
index fa6f19c9a6..c5acb748ee 100644
--- a/storybook/stories/legend/10_sunburst_repeated_label.story.tsx
+++ b/storybook/stories/legend/10_sunburst_repeated_label.story.tsx
@@ -58,6 +58,5 @@ export const Example: ChartsStory = (_, { title, description }) => {
 };
 
 Example.parameters = {
-  background: { default: 'white' },
   markdown: `Nested legend with reused node labels means that they can reoccur in various points of the legend tree.`,
 };
diff --git a/storybook/stories/mosaic/10_mosaic_simple.story.tsx b/storybook/stories/mosaic/10_mosaic_simple.story.tsx
index af7842444c..b32bfb1479 100644
--- a/storybook/stories/mosaic/10_mosaic_simple.story.tsx
+++ b/storybook/stories/mosaic/10_mosaic_simple.story.tsx
@@ -118,7 +118,3 @@ export const Example: ChartsStory = (_, { title, description }) => {
     </Chart>
   );
 };
-
-Example.parameters = {
-  background: { default: 'white' },
-};
diff --git a/storybook/stories/mosaic/20_mosaic_with_other.story.tsx b/storybook/stories/mosaic/20_mosaic_with_other.story.tsx
index b182496d01..0d98575397 100644
--- a/storybook/stories/mosaic/20_mosaic_with_other.story.tsx
+++ b/storybook/stories/mosaic/20_mosaic_with_other.story.tsx
@@ -102,7 +102,3 @@ export const Example: ChartsStory = (_, { title, description }) => {
     </Chart>
   );
 };
-
-Example.parameters = {
-  background: { default: 'white' },
-};
diff --git a/storybook/stories/small_multiples/7_sunbursts.story.tsx b/storybook/stories/small_multiples/7_sunbursts.story.tsx
index a06804a0db..5ff9b856e8 100644
--- a/storybook/stories/small_multiples/7_sunbursts.story.tsx
+++ b/storybook/stories/small_multiples/7_sunbursts.story.tsx
@@ -172,7 +172,3 @@ export const Example: ChartsStory = (_, { title, description }) => {
     </Chart>
   );
 };
-
-Example.parameters = {
-  background: { default: 'white' },
-};
diff --git a/storybook/stories/small_multiples/9_heatmap.story.tsx b/storybook/stories/small_multiples/9_heatmap.story.tsx
index 6d9af9cf12..5f483d76b1 100644
--- a/storybook/stories/small_multiples/9_heatmap.story.tsx
+++ b/storybook/stories/small_multiples/9_heatmap.story.tsx
@@ -231,7 +231,3 @@ export const Example: ChartsStory = (_, { title, description }) => {
     </Chart>
   );
 };
-
-Example.parameters = {
-  background: { default: 'white' },
-};
diff --git a/storybook/stories/sunburst/15_single_sunburst.story.tsx b/storybook/stories/sunburst/15_single_sunburst.story.tsx
index 2a7ef3c10c..d75dabf090 100644
--- a/storybook/stories/sunburst/15_single_sunburst.story.tsx
+++ b/storybook/stories/sunburst/15_single_sunburst.story.tsx
@@ -90,7 +90,3 @@ export const Example: ChartsStory = (_, { title, description }) => (
     />
   </Chart>
 );
-
-Example.parameters = {
-  background: { default: 'white' },
-};
diff --git a/storybook/stories/sunburst/19_negative.story.tsx b/storybook/stories/sunburst/19_negative.story.tsx
index a7c9589e07..5b7bc916ec 100644
--- a/storybook/stories/sunburst/19_negative.story.tsx
+++ b/storybook/stories/sunburst/19_negative.story.tsx
@@ -40,7 +40,3 @@ export const Example: ChartsStory = (_, { title, description }) => (
     />
   </Chart>
 );
-
-Example.parameters = {
-  background: { default: 'white' },
-};
diff --git a/storybook/stories/sunburst/1_simple.story.tsx b/storybook/stories/sunburst/1_simple.story.tsx
index 22a476fce9..96e560cbe6 100644
--- a/storybook/stories/sunburst/1_simple.story.tsx
+++ b/storybook/stories/sunburst/1_simple.story.tsx
@@ -40,7 +40,3 @@ export const Example: ChartsStory = (_, { title, description }) => {
     </Chart>
   );
 };
-
-Example.parameters = {
-  background: { default: 'white' },
-};
diff --git a/storybook/stories/sunburst/22_counter_clockwise.story.tsx b/storybook/stories/sunburst/22_counter_clockwise.story.tsx
index 893f33c3b2..aee7a2aba1 100644
--- a/storybook/stories/sunburst/22_counter_clockwise.story.tsx
+++ b/storybook/stories/sunburst/22_counter_clockwise.story.tsx
@@ -38,7 +38,3 @@ export const Example: ChartsStory = (_, { title, description }) => (
     />
   </Chart>
 );
-
-Example.parameters = {
-  background: { default: 'white' },
-};
diff --git a/storybook/stories/sunburst/23_clockwise.story.tsx b/storybook/stories/sunburst/23_clockwise.story.tsx
index 66d8d4deaf..39aad84abc 100644
--- a/storybook/stories/sunburst/23_clockwise.story.tsx
+++ b/storybook/stories/sunburst/23_clockwise.story.tsx
@@ -38,7 +38,3 @@ export const Example: ChartsStory = (_, { title, description }) => (
     />
   </Chart>
 );
-
-Example.parameters = {
-  background: { default: 'white' },
-};
diff --git a/storybook/stories/sunburst/26_percentage.story.tsx b/storybook/stories/sunburst/26_percentage.story.tsx
index 0fe6c22e14..e4a4a0be66 100644
--- a/storybook/stories/sunburst/26_percentage.story.tsx
+++ b/storybook/stories/sunburst/26_percentage.story.tsx
@@ -92,7 +92,3 @@ export const Example: ChartsStory = (_, { title, description }) => (
     />
   </Chart>
 );
-
-Example.parameters = {
-  background: { default: 'white' },
-};
diff --git a/storybook/stories/sunburst/27_heterogeneous_depth.story.tsx b/storybook/stories/sunburst/27_heterogeneous_depth.story.tsx
index c0f69cc8e5..b312d336f6 100644
--- a/storybook/stories/sunburst/27_heterogeneous_depth.story.tsx
+++ b/storybook/stories/sunburst/27_heterogeneous_depth.story.tsx
@@ -92,7 +92,3 @@ export const Example: ChartsStory = (_, { title, description }) => (
     />
   </Chart>
 );
-
-Example.parameters = {
-  background: { default: 'white' },
-};
diff --git a/storybook/stories/sunburst/28_not_a_number.story.tsx b/storybook/stories/sunburst/28_not_a_number.story.tsx
index 7b75757f74..e6d01ab408 100644
--- a/storybook/stories/sunburst/28_not_a_number.story.tsx
+++ b/storybook/stories/sunburst/28_not_a_number.story.tsx
@@ -40,7 +40,3 @@ export const Example: ChartsStory = (_, { title, description }) => (
     />
   </Chart>
 );
-
-Example.parameters = {
-  background: { default: 'white' },
-};
diff --git a/storybook/stories/sunburst/2_value_formatted.story.tsx b/storybook/stories/sunburst/2_value_formatted.story.tsx
index 0eef3d3e7c..efd73338f2 100644
--- a/storybook/stories/sunburst/2_value_formatted.story.tsx
+++ b/storybook/stories/sunburst/2_value_formatted.story.tsx
@@ -67,7 +67,3 @@ export const Example: ChartsStory = (_, { title, description }) => {
     </Chart>
   );
 };
-
-Example.parameters = {
-  background: { default: 'white' },
-};
diff --git a/storybook/stories/sunburst/31_bold_link_value.story.tsx b/storybook/stories/sunburst/31_bold_link_value.story.tsx
index eef304950c..aa914fff9a 100644
--- a/storybook/stories/sunburst/31_bold_link_value.story.tsx
+++ b/storybook/stories/sunburst/31_bold_link_value.story.tsx
@@ -43,7 +43,3 @@ export const Example: ChartsStory = (_, { title, description }) => (
     />
   </Chart>
 );
-
-Example.parameters = {
-  background: { default: 'white' },
-};
diff --git a/storybook/stories/sunburst/32_custom_tooltip.story.tsx b/storybook/stories/sunburst/32_custom_tooltip.story.tsx
index 6bc0e46422..f01466f6a9 100644
--- a/storybook/stories/sunburst/32_custom_tooltip.story.tsx
+++ b/storybook/stories/sunburst/32_custom_tooltip.story.tsx
@@ -113,7 +113,3 @@ export const Example: ChartsStory = (_, { title, description }) => {
     </Chart>
   );
 };
-
-Example.parameters = {
-  background: { default: 'white' },
-};
diff --git a/storybook/stories/sunburst/4_fill_labels.story.tsx b/storybook/stories/sunburst/4_fill_labels.story.tsx
index 2599f2d22d..4632d920d5 100644
--- a/storybook/stories/sunburst/4_fill_labels.story.tsx
+++ b/storybook/stories/sunburst/4_fill_labels.story.tsx
@@ -63,7 +63,3 @@ export const Example: ChartsStory = (_, { title, description }) => (
     />
   </Chart>
 );
-
-Example.parameters = {
-  background: { default: 'white' },
-};
diff --git a/storybook/stories/sunburst/5_donut.story.tsx b/storybook/stories/sunburst/5_donut.story.tsx
index 5fbb7e3dde..480abd1455 100644
--- a/storybook/stories/sunburst/5_donut.story.tsx
+++ b/storybook/stories/sunburst/5_donut.story.tsx
@@ -67,7 +67,3 @@ export const Example: ChartsStory = (_, { title, description }) => {
     </Chart>
   );
 };
-
-Example.parameters = {
-  background: { default: 'white' },
-};
diff --git a/storybook/stories/sunburst/8_sunburst_two_layers.story.tsx b/storybook/stories/sunburst/8_sunburst_two_layers.story.tsx
index 3888e3d03f..963a09f7a7 100644
--- a/storybook/stories/sunburst/8_sunburst_two_layers.story.tsx
+++ b/storybook/stories/sunburst/8_sunburst_two_layers.story.tsx
@@ -89,7 +89,3 @@ export const Example: ChartsStory = (_, { title, description }) => {
     </Chart>
   );
 };
-
-Example.parameters = {
-  background: { default: 'white' },
-};
diff --git a/storybook/stories/sunburst/9_sunburst_three_layers.story.tsx b/storybook/stories/sunburst/9_sunburst_three_layers.story.tsx
index df5e6cbead..3dbfebd7b7 100644
--- a/storybook/stories/sunburst/9_sunburst_three_layers.story.tsx
+++ b/storybook/stories/sunburst/9_sunburst_three_layers.story.tsx
@@ -94,7 +94,3 @@ export const Example: ChartsStory = (_, { title, description }) => (
     />
   </Chart>
 );
-
-Example.parameters = {
-  background: { default: 'white' },
-};
diff --git a/storybook/stories/test_cases/7_rtl_text.story.tsx b/storybook/stories/test_cases/7_rtl_text.story.tsx
index f94cd071c8..60d927e3cb 100644
--- a/storybook/stories/test_cases/7_rtl_text.story.tsx
+++ b/storybook/stories/test_cases/7_rtl_text.story.tsx
@@ -126,7 +126,3 @@ export const Example: ChartsStory = (_, { title, description }) => {
     </Chart>
   );
 };
-
-Example.parameters = {
-  background: { default: 'white' },
-};
diff --git a/storybook/stories/timeslip/01_timeslip.story.tsx b/storybook/stories/timeslip/01_timeslip.story.tsx
index 83ab1a8653..999eada2d8 100644
--- a/storybook/stories/timeslip/01_timeslip.story.tsx
+++ b/storybook/stories/timeslip/01_timeslip.story.tsx
@@ -45,7 +45,3 @@ export const Example: ChartsStory = (_, { title, description }) => {
     </Chart>
   );
 };
-
-Example.parameters = {
-  background: { default: 'white' },
-};
diff --git a/storybook/stories/treemap/10_three_layers.story.tsx b/storybook/stories/treemap/10_three_layers.story.tsx
index ac14c87d1f..b00bac4580 100644
--- a/storybook/stories/treemap/10_three_layers.story.tsx
+++ b/storybook/stories/treemap/10_three_layers.story.tsx
@@ -104,7 +104,3 @@ export const Example: ChartsStory = (_, { title, description }) => (
     />
   </Chart>
 );
-
-Example.parameters = {
-  background: { default: 'white' },
-};
diff --git a/storybook/stories/treemap/1_one_layer.story.tsx b/storybook/stories/treemap/1_one_layer.story.tsx
index 4adab9dd20..5c779118bf 100644
--- a/storybook/stories/treemap/1_one_layer.story.tsx
+++ b/storybook/stories/treemap/1_one_layer.story.tsx
@@ -40,7 +40,3 @@ export const Example: ChartsStory = (_, { title, description }) => (
     />
   </Chart>
 );
-
-Example.parameters = {
-  background: { default: 'white' },
-};
diff --git a/storybook/stories/treemap/3_mid_two.story.tsx b/storybook/stories/treemap/3_mid_two.story.tsx
index 3378ed944d..783a85c81d 100644
--- a/storybook/stories/treemap/3_mid_two.story.tsx
+++ b/storybook/stories/treemap/3_mid_two.story.tsx
@@ -78,7 +78,3 @@ export const Example: ChartsStory = (_, { title, description }) => (
     />
   </Chart>
 );
-
-Example.parameters = {
-  background: { default: 'white' },
-};
diff --git a/storybook/stories/treemap/4_two_layer_stress.story.tsx b/storybook/stories/treemap/4_two_layer_stress.story.tsx
index 7aaae7f9ab..93b574e1c3 100644
--- a/storybook/stories/treemap/4_two_layer_stress.story.tsx
+++ b/storybook/stories/treemap/4_two_layer_stress.story.tsx
@@ -82,7 +82,3 @@ export const Example: ChartsStory = (_, { title, description }) => (
     />
   </Chart>
 );
-
-Example.parameters = {
-  background: { default: 'white' },
-};
diff --git a/storybook/stories/treemap/5_multicolor.story.tsx b/storybook/stories/treemap/5_multicolor.story.tsx
index 5d08a06f1b..fdfbdb9564 100644
--- a/storybook/stories/treemap/5_multicolor.story.tsx
+++ b/storybook/stories/treemap/5_multicolor.story.tsx
@@ -79,7 +79,3 @@ export const Example: ChartsStory = (_, { title, description }) => (
     />
   </Chart>
 );
-
-Example.parameters = {
-  background: { default: 'white' },
-};
diff --git a/storybook/stories/treemap/6_custom_style.story.tsx b/storybook/stories/treemap/6_custom_style.story.tsx
index 6464b9d05e..3a0da694ad 100644
--- a/storybook/stories/treemap/6_custom_style.story.tsx
+++ b/storybook/stories/treemap/6_custom_style.story.tsx
@@ -79,7 +79,3 @@ export const Example: ChartsStory = (_, { title, description }) => (
     />
   </Chart>
 );
-
-Example.parameters = {
-  background: { default: 'white' },
-};
diff --git a/storybook/stories/treemap/7_percentage.story.tsx b/storybook/stories/treemap/7_percentage.story.tsx
index 3174815f5e..06662d36e1 100644
--- a/storybook/stories/treemap/7_percentage.story.tsx
+++ b/storybook/stories/treemap/7_percentage.story.tsx
@@ -74,7 +74,3 @@ export const Example: ChartsStory = (_, { title, description }) => (
     />
   </Chart>
 );
-
-Example.parameters = {
-  background: { default: 'white' },
-};
diff --git a/storybook/stories/treemap/8_groove_text.story.tsx b/storybook/stories/treemap/8_groove_text.story.tsx
index 5a4896587e..d5485a31eb 100644
--- a/storybook/stories/treemap/8_groove_text.story.tsx
+++ b/storybook/stories/treemap/8_groove_text.story.tsx
@@ -97,7 +97,3 @@ export const Example: ChartsStory = (_, { title, description }) => (
     />
   </Chart>
 );
-
-Example.parameters = {
-  background: { default: 'white' },
-};
diff --git a/storybook/stories/treemap/9_zero_values.story.tsx b/storybook/stories/treemap/9_zero_values.story.tsx
index 5ad9f37ca5..c9e2798590 100644
--- a/storybook/stories/treemap/9_zero_values.story.tsx
+++ b/storybook/stories/treemap/9_zero_values.story.tsx
@@ -43,7 +43,3 @@ export const Example: ChartsStory = (_, { title, description }) => (
     />
   </Chart>
 );
-
-Example.parameters = {
-  background: { default: 'white' },
-};
diff --git a/storybook/story_wrapper.tsx b/storybook/story_wrapper.tsx
index 333fffb3de..7fd68a9941 100644
--- a/storybook/story_wrapper.tsx
+++ b/storybook/story_wrapper.tsx
@@ -17,7 +17,7 @@ export const StoryWrapper: DecoratorFunction<JSX.Element> = (Story, context) =>
 
   const { globals, parameters } = context;
 
-  const themeId = globals?.theme ?? ThemeId.EUILight;
+  const themeId = globals?.theme ?? ThemeId.Light;
   const backgroundId = globals?.background;
   const { showHeader = false, showChartTitle = false, showChartDescription = false } = globals?.toggles ?? {};
   const markdown = parameters?.markdown;
diff --git a/storybook/use_base_theme.ts b/storybook/use_base_theme.ts
index a6cd11a4b8..d47a77adf0 100644
--- a/storybook/use_base_theme.ts
+++ b/storybook/use_base_theme.ts
@@ -22,23 +22,19 @@ import { storybookParameters } from './parameters';
 export const ThemeId = Object.freeze({
   Light: 'light' as const,
   Dark: 'dark' as const,
-  EUILight: 'eui-light' as const,
-  EUIDark: 'eui-dark' as const,
 });
 /** @internal */
 export type ThemeId = $Values<typeof ThemeId>;
 
-const ThemeContext = createContext<ThemeId>(ThemeId.EUILight);
+const ThemeContext = createContext<ThemeId>(ThemeId.Light);
 const BackgroundContext = createContext<string | undefined>(undefined);
 
 export const ThemeIdProvider = ThemeContext.Provider;
 export const BackgroundIdProvider = BackgroundContext.Provider;
 
 const themeMap = {
-  [ThemeId.Light]: LIGHT_THEME,
-  [ThemeId.Dark]: DARK_THEME,
-  [ThemeId.EUILight]: mergePartial(LIGHT_THEME, EUI_CHARTS_THEME_LIGHT.theme),
-  [ThemeId.EUIDark]: mergePartial(DARK_THEME, EUI_CHARTS_THEME_DARK.theme),
+  [ThemeId.Light]: mergePartial(LIGHT_THEME, EUI_CHARTS_THEME_LIGHT.theme),
+  [ThemeId.Dark]: mergePartial(DARK_THEME, EUI_CHARTS_THEME_DARK.theme),
 };
 
 const getBackground = (backgroundId?: string) => {