diff --git a/packages/grid/src/index.ts b/packages/grid/src/index.ts
index d19a66d01b..b0744d032b 100644
--- a/packages/grid/src/index.ts
+++ b/packages/grid/src/index.ts
@@ -11,6 +11,7 @@ export * from './GridRange';
 export * from './GridAxisRange';
 export * from './GridRenderer';
 export { default as GridTestUtils } from './GridTestUtils';
+export * from './GridTheme';
 export { default as GridTheme } from './GridTheme';
 export type { GridTheme as GridThemeType } from './GridTheme';
 export * from './GridUtils';
diff --git a/packages/iris-grid/src/IrisGrid.tsx b/packages/iris-grid/src/IrisGrid.tsx
index 4dc456270b..a1e53cc073 100644
--- a/packages/iris-grid/src/IrisGrid.tsx
+++ b/packages/iris-grid/src/IrisGrid.tsx
@@ -1363,8 +1363,8 @@ export class IrisGrid extends Component<IrisGridProps, IrisGridState> {
 
   getCachedTheme = memoize(
     (
-      contextTheme: GridThemeType | null,
-      theme: GridThemeType | null,
+      contextTheme: Partial<GridThemeType> | null,
+      theme: Partial<GridThemeType> | null,
       isEditable: boolean,
       floatingRowCount: number
     ): Partial<IrisGridThemeType> => {
diff --git a/packages/iris-grid/src/IrisGridTableModelTemplate.ts b/packages/iris-grid/src/IrisGridTableModelTemplate.ts
index 74e8a7b5a2..2b64e196bf 100644
--- a/packages/iris-grid/src/IrisGridTableModelTemplate.ts
+++ b/packages/iris-grid/src/IrisGridTableModelTemplate.ts
@@ -625,7 +625,11 @@ class IrisGridTableModelTemplate<
     return theme.textColor;
   }
 
-  backgroundColorForCell(x: ModelIndex, y: ModelIndex): string | null {
+  backgroundColorForCell(
+    x: ModelIndex,
+    y: ModelIndex,
+    theme: IrisGridThemeType
+  ): string | null {
     return this.formatForCell(x, y)?.backgroundColor ?? null;
   }