diff --git a/package.json b/package.json
index 7b31e58..5a8a5e4 100644
--- a/package.json
+++ b/package.json
@@ -37,8 +37,8 @@
     "venv:freeze": "cd api/ && venv/bin/pip freeze | grep -v 'pkg-resources' > requirements.txt",
     "test": "react-scripts test",
     "eject": "react-scripts eject",
-    "storybook": "start-storybook -p 6006 -s public",
-    "build-storybook": "build-storybook -s public"
+    "storybook": "start-storybook -p 6006 -s public -c storybook",
+    "build-storybook": "build-storybook -s public -c storybook"
   },
   "eslintConfig": {
     "extends": "react-app"
diff --git a/.storybook/DocsTheme.js b/storybook/DocsTheme.js
similarity index 100%
rename from .storybook/DocsTheme.js
rename to storybook/DocsTheme.js
diff --git a/.storybook/main.js b/storybook/main.js
similarity index 100%
rename from .storybook/main.js
rename to storybook/main.js
diff --git a/.storybook/manager.js b/storybook/manager.js
similarity index 100%
rename from .storybook/manager.js
rename to storybook/manager.js
diff --git a/.storybook/preview.js b/storybook/preview.js
similarity index 78%
rename from .storybook/preview.js
rename to storybook/preview.js
index ec61f20..c384ea2 100644
--- a/.storybook/preview.js
+++ b/storybook/preview.js
@@ -2,6 +2,7 @@ import React, { useState } from "react";
 import ItemProvider from '../src/components/ItemProvider';
 import { ThemeProvider } from "@material-ui/core/styles";
 import webqueueTheme from "../src/theme";
+import { Paper } from "@material-ui/core";
 
 
 
@@ -14,8 +15,8 @@ export const globalTypes = {
     toolbar: {
       icon: 'mirror',
       items: [
-        {value:true, title: "Dark Mode active",},
-        {value:false, title: "Dark Mode off",}
+        { value: true, title: "Dark Mode active", icon: "contrast" },
+        { value: false, title: "Dark Mode off", icon: "switchalt" }
       ],
     },
   },
@@ -27,7 +28,7 @@ const withThemeProvider = (Story, context) => {
   const theme = webqueueTheme(context.globals.theme);
   return (
     <ThemeProvider theme={theme} >
-      <Story {...context} />
+        <Story {...context} />
     </ThemeProvider>
   )
 }
@@ -49,10 +50,4 @@ export const parameters = {
       order: ['Introduction', 'Components']
     },
   },
-  backgrounds: {
-    values: [
-      { name: 'red', value: '#f00' },
-      { name: 'green', value: '#0f0' },
-    ],
-  },
 }
\ No newline at end of file