diff --git a/packages/components/src/SpectrumThemeDark.module.scss b/packages/components/src/SpectrumThemeDark.module.scss
deleted file mode 100644
index 2def9236d9..0000000000
--- a/packages/components/src/SpectrumThemeDark.module.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
-  This module contains overrides of React Spectrum css variables for the default
-  `dark` Deephaven theme.
-*/
-@use '../scss/bootstrap_overrides' as bootstrap;
-@use '../scss/util' as *;
-
-// Doubling specificity to ensure this takes precedence over default Spectrum
-// styles.
-#{multiply-specificity-n('.dh-spectrum-theme--dark', 2)} {
-  --spectrum-alias-background-color-default: #{bootstrap.$interfaceblack};
-}
diff --git a/packages/components/src/SpectrumThemeLight.module.scss b/packages/components/src/SpectrumThemeLight.module.scss
deleted file mode 100644
index 037ec68732..0000000000
--- a/packages/components/src/SpectrumThemeLight.module.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
-  This module contains overrides of React Spectrum css variables for the default
-  `light` Deephaven theme.
-*/
-@use '../scss/bootstrap_overrides' as bootstrap;
-@use '../scss/util' as *;
-
-// Doubling specificity to ensure this takes precedence over default Spectrum
-// styles.
-#{multiply-specificity-n('.dh-spectrum-theme--light', 2)} {
-  --spectrum-alias-background-color-default: #{bootstrap.$interfacewhite};
-}
diff --git a/packages/components/src/theme/theme-spectrum/index.ts b/packages/components/src/theme/theme-spectrum/index.ts
index a6cea2b39a..1b5405e786 100644
--- a/packages/components/src/theme/theme-spectrum/index.ts
+++ b/packages/components/src/theme/theme-spectrum/index.ts
@@ -1,5 +1,6 @@
 import palette from './theme-spectrum-palette.module.css';
 import alias from './theme-spectrum-alias.module.css';
+import overrides from './theme-spectrum-overrides.module.css';
 
 /**
  * Spectrum theme variables are exported as a map of css class names. The keys
@@ -15,6 +16,7 @@ import alias from './theme-spectrum-alias.module.css';
 export const themeSpectrumClassesCommon = {
   ...palette,
   ...alias,
+  ...overrides,
 };
 
 export default themeSpectrumClassesCommon;
diff --git a/packages/components/src/theme/theme-spectrum/theme-spectrum-overrides.module.css b/packages/components/src/theme/theme-spectrum/theme-spectrum-overrides.module.css
new file mode 100644
index 0000000000..e11f89dd45
--- /dev/null
+++ b/packages/components/src/theme/theme-spectrum/theme-spectrum-overrides.module.css
@@ -0,0 +1,3 @@
+[class^='spectrum'] {
+  font-family: var(--font-family-sans-serif) !important;
+}