diff --git a/storybook/preview.js b/storybook/preview.js
index 136b2b2..46f9702 100644
--- a/storybook/preview.js
+++ b/storybook/preview.js
@@ -28,28 +28,27 @@ export const globalTypes = {
   },
 };
 
-/**Defines global theme ALL stories stories.
- *  * @type {Object | Function}
-  */
-const withThemeProvider = (Story, context) => {
-  const theme = webqueueTheme(context.globals.theme);
-  return (
-    <ThemeProvider theme={theme} >
-      <Story {...context} />
-    </ThemeProvider>
-  )
-}
 /**
-   * Wraps all sotrys in the defined decorators.
-   * @type {Array[]}
-   */
+ * Array
+ * @type {Array}
+ * @see https://storybook.js.org/docs/react/writing-stories/decorators
+ */
 export const decorators = [
+  // Provide custom webqueue2 Theme
+  (Story, context) => {
+    const theme = webqueueTheme(context.globals.theme);
+    return (
+      <ThemeProvider theme={theme} >
+        <Story {...context.args} />
+      </ThemeProvider>
+    );
+  },
+  // Provide Item context
   (Story) => (
     <ItemProvider>
       <Story />
     </ItemProvider>
   ),
-  withThemeProvider
 ];
 
 /**Set of static metadata for a story.  Is also used to define the sort order of the stories and backgrounds for every story.