diff --git a/packages/superset-ui-core/src/chart/index.ts b/packages/superset-ui-core/src/chart/index.ts
index 77e9fbd1f6..7ecf611996 100644
--- a/packages/superset-ui-core/src/chart/index.ts
+++ b/packages/superset-ui-core/src/chart/index.ts
@@ -12,6 +12,7 @@ export { default as getChartComponentRegistry } from './registries/ChartComponen
 export { default as getChartControlPanelRegistry } from './registries/ChartControlPanelRegistrySingleton';
 export { default as getChartMetadataRegistry } from './registries/ChartMetadataRegistrySingleton';
 export { default as getChartTransformPropsRegistry } from './registries/ChartTransformPropsRegistrySingleton';
+export { BuildQuery } from './registries/ChartBuildQueryRegistrySingleton';
 
 export { default as ChartDataProvider } from './components/ChartDataProvider';
 
diff --git a/packages/superset-ui-core/src/color/index.ts b/packages/superset-ui-core/src/color/index.ts
index 638016191d..9d8eda76f8 100644
--- a/packages/superset-ui-core/src/color/index.ts
+++ b/packages/superset-ui-core/src/color/index.ts
@@ -6,6 +6,7 @@ export { default as CategoricalScheme } from './CategoricalScheme';
 export { default as getCategoricalSchemeRegistry } from './CategoricalSchemeRegistrySingleton';
 export { default as getSequentialSchemeRegistry } from './SequentialSchemeRegistrySingleton';
 export { default as SequentialScheme } from './SequentialScheme';
+export { default as ColorSchemeRegistry } from './ColorSchemeRegistry';
 export * from './colorSchemes';
 
 export const BRAND_COLOR = '#00A699';
diff --git a/packages/superset-ui-demo/.storybook/main.js b/packages/superset-ui-demo/.storybook/main.js
index 5fca10d667..6cb0c9167b 100644
--- a/packages/superset-ui-demo/.storybook/main.js
+++ b/packages/superset-ui-demo/.storybook/main.js
@@ -63,13 +63,10 @@ module.exports = {
 
     // todo: remove hard code after move storybook to superset repo.
     config.resolve.alias['@emotion/styled'] = path.resolve(
-        rootPath,
+      rootPath,
       './node_modules/@emotion/styled',
     );
-    config.resolve.alias['@emotion/core'] = path.resolve(
-        rootPath,
-        './node_modules/@emotion/core',
-    );
+    config.resolve.alias['@emotion/core'] = path.resolve(rootPath, './node_modules/@emotion/core');
 
     config.devtool = 'eval-cheap-module-source-map';
     config.devServer = {