diff --git a/readme.plan.md b/readme.plan.md
index 65af3a9..5e1052e 100644
Binary files a/readme.plan.md and b/readme.plan.md differ
diff --git a/ts_web/elements/dees-input-wysiwyg.demo.ts b/ts_web/elements/dees-input-wysiwyg.demo.ts
index 678cc8b..fcb2f68 100644
--- a/ts_web/elements/dees-input-wysiwyg.demo.ts
+++ b/ts_web/elements/dees-input-wysiwyg.demo.ts
@@ -1,8 +1,8 @@
 import { html, css, type TemplateResult } from '@design.estate/dees-element';
 import '@design.estate/dees-wcctools/demotools';
 import './dees-panel.js';
-import type { DeesInputWysiwyg } from './dees-input-wysiwyg.js';
-import type { IBlock } from './wysiwyg/wysiwyg.types.js';
+import type { DeesInputWysiwyg } from './dees-input-wysiwyg/dees-input-wysiwyg.js';
+import type { IBlock } from './dees-input-wysiwyg/wysiwyg.types.js';
 
 interface IDemoEditor {
   basic: DeesInputWysiwyg;
@@ -1066,4 +1066,4 @@ POST /api/v2/batch
       </dees-panel>
     </div>
   </dees-demowrapper>
-`;
\ No newline at end of file
+`;
diff --git a/ts_web/elements/dees-input-wysiwyg.ts b/ts_web/elements/dees-input-wysiwyg.ts
index c999573..2fa899b 100644
--- a/ts_web/elements/dees-input-wysiwyg.ts
+++ b/ts_web/elements/dees-input-wysiwyg.ts
@@ -1,2 +1,3 @@
-// Re-export the modular component from the wysiwyg directory
-export { DeesInputWysiwyg } from './wysiwyg/dees-input-wysiwyg.js';
\ No newline at end of file
+// Re-export the component and related helpers from the dedicated subdirectory
+export { DeesInputWysiwyg } from './dees-input-wysiwyg/dees-input-wysiwyg.js';
+export * from './dees-input-wysiwyg/index.js';
diff --git a/ts_web/elements/dees-input-wysiwyg/index.ts b/ts_web/elements/dees-input-wysiwyg/index.ts
index 138fcf8..2483218 100644
--- a/ts_web/elements/dees-input-wysiwyg/index.ts
+++ b/ts_web/elements/dees-input-wysiwyg/index.ts
@@ -15,4 +15,4 @@ export * from './wysiwyg.modalmanager.js';
 export * from './wysiwyg.history.js';
 export * from './dees-wysiwyg-block.js';
 export * from './dees-slash-menu.js';
-export * from './dees-formatting-menu.js';
\ No newline at end of file
+export * from './dees-formatting-menu.js';
diff --git a/ts_web/elements/dees-stepper/dees-stepper.demo.ts b/ts_web/elements/dees-stepper/dees-stepper.demo.ts
new file mode 100644
index 0000000..c8eae72
--- /dev/null
+++ b/ts_web/elements/dees-stepper/dees-stepper.demo.ts
@@ -0,0 +1,134 @@
+import { html } from '@design.estate/dees-element';
+
+export const stepperDemo = () => html`
+  <dees-stepper
+    .steps=${[
+      {
+        title: 'Account Setup',
+        content: html`
+          <dees-form>
+            <dees-input-text key="email" label="Work Email" required></dees-input-text>
+            <dees-input-text key="password" label="Create Password" type="password" required></dees-input-text>
+            <dees-form-submit>Continue</dees-form-submit>
+          </dees-form>
+        `,
+        validationFunc: async (stepperArg, elementArg) => {
+          const deesForm = elementArg.querySelector('dees-form');
+          deesForm.addEventListener('formData', () => stepperArg.goNext(), { once: true });
+        },
+      },
+      {
+        title: 'Profile Details',
+        content: html`
+          <dees-form>
+            <dees-input-text key="firstName" label="First Name" required></dees-input-text>
+            <dees-input-text key="lastName" label="Last Name" required></dees-input-text>
+            <dees-form-submit>Continue</dees-form-submit>
+          </dees-form>
+        `,
+        validationFunc: async (stepperArg, elementArg) => {
+          const deesForm = elementArg.querySelector('dees-form');
+          deesForm.addEventListener('formData', () => stepperArg.goNext(), { once: true });
+        },
+      },
+      {
+        title: 'Contact Information',
+        content: html`
+          <dees-form>
+            <dees-input-phone key="phone" label="Mobile Number" required></dees-input-phone>
+            <dees-input-text key="company" label="Company"></dees-input-text>
+            <dees-form-submit>Continue</dees-form-submit>
+          </dees-form>
+        `,
+        validationFunc: async (stepperArg, elementArg) => {
+          const deesForm = elementArg.querySelector('dees-form');
+          deesForm.addEventListener('formData', () => stepperArg.goNext(), { once: true });
+        },
+      },
+      {
+        title: 'Team Size',
+        content: html`
+          <dees-form>
+            <dees-input-dropdown
+              key="teamSize"
+              label="How big is your team?"
+              .options=${[
+                { label: '1-5', value: '1-5' },
+                { label: '6-20', value: '6-20' },
+                { label: '21-50', value: '21-50' },
+                { label: '51+', value: '51+' },
+              ]}
+              required
+            ></dees-input-dropdown>
+            <dees-form-submit>Continue</dees-form-submit>
+          </dees-form>
+        `,
+        validationFunc: async (stepperArg, elementArg) => {
+          const deesForm = elementArg.querySelector('dees-form');
+          deesForm.addEventListener('formData', () => stepperArg.goNext(), { once: true });
+        },
+      },
+      {
+        title: 'Goals',
+        content: html`
+          <dees-form>
+            <dees-input-multitoggle
+              key="goal"
+              label="Main objective"
+              .options=${[
+                { label: 'Onboarding', value: 'onboarding' },
+                { label: 'Analytics', value: 'analytics' },
+                { label: 'Automation', value: 'automation' },
+              ]}
+              required
+            ></dees-input-multitoggle>
+            <dees-form-submit>Continue</dees-form-submit>
+          </dees-form>
+        `,
+        validationFunc: async (stepperArg, elementArg) => {
+          const deesForm = elementArg.querySelector('dees-form');
+          deesForm.addEventListener('formData', () => stepperArg.goNext(), { once: true });
+        },
+      },
+      {
+        title: 'Brand Preferences',
+        content: html`
+          <dees-form>
+            <dees-input-text key="brandColor" label="Primary brand color"></dees-input-text>
+            <dees-input-text key="tone" label="Preferred tone (e.g. friendly, formal)"></dees-input-text>
+            <dees-form-submit>Continue</dees-form-submit>
+          </dees-form>
+        `,
+        validationFunc: async (stepperArg, elementArg) => {
+          const deesForm = elementArg.querySelector('dees-form');
+          deesForm.addEventListener('formData', () => stepperArg.goNext(), { once: true });
+        },
+      },
+      {
+        title: 'Integrations',
+        content: html`
+          <dees-form>
+            <dees-input-list
+              key="integrations"
+              label="Integrations in use"
+              placeholder="Add integration"
+            ></dees-input-list>
+            <dees-form-submit>Continue</dees-form-submit>
+          </dees-form>
+        `,
+        validationFunc: async (stepperArg, elementArg) => {
+          const deesForm = elementArg.querySelector('dees-form');
+          deesForm.addEventListener('formData', () => stepperArg.goNext(), { once: true });
+        },
+      },
+      {
+        title: 'Review & Launch',
+        content: html`
+          <dees-panel>
+            <p>Almost there! Review your selections and launch whenever you're ready.</p>
+          </dees-panel>
+        `,
+      },
+    ] as const}
+  ></dees-stepper>
+`;
diff --git a/ts_web/elements/dees-stepper/dees-stepper.ts b/ts_web/elements/dees-stepper/dees-stepper.ts
index ea6188b..5d3c905 100644
--- a/ts_web/elements/dees-stepper/dees-stepper.ts
+++ b/ts_web/elements/dees-stepper/dees-stepper.ts
@@ -14,6 +14,7 @@ import {
 } from '@design.estate/dees-element';
 
 import * as domtools from '@design.estate/dees-domtools';
+import { stepperDemo } from './dees-stepper.demo.js';
 
 export interface IStep {
   title: string;
@@ -31,139 +32,7 @@ declare global {
 
 @customElement('dees-stepper')
 export class DeesStepper extends DeesElement {
-  public static demo = () =>
-    html`
-      <dees-stepper
-        .steps=${[
-          {
-            title: 'Account Setup',
-            content: html`
-              <dees-form>
-                <dees-input-text key="email" label="Work Email" required></dees-input-text>
-                <dees-input-text key="password" label="Create Password" type="password" required></dees-input-text>
-                <dees-form-submit>Continue</dees-form-submit>
-              </dees-form>
-            `,
-            validationFunc: async (stepperArg, elementArg) => {
-              const deesForm = elementArg.querySelector('dees-form');
-              deesForm.addEventListener('formData', () => stepperArg.goNext(), { once: true });
-            },
-          },
-          {
-            title: 'Profile Details',
-            content: html`
-              <dees-form>
-                <dees-input-text key="firstName" label="First Name" required></dees-input-text>
-                <dees-input-text key="lastName" label="Last Name" required></dees-input-text>
-                <dees-form-submit>Continue</dees-form-submit>
-              </dees-form>
-            `,
-            validationFunc: async (stepperArg, elementArg) => {
-              const deesForm = elementArg.querySelector('dees-form');
-              deesForm.addEventListener('formData', () => stepperArg.goNext(), { once: true });
-            },
-          },
-          {
-            title: 'Contact Information',
-            content: html`
-              <dees-form>
-                <dees-input-phone key="phone" label="Mobile Number" required></dees-input-phone>
-                <dees-input-text key="company" label="Company"></dees-input-text>
-                <dees-form-submit>Continue</dees-form-submit>
-              </dees-form>
-            `,
-            validationFunc: async (stepperArg, elementArg) => {
-              const deesForm = elementArg.querySelector('dees-form');
-              deesForm.addEventListener('formData', () => stepperArg.goNext(), { once: true });
-            },
-          },
-          {
-            title: 'Team Size',
-            content: html`
-              <dees-form>
-                <dees-input-dropdown
-                  key="teamSize"
-                  label="How big is your team?"
-                  .options=${[
-                    { label: '1-5', value: '1-5' },
-                    { label: '6-20', value: '6-20' },
-                    { label: '21-50', value: '21-50' },
-                    { label: '51+', value: '51+' },
-                  ]}
-                  required
-                ></dees-input-dropdown>
-                <dees-form-submit>Continue</dees-form-submit>
-              </dees-form>
-            `,
-            validationFunc: async (stepperArg, elementArg) => {
-              const deesForm = elementArg.querySelector('dees-form');
-              deesForm.addEventListener('formData', () => stepperArg.goNext(), { once: true });
-            },
-          },
-          {
-            title: 'Goals',
-            content: html`
-              <dees-form>
-                <dees-input-multitoggle
-                  key="goal"
-                  label="Main objective"
-                  .options=${[
-                    { label: 'Onboarding', value: 'onboarding' },
-                    { label: 'Analytics', value: 'analytics' },
-                    { label: 'Automation', value: 'automation' },
-                  ]}
-                  required
-                ></dees-input-multitoggle>
-                <dees-form-submit>Continue</dees-form-submit>
-              </dees-form>
-            `,
-            validationFunc: async (stepperArg, elementArg) => {
-              const deesForm = elementArg.querySelector('dees-form');
-              deesForm.addEventListener('formData', () => stepperArg.goNext(), { once: true });
-            },
-          },
-          {
-            title: 'Brand Preferences',
-            content: html`
-              <dees-form>
-                <dees-input-text key="brandColor" label="Primary brand color"></dees-input-text>
-                <dees-input-text key="tone" label="Preferred tone (e.g. friendly, formal)"></dees-input-text>
-                <dees-form-submit>Continue</dees-form-submit>
-              </dees-form>
-            `,
-            validationFunc: async (stepperArg, elementArg) => {
-              const deesForm = elementArg.querySelector('dees-form');
-              deesForm.addEventListener('formData', () => stepperArg.goNext(), { once: true });
-            },
-          },
-          {
-            title: 'Integrations',
-            content: html`
-              <dees-form>
-                <dees-input-list
-                  key="integrations"
-                  label="Integrations in use"
-                  placeholder="Add integration"
-                ></dees-input-list>
-                <dees-form-submit>Continue</dees-form-submit>
-              </dees-form>
-            `,
-            validationFunc: async (stepperArg, elementArg) => {
-              const deesForm = elementArg.querySelector('dees-form');
-              deesForm.addEventListener('formData', () => stepperArg.goNext(), { once: true });
-            },
-          },
-          {
-            title: 'Review & Launch',
-            content: html`
-              <dees-panel>
-                <p>Almost there! Review your selections and launch whenever you're ready.</p>
-              </dees-panel>
-            `,
-          },
-        ] as IStep[]}
-      ></dees-stepper>
-    `;
+  public static demo = stepperDemo;
 
   @property({
     type: Array,