diff --git a/.storybook/main.ts b/.storybook/main.ts
index c49f8f460b..04f806021c 100644
--- a/.storybook/main.ts
+++ b/.storybook/main.ts
@@ -1,7 +1,7 @@
 import type { StorybookConfig } from '@storybook-vue/nuxt'
 
 const config = {
-  stories: ['../.storybook/*.mdx', '../app/**/*.stories.@(js|ts)'],
+  stories: ['../app/**/*.stories.@(js|ts)'],
   addons: ['@storybook/addon-a11y', '@storybook/addon-docs', '@storybook/addon-themes'],
   framework: '@storybook-vue/nuxt',
   staticDirs: ['./.public'],
diff --git a/.storybook/manager.ts b/.storybook/manager.ts
index 82475f197f..023e4fd21d 100644
--- a/.storybook/manager.ts
+++ b/.storybook/manager.ts
@@ -1,19 +1,11 @@
 import { addons } from 'storybook/manager-api'
+import { create } from 'storybook/theming'
 
-import npmxDark from './theme'
+const npmxTheme = create({
+  brandTitle: 'npmx Storybook',
+  brandImage: '/npmx-storybook.svg',
+})
 
 addons.setConfig({
-  theme: npmxDark,
-  layoutCustomisations: {
-    showToolbar: (state, defaultValue) => {
-      if (state.viewMode === 'docs' && state.storyId) {
-        const story = state.index?.[state.storyId]
-        const tags = story?.tags || []
-        if (tags.includes('hide-toolbar')) {
-          return false
-        }
-      }
-      return defaultValue
-    },
-  },
+  theme: npmxTheme,
 })
diff --git a/.storybook/preview-head.html b/.storybook/preview-head.html
deleted file mode 100644
index 49c5636054..0000000000
--- a/.storybook/preview-head.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<style>
-  /* Override docs story canvas background to match npmx theme */
-  .docs-story {
-    background-color: var(--bg, oklch(0.171 0 0)) !important;
-  }
-</style>
diff --git a/.storybook/preview.ts b/.storybook/preview.ts
index 0d62d33be0..3242f7788a 100644
--- a/.storybook/preview.ts
+++ b/.storybook/preview.ts
@@ -4,8 +4,6 @@ import { currentLocales } from '../config/i18n'
 import { fn } from 'storybook/test'
 import { ACCENT_COLORS } from '../shared/utils/constants'
 
-import npmxDark from './theme'
-
 // related: https://github.com/npmx-dev/npmx.dev/blob/1431d24be555bca5e1ae6264434d49ca15173c43/test/nuxt/setup.ts#L12-L26
 // Stub Nuxt specific globals
 // @ts-expect-error - dynamic global name
@@ -27,9 +25,6 @@ const preview: Preview = {
         date: /Date$/i,
       },
     },
-    docs: {
-      theme: npmxDark,
-    },
   },
   // Provides toolbars to switch things like theming and language
   globalTypes: {
diff --git a/.storybook/storybook-welcome.mdx b/.storybook/storybook-welcome.mdx
deleted file mode 100644
index d8c738ad11..0000000000
--- a/.storybook/storybook-welcome.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Meta } from '@storybook/addon-docs/blocks';
- 
-<Meta title="Welcome" tags={['hide-toolbar']}/>
-
-# Welcome
-
-Welcome to the npmx Storybook.
diff --git a/.storybook/theme.ts b/.storybook/theme.ts
deleted file mode 100644
index 10816b91cb..0000000000
--- a/.storybook/theme.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { create } from 'storybook/theming'
-
-const npmxDark = create({
-  base: 'dark',
-
-  brandTitle: 'npmx Storybook',
-  brandImage: '/npmx-storybook.svg',
-
-  // UI
-  appContentBg: '#101010', // oklch(0.171 0 0)
-})
-
-export default npmxDark