diff --git a/src/components/SearchInput/stories/docs/component.md b/src/components/SearchInput/SearchInput.mdx
similarity index 54%
rename from src/components/SearchInput/stories/docs/component.md
rename to src/components/SearchInput/SearchInput.mdx
index 1adc87e4..cd743181 100644
--- a/src/components/SearchInput/stories/docs/component.md
+++ b/src/components/SearchInput/SearchInput.mdx
@@ -1,4 +1,12 @@
-Invite users to search for something.
+import { Meta, Canvas } from '@storybook/blocks';
+
+import * as SearchInputStories from './SearchInput.stories.svelte';
+
+<Meta of={SearchInputStories} />
+
+# SearchInput
+
+The `SearchInput` component creates a search bar.
 
 ```svelte
 <script>
@@ -13,5 +21,7 @@ Invite users to search for something.
   }
 </script>
 
-<SearchInput on:search="{handleSearchInput}" />
+<SearchInput on:search={handleSearchInput} />
 ```
+
+<Canvas of={SearchInputStories.Demo} />
\ No newline at end of file
diff --git a/src/components/SearchInput/SearchInput.stories.svelte b/src/components/SearchInput/SearchInput.stories.svelte
index 55fbdf5a..bca718e7 100644
--- a/src/components/SearchInput/SearchInput.stories.svelte
+++ b/src/components/SearchInput/SearchInput.stories.svelte
@@ -1,26 +1,11 @@
 <script module lang="ts">
-  // @ts-ignore raw
-  import componentDocs from './stories/docs/component.md?raw';
-
+  import { defineMeta } from '@storybook/addon-svelte-csf';
   import SearchInput from './SearchInput.svelte';
 
-  import { withComponentDocs } from '$lib/docs/utils/withParams.js';
-
-  export const meta = {
+  const { Story } = defineMeta({
     title: 'Components/Controls/SearchInput',
     component: SearchInput,
-    ...withComponentDocs(componentDocs),
-  };
+  });
 </script>
 
-<script>
-  import { Template, Story } from '@storybook/addon-svelte-csf';
-</script>
-
-<Template >
-  {#snippet children({ args })}
-    <SearchInput {...args} />
-  {/snippet}
-</Template>
-
-<Story name="Default" args="{{}}" />
+<Story name="Demo" />
\ No newline at end of file
diff --git a/src/components/SearchInput/SearchInput.svelte b/src/components/SearchInput/SearchInput.svelte
index b0761c69..c89a83dc 100644
--- a/src/components/SearchInput/SearchInput.svelte
+++ b/src/components/SearchInput/SearchInput.svelte
@@ -1,14 +1,10 @@
 <!-- @component `SearchInput` [Read the docs.](https://reuters-graphics.github.io/graphics-components/?path=/docs/components-controls-searchinput--docs) -->
 <script lang="ts">
-  import { createEventDispatcher } from 'svelte';
-  import MagnifyingGlass from './MagnifyingGlass.svelte';
-  import X from './X.svelte';
+  import MagnifyingGlass from './components/MagnifyingGlass.svelte';
+  import X from './components/X.svelte';
 
   interface Props {
-    /**
-     * The placeholder text that appears in the search box.
-     * @type {string}
-     */
+    /** The placeholder text that appears in the search box.*/
     searchPlaceholder?: string;
   }
 
@@ -17,16 +13,8 @@
   let value = $state('');
   let active = $derived(value !== '');
 
-  const dispatch = createEventDispatcher();
-
-  function input(event) {
-    value = event.target.value;
-    dispatch('search', { value });
-  }
-
   function clear() {
     value = '';
-    dispatch('search', { value: '' });
   }
 </script>
 
@@ -38,24 +26,23 @@
     id="search--input"
     class="search--input body-caption pl-8"
     type="text"
-    placeholder="{searchPlaceholder}"
-    oninput="{input}"
+    placeholder={searchPlaceholder}
     bind:value
   />
   <div
     class="search--x absolute"
     role="button"
     tabindex="0"
-    class:invisible="{!active}"
-    onclick="{clear}"
-    onkeyup="{clear}"
+    class:invisible={!active}
+    onclick={clear}
+    onkeyup={clear}
   >
     <X />
   </div>
 </div>
 
 <style lang="scss">
-  @use '../../scss/mixins' as *;
+  @use '../../scss/mixins' as mixins;
 
   .search {
     width: 250px;
@@ -64,11 +51,11 @@
       top: 0.55rem;
       width: 1.5rem;
       height: 1.5rem;
-      fill: $theme-colour-brand-rules;
+      fill: mixins.$theme-colour-brand-rules;
     }
     .search--input {
       height: 2.15rem;
-      border: 1px solid $theme-colour-brand-rules;
+      border: 1px solid mixins.$theme-colour-brand-rules;
       background: transparent;
       border-radius: 0.25rem;
       width: 100%;
@@ -78,11 +65,11 @@
       top: 0.55rem;
       width: 1.5rem;
       height: 1.5rem;
-      fill: $theme-colour-text-primary;
+      fill: mixins.$theme-colour-text-primary;
       cursor: pointer;
       &.invisible {
         display: none;
       }
     }
   }
-</style>
+</style>
\ No newline at end of file
diff --git a/src/components/SearchInput/MagnifyingGlass.svelte b/src/components/SearchInput/components/MagnifyingGlass.svelte
similarity index 94%
rename from src/components/SearchInput/MagnifyingGlass.svelte
rename to src/components/SearchInput/components/MagnifyingGlass.svelte
index 1310ae96..c144a167 100644
--- a/src/components/SearchInput/MagnifyingGlass.svelte
+++ b/src/components/SearchInput/components/MagnifyingGlass.svelte
@@ -11,11 +11,11 @@
 </svg>
 
 <style lang="scss">
-  @use '../../scss/mixins' as *;
+  @use '../../../scss/mixins' as mixins;
   svg {
     vertical-align: middle;
     path {
-      fill: $theme-colour-brand-rules;
+      fill: mixins.$theme-colour-brand-rules;
     }
   }
-</style>
+</style>
\ No newline at end of file
diff --git a/src/components/SearchInput/X.svelte b/src/components/SearchInput/components/X.svelte
similarity index 93%
rename from src/components/SearchInput/X.svelte
rename to src/components/SearchInput/components/X.svelte
index 8dfdf8c1..a774df7f 100644
--- a/src/components/SearchInput/X.svelte
+++ b/src/components/SearchInput/components/X.svelte
@@ -20,14 +20,14 @@
 </svg>
 
 <style lang="scss">
-  @use '../../scss/mixins' as *;
+  @use '../../../scss/mixins' as mixins;
   svg {
     vertical-align: middle;
     path {
-      fill: $theme-colour-brand-rules;
+      fill: mixins.$theme-colour-brand-rules;
     }
     rect {
-      fill: $theme-colour-background;
+      fill: mixins.$theme-colour-background;
     }
   }
-</style>
+</style>
\ No newline at end of file