diff --git a/.storybook/addons/withTheme.css b/.storybook/addons/withTheme.css
new file mode 100644
index 00000000..d9a6bd82
--- /dev/null
+++ b/.storybook/addons/withTheme.css
@@ -0,0 +1,3 @@
+.docs-story {
+    background: var(--vf-color-background-default);
+}
diff --git a/.storybook/addons/withTheme.jsx b/.storybook/addons/withTheme.jsx
new file mode 100644
index 00000000..c5b0a406
--- /dev/null
+++ b/.storybook/addons/withTheme.jsx
@@ -0,0 +1,49 @@
+import React, { useEffect, useRef } from "react";
+
+import "./withTheme.css";
+
+const THEMES = [
+  {
+    value: "is-light",
+    title: "Theme: Light",
+  },
+  {
+    value: "is-dark",
+    title: "Theme: Dark",
+  },
+  {
+    value: "is-paper",
+    title: "Theme: Paper",
+  },
+];
+
+export const themeType = {
+  theme: {
+    name: "Theme",
+    description: "Global theme for components",
+    defaultValue: THEMES[0].value,
+    toolbar: {
+      items: THEMES,
+      showName: true,
+      dynamicTitle: true,
+    },
+  },
+};
+
+export const WithThemeProvider = (Story, context) => {
+  const theme = context.globals.theme;
+  const themeRef = useRef(null);
+
+  useEffect(() => {
+    if (themeRef.current !== theme) {
+      if (themeRef.current) {
+        document.body.classList.remove(themeRef.current);
+      }
+
+      document.body.classList.add(theme);
+      themeRef.current = theme;
+    }
+  }, [theme]);
+
+  return <Story {...context} />;
+};
diff --git a/.storybook/preview.js b/.storybook/preview.js
index c65f45d7..cf4ca618 100644
--- a/.storybook/preview.js
+++ b/.storybook/preview.js
@@ -1,8 +1,16 @@
 import { themes } from "@storybook/theming";
 import "vanilla-framework/scss/build.scss";
+import { themeType, WithThemeProvider } from "./addons/withTheme";
 
 export const parameters = {
   docs: {
     theme: themes.vanillaish,
   },
+  backgrounds: {
+    disable: true,
+  },
 };
+
+export const decorators = [WithThemeProvider];
+
+export const globalTypes = themeType;