diff --git a/.vscode/settings.json b/.vscode/settings.json
index fbaef8e1..a8ef4c90 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -12,7 +12,7 @@
     "editor.wordWrap": "on"
   },
   "[svelte]": {
-     "editor.defaultFormatter": "svelte.svelte-vscode"
-   },
+    "editor.defaultFormatter": "svelte.svelte-vscode"
+  },
   "typescript.tsdk": "node_modules/typescript/lib"
 }
diff --git a/bin/newComponent/template/YourComponent/YourComponent.stories.svelte b/bin/newComponent/template/YourComponent/YourComponent.stories.svelte
index 097cd64e..837857c9 100644
--- a/bin/newComponent/template/YourComponent/YourComponent.stories.svelte
+++ b/bin/newComponent/template/YourComponent/YourComponent.stories.svelte
@@ -28,7 +28,7 @@
   import SharkImg from './stories/shark.jpg';
 </script>
 
-<Template >
+<Template>
   {#snippet children({ args })}
     <YourComponent {...args} />
   {/snippet}
@@ -36,9 +36,9 @@
 
 <Story
   name="Default"
-  args="{{
+  args={{
     width: 'normal',
     src: SharkImg,
     altText: "Duh dum! It's a shark!!",
-  }}"
+  }}
 />
diff --git a/bin/newComponent/template/YourComponent/YourComponent.svelte b/bin/newComponent/template/YourComponent/YourComponent.svelte
index fafaa8ff..364fb89e 100644
--- a/bin/newComponent/template/YourComponent/YourComponent.svelte
+++ b/bin/newComponent/template/YourComponent/YourComponent.svelte
@@ -36,8 +36,8 @@
 
 <Block {width} {id} class="photo {cls}">
   <div
-    style:background-image="{`url(${src})`}"
-    style:height="{`${height}px`}"
+    style:background-image={`url(${src})`}
+    style:height={`${height}px`}
   ></div>
   <p class="visually-hidden">{altText}</p>
 </Block>
diff --git a/package.json b/package.json
index ac599ebb..90b58bcd 100644
--- a/package.json
+++ b/package.json
@@ -110,7 +110,8 @@
     "dayjs": "^1.11.13",
     "journalize": "^2.6.0",
     "lodash-es": "^4.17.21",
-    "marked": "^4.3.0",
+    "marked": "^15.0.7",
+    "marked-smartypants": "^1.1.9",
     "proper-url-join": "^2.1.2",
     "pym.js": "^1.3.2",
     "slugify": "^1.6.6",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4472d286..1b56a901 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -33,8 +33,11 @@ importers:
         specifier: ^4.17.21
         version: 4.17.21
       marked:
-        specifier: ^4.3.0
-        version: 4.3.0
+        specifier: ^15.0.7
+        version: 15.0.7
+      marked-smartypants:
+        specifier: ^1.1.9
+        version: 1.1.9(marked@15.0.7)
       proper-url-join:
         specifier: ^2.1.2
         version: 2.1.2
@@ -2968,9 +2971,14 @@ packages:
   markdown-table@3.0.4:
     resolution: {integrity: sha512-wiYz4+JrLyb/DqW2hkFJxP7Vd7JuTDm77fvbM8VfEQdmSMqcImWeeRbHwZjBjIFki/VaMK2BhFi7oUUZeM5bqw==}
 
-  marked@4.3.0:
-    resolution: {integrity: sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==}
-    engines: {node: '>= 12'}
+  marked-smartypants@1.1.9:
+    resolution: {integrity: sha512-VPeuaUr5IWptI7nJdgQ9ugrLWYGv13NdzEXTtKY3cmB4aRWOI2RzhLlf+xQp6Wnob9SAPO2sNVlfSJr+nflk/A==}
+    peerDependencies:
+      marked: '>=4 <16'
+
+  marked@15.0.7:
+    resolution: {integrity: sha512-dgLIeKGLx5FwziAnsk4ONoGwHwGPJzselimvlVskE9XLN4Orv9u2VA3GWw/lYUqjfA0rUT/6fqKwfZJapP9BEg==}
+    engines: {node: '>= 18'}
     hasBin: true
 
   math-intrinsics@1.1.0:
@@ -3909,6 +3917,10 @@ packages:
     resolution: {integrity: sha512-h+z7HKHYXj6wJU+AnS/+IH8Uh9fdcX1Lrhg1/VMdf9PwoBQXFcXiAdsy2tSK0P6gKwJLXp02r90ahUCqHk9rrw==}
     engines: {node: '>=8.0.0'}
 
+  smartypants@0.2.2:
+    resolution: {integrity: sha512-TzobUYoEft/xBtb2voRPryAUIvYguG0V7Tt3de79I1WfXgCwelqVsGuZSnu3GFGRZhXR90AeEYIM+icuB/S06Q==}
+    hasBin: true
+
   smol-toml@1.3.1:
     resolution: {integrity: sha512-tEYNll18pPKHroYSmLLrksq233j021G0giwW7P3D24jC54pQ5W5BXMsQ/Mvw1OJCmEYDgY+lrzT+3nNUtoNfXQ==}
     engines: {node: '>= 18'}
@@ -7598,7 +7610,12 @@ snapshots:
 
   markdown-table@3.0.4: {}
 
-  marked@4.3.0: {}
+  marked-smartypants@1.1.9(marked@15.0.7):
+    dependencies:
+      marked: 15.0.7
+      smartypants: 0.2.2
+
+  marked@15.0.7: {}
 
   math-intrinsics@1.1.0: {}
 
@@ -8979,6 +8996,8 @@ snapshots:
 
   slugify@1.6.6: {}
 
+  smartypants@0.2.2: {}
+
   smol-toml@1.3.1: {}
 
   snake-case@3.0.4:
diff --git a/src/actions/cssVariables/cssVariables.mdx b/src/actions/cssVariables/cssVariables.mdx
index 4e48eb38..fb5f97a9 100644
--- a/src/actions/cssVariables/cssVariables.mdx
+++ b/src/actions/cssVariables/cssVariables.mdx
@@ -22,7 +22,7 @@ An action you can use to easily set [CSS variables](https://developer.mozilla.or
 </script>
 
 <!-- Attach it to a parent element with the action -->
-<div use:cssVariables="{variables}">
+<div use:cssVariables={variables}>
   <p>My text...</p>
 </div>
 
diff --git a/src/actions/resizeObserver/resizeObserver.mdx b/src/actions/resizeObserver/resizeObserver.mdx
index e7a57ebe..b56549ad 100644
--- a/src/actions/resizeObserver/resizeObserver.mdx
+++ b/src/actions/resizeObserver/resizeObserver.mdx
@@ -14,7 +14,7 @@ An action you can use to easily to check when a DOM element's dimensions change
   let elementWidth = 0;
 </script>
 
-<div use:resizeObserver="{(element) => (elementWidth = element.clientWidth)}">
+<div use:resizeObserver={(element) => (elementWidth = element.clientWidth)}>
   My width is: {elementWidth}
 </div>
 ```
diff --git a/src/app.html b/src/app.html
index 7bf73d49..61516813 100644
--- a/src/app.html
+++ b/src/app.html
@@ -1,11 +1,11 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  %sveltekit.head%
-</head>
-<body>
-  %sveltekit.body%
-</body>
-</html>
\ No newline at end of file
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    %sveltekit.head%
+  </head>
+  <body>
+    %sveltekit.body%
+  </body>
+</html>
diff --git a/src/components/@types/global.ts b/src/components/@types/global.ts
index 5dfd180e..1fdd2141 100644
--- a/src/components/@types/global.ts
+++ b/src/components/@types/global.ts
@@ -48,3 +48,18 @@ export interface ScrollerStep {
    */
   foregroundProps?: object;
 }
+
+export interface PhotoCarouselImage {
+  /**  Image source */
+  src: string;
+  /** Image alt text  */
+  altText: string;
+  /** Optional caption */
+  caption?: string;
+  /** Optional credit */
+  credit?: string;
+  /** Optional object-fit rule */
+  objectFit?: string;
+  /** Optional object-position rule */
+  objectPosition?: string;
+}
diff --git a/src/components/Analytics/Analytics.mdx b/src/components/Analytics/Analytics.mdx
index 8b39f502..60e7afd2 100644
--- a/src/components/Analytics/Analytics.mdx
+++ b/src/components/Analytics/Analytics.mdx
@@ -6,7 +6,7 @@ import * as AnalyticsStories from './Analytics.stories.svelte';
 
 # Analytics
 
-Add Google and Chartbeat analytics to your page.
+The `Analytics` component adds Google and Chartbeat analytics to your page.
 
 ```svelte
 <script>
@@ -42,7 +42,7 @@ For example, the following excludes analytics from pages in development or hoste
 
 If you're using analytics to measure a multipage newsapp that uses [client-side routing](https://kit.svelte.dev/docs/glossary#routing), then you may need to trigger analytics after virtual page navigation.
 
-This component also exports a function you can call to register pageviews.
+This component exports a function you can call to register pageviews.
 
 For example, here's how you can use SvelteKit's [`afterNavigate`](https://kit.svelte.dev/docs/modules#$app-navigation-afternavigate) lifecycle to capture additional pageviews:
 
diff --git a/src/components/Analytics/Analytics.stories.svelte b/src/components/Analytics/Analytics.stories.svelte
index bbb7031f..cf9c24a1 100644
--- a/src/components/Analytics/Analytics.stories.svelte
+++ b/src/components/Analytics/Analytics.stories.svelte
@@ -1,5 +1,5 @@
 <script module lang="ts">
-  import { defineMeta, type Args } from '@storybook/addon-svelte-csf';
+  import { defineMeta } from '@storybook/addon-svelte-csf';
   import Analytics from './Analytics.svelte';
 
   const { Story } = defineMeta({
@@ -8,15 +8,10 @@
   });
 </script>
 
-{#snippet template(args: Args<typeof Story>)}
-  <Analytics {...args} />
-  <div>Nothing to see here</div>
-{/snippet}
-
 <Story
   name="Demo"
+  tags={['!autodocs', '!dev']}
   args={{
     authors: [{ name: 'Jane Doe' }, { name: 'John Doe' }],
   }}
-  children={template}
 />
diff --git a/src/components/Analytics/Analytics.svelte b/src/components/Analytics/Analytics.svelte
index c623e547..e8b5ce14 100644
--- a/src/components/Analytics/Analytics.svelte
+++ b/src/components/Analytics/Analytics.svelte
@@ -1,3 +1,5 @@
+<!-- @component `Analytics` [Read the docs.](https://reuters-graphics.github.io/graphics-components/?path=/docs/components-ads-analytics-analytics--docs) -->
+
 <script module>
   import { registerPageview as registerChartbeatPageview } from './providers/chartbeat';
   import { registerPageview as registerGAPageview } from './providers/ga';
@@ -13,7 +15,6 @@
   export { registerPageview };
 </script>
 
-<!-- @component `Analytics` [Read the docs.](https://reuters-graphics.github.io/graphics-components/?path=/docs/components-ads-analytics-analytics--docs) -->
 <script lang="ts">
   interface Author {
     name: string;
diff --git a/src/components/Analytics/stories/docs/component.md b/src/components/Analytics/stories/docs/component.md
deleted file mode 100644
index 1ddd7b8e..00000000
--- a/src/components/Analytics/stories/docs/component.md
+++ /dev/null
@@ -1,11 +0,0 @@
-Add Google and Chartbeat analytics to your page.
-
-```svelte
-<script>
-  import { Analytics } from '@reuters-graphics/graphics-components';
-
-  const authors = [{ name: 'Jane Doe' }, { name: 'John Doe' }];
-</script>
-
-<Analytics authors="{authors}" />
-```
diff --git a/src/components/Analytics/stories/docs/environments.md b/src/components/Analytics/stories/docs/environments.md
deleted file mode 100644
index 74089219..00000000
--- a/src/components/Analytics/stories/docs/environments.md
+++ /dev/null
@@ -1,17 +0,0 @@
-Generally, you only want to send page analytics in production environments.
-
-In a SvelteKit context, you can use `$app` stores to restrict when you send analytics.
-
-For example, the following excludes analytics from pages in development or hosted on our preview server:
-
-```svelte
-<script>
-  import { Analytics } from '@reuters-graphics/graphics-components';
-  import { dev } from '$app/environment';
-  import { page } from '$app/stores';
-</script>
-
-{#if !dev && $page.url?.hostname !== 'graphics.thomsonreuters.com'}
-  <Analytics />
-{/if}
-```
diff --git a/src/components/Analytics/stories/docs/multipage.md b/src/components/Analytics/stories/docs/multipage.md
deleted file mode 100644
index a3223927..00000000
--- a/src/components/Analytics/stories/docs/multipage.md
+++ /dev/null
@@ -1,31 +0,0 @@
-If you're using analytics to measure a multipage newsapp that uses [client-side routing](https://kit.svelte.dev/docs/glossary#routing), then you may need to trigger analytics after virtual page navigation.
-
-This component also exports a function you can call to register pageviews.
-
-For example, here's how you can use SvelteKit's [`afterNavigate`](https://kit.svelte.dev/docs/modules#$app-navigation-afternavigate) lifecycle to capture additional pageviews:
-
-```svelte
-<script>
-  import {
-    Analytics,
-    registerPageview,
-  } from '@reuters-graphics/graphics-components';
-  import { afterNavigate } from '$app/navigation';
-
-  let isFirstPageview = true;
-
-  afterNavigate(() => {
-    // We shouldn't fire on initial page load because the Analytics component
-    // already registers a reader's first pageview. After this component
-    // has initially mounted, we can be sure that further navigation is virtual
-    // and register pageviews using this function.
-    if (!isFirstPageview) {
-      registerPageview();
-    } else {
-      isFirstPageview = false;
-    }
-  });
-</script>
-
-<Analytics />
-```
diff --git a/src/components/BeforeAfter/BeforeAfter.mdx b/src/components/BeforeAfter/BeforeAfter.mdx
new file mode 100644
index 00000000..e85451b9
--- /dev/null
+++ b/src/components/BeforeAfter/BeforeAfter.mdx
@@ -0,0 +1,111 @@
+import { Meta, Canvas } from '@storybook/blocks';
+
+import * as BeforeAfterStories from './BeforeAfter.stories.svelte';
+
+<Meta of={BeforeAfterStories} />
+
+# BeforeAfter
+
+The `BeforeAfter` component shows a before-and-after comparison of an image.
+
+```svelte
+<script>
+  import { BeforeAfter } from '@reuters-graphics/graphics-components';
+  import { assets } from '$app/paths'; // 👈 If using in the Graphics Kit...
+</script>
+
+<BeforeAfter
+  beforeSrc={`${assets}/images/before-after/myrne-before.jpg`}
+  beforeAlt="Satellite image of Russian base at Myrne taken on July 7, 2020."
+  afterSrc={`${assets}/images/before-after/myrne-after.jpg`}
+  afterAlt="Satellite image of Russian base at Myrne taken on Oct. 20, 2020."
+/>
+```
+
+<Canvas of={BeforeAfterStories.Demo} />
+
+## Using with ArchieML docs
+
+With the Graphics Kit, you'll likely get your text value from an ArchieML doc...
+
+```yaml
+# ArchieML doc
+[blocks]
+
+type: before-after
+beforeSrc: images/before-after/myrne-before.jpg
+beforeAlt: Satellite image of Russian base at Myrne taken on July 7, 2020.
+afterSrc: images/before-after/myrne-after.jpg
+afterAlt: Satellite image of Russian base at Myrne taken on Oct. 20, 2020.
+
+[]
+```
+
+... which you'll parse out of a ArchieML block object before passing to the `BeforeAfter` component.
+
+```svelte
+<!-- App.svelte -->
+{#each content.blocks as block}
+  {#if block.type === 'before-after'}
+    <BeforeAfter
+      beforeSrc={`${assets}/${block.beforeSrc}`}
+      beforeAlt={block.beforeAlt}
+      afterSrc={`${assets}/${block.afterSrc}`}
+      afterAlt={block.afterAlt}
+    />
+  {/if}
+{/each}
+```
+
+<Canvas of={BeforeAfterStories.Demo} />
+
+## Adding text
+
+To add text overlays and captions, use [snippets](https://svelte.dev/docs/svelte/snippet) for `beforeOverlay`, `afterOverlay` and `caption`. You can style the snippets to match your page design, like in [this demo](./?path=/story/components-multimedia-beforeafter--with-overlays).
+
+> 💡**NOTE:** The text in the overlays are used as [ARIA descriptions](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Attributes/aria-describedby) for your before and after images. You must always use the `beforeAlt` / `afterAlt` props to label your image for visually impaired readers, but these ARIA descriptions provide additional information or context that the reader might need.
+
+```svelte
+<BeforeAfter
+  beforeSrc={beforeImg}
+  beforeAlt="Satellite image of Russian base at Myrne taken on July 7, 2020."
+  afterSrc={afterImg}
+  afterAlt="Satellite image of Russian base at Myrne taken on Oct. 20, 2020."
+>
+  <!-- Optional custom text overlay for the before image -->
+  {#snippet beforeOverlay()}
+    <div class="overlay p-3 before text-left">
+      <p class="h4 font-bold">July 7, 2020</p>
+      <p class="body-note">Initially, this site was far smaller.</p>
+    </div>
+  {/snippet}
+
+  <!-- Optional custom text overlay for the after image -->
+  {#snippet afterOverlay()}
+    <div class="overlay p-3 after text-right">
+      <p class="h4 font-bold">Oct. 20, 2020</p>
+      <p class="body-note">But then forces built up.</p>
+    </div>
+  {/snippet}
+
+  <!-- Optional custom caption for both images -->
+  {#snippet caption()}
+    <p class="body-note">Photos by MAXAR Technologies, 2021.</p>
+  {/snippet}
+</BeforeAfter>
+
+<style lang="scss">
+  .overlay {
+    background: rgba(0, 0, 0, 0.45);
+    max-width: 350px;
+    &.after {
+      text-align: right;
+    }
+    p {
+      color: #ffffff;
+    }
+  }
+</style>
+```
+
+<Canvas of={BeforeAfterStories.WithText} />
diff --git a/src/components/BeforeAfter/BeforeAfter.stories.svelte b/src/components/BeforeAfter/BeforeAfter.stories.svelte
index d2f79821..74ef3be3 100644
--- a/src/components/BeforeAfter/BeforeAfter.stories.svelte
+++ b/src/components/BeforeAfter/BeforeAfter.stories.svelte
@@ -1,19 +1,10 @@
-<!-- @migration-task Error while migrating Svelte code: end is out of bounds -->
-<script context="module" lang="ts">
+<script module lang="ts">
+  import { defineMeta } from '@storybook/addon-svelte-csf';
   import BeforeAfter from './BeforeAfter.svelte';
-  // @ts-ignore raw
-  import componentDocs from './stories/docs/component.md?raw';
-  // @ts-ignore raw
-  import withOverlaysDocs from './stories/docs/withOverlays.md?raw';
-  // @ts-ignore raw
-  import ariaDescriptionsDocs from './stories/docs/ariaDescriptions.md?raw';
 
-  import { withComponentDocs, withStoryDocs } from '$docs/utils/withParams.js';
-
-  export const meta = {
-    title: 'Components/Graphics/BeforeAfter',
+  const { Story } = defineMeta({
+    title: 'Components/Multimedia/BeforeAfter',
     component: BeforeAfter,
-    ...withComponentDocs(componentDocs),
     argTypes: {
       handleColour: { control: 'color' },
       width: {
@@ -21,96 +12,54 @@
         options: ['normal', 'wide', 'wider', 'widest', 'fluid'],
       },
     },
-  };
+  });
 </script>
 
 <script>
-  import { Template, Story } from '@storybook/addon-svelte-csf';
-
-  // @ts-ignore raw
-  import beforeImg from './stories/myrne-before.jpg';
-  // @ts-ignore raw
-  import afterImg from './stories/myrne-after.jpg';
+  import beforeImg from './images/myrne-before.jpg';
+  import afterImg from './images/myrne-after.jpg';
 </script>
 
-<Template let:args>
-  <BeforeAfter {...args} />
-</Template>
-
 <Story
-  name="Default"
-  args="{{
+  name="Demo"
+  args={{
     beforeSrc: beforeImg,
     beforeAlt:
       'Satellite image of Russian base at Myrne taken on July 7, 2020.',
     afterSrc: afterImg,
     afterAlt:
       'Satellite image of Russian base at Myrne taken on Oct. 20, 2020.',
-  }}"
+  }}
 />
 
-<Story name="With overlays" {...withStoryDocs(withOverlaysDocs)}>
+<Story name="With text" exportName="WithText">
   <BeforeAfter
-    beforeSrc="{beforeImg}"
+    beforeSrc={beforeImg}
     beforeAlt="Satellite image of Russian base at Myrne taken on July 7, 2020."
-    afterSrc="{afterImg}"
+    afterSrc={afterImg}
     afterAlt="Satellite image of Russian base at Myrne taken on Oct. 20, 2020."
   >
-    <div slot="beforeOverlay" class="overlay p-3 before">
-      <p class="h4 font-bold">July 7, 2020</p>
-      <p class="body-note">Initially, this site was far smaller.</p>
-    </div>
-    <div slot="afterOverlay" class="overlay p-3 after">
-      <p class="h4 font-bold">Oct. 20, 2020</p>
-      <p class="body-note">But then forces built up.</p>
-    </div>
-    <p slot="caption">Photos by MAXAR Technologies, 2021.</p>
+    {#snippet beforeOverlay()}
+      <div class="overlay p-3 before text-left">
+        <p class="h4 font-bold">July 7, 2020</p>
+        <p class="body-note">Initially, this site was far smaller.</p>
+      </div>
+    {/snippet}
+    {#snippet afterOverlay()}
+      <div class="overlay p-3 after text-right">
+        <p class="h4 font-bold">Oct. 20, 2020</p>
+        <p class="body-note">But then forces built up.</p>
+      </div>
+    {/snippet}
+    {#snippet caption()}
+      <p class="body-note">Photos by MAXAR Technologies, 2021.</p>
+    {/snippet}
   </BeforeAfter>
 
   <style lang="scss">
     .overlay {
       background: rgba(0, 0, 0, 0.45);
       max-width: 350px;
-      &.after {
-        text-align: right;
-      }
-      p {
-        color: #ffffff;
-      }
-    }
-  </style>
-</Story>
-
-<Story name="ARIA descriptions" {...withStoryDocs(ariaDescriptionsDocs)}>
-  <BeforeAfter
-    beforeSrc="{beforeImg}"
-    beforeAlt="Satellite image of Russian base at Myrne taken on July 7, 2020."
-    afterSrc="{afterImg}"
-    afterAlt="Satellite image of Russian base at Myrne taken on Oct. 20, 2020."
-  >
-    <div let:description="{id}" slot="beforeOverlay" class="overlay p-3">
-      <p class="body-caption" {id}>
-        On July 7, 2020, the base contained only a few transport vehicles.
-      </p>
-    </div>
-    <div let:description="{id}" slot="afterOverlay" class="overlay p-3">
-      <!-- 👇 id can also be used on an element containing multiple text elements -->
-      <div {id}>
-        <p class="body-caption">
-          But by October, tanks and artillery could be seen.
-        </p>
-        <p class="body-caption">
-          In total, over 50 pieces of heavy machinery and 200 personnel are now
-          based here.
-        </p>
-      </div>
-    </div>
-    <p slot="caption">Photos by MAXAR Technologies, 2021.</p>
-  </BeforeAfter>
-  <style lang="scss">
-    div.overlay {
-      max-width: 250px;
-      background: rgba(0, 0, 0, 0.45);
       p {
         color: #ffffff;
       }
diff --git a/src/components/BeforeAfter/BeforeAfter.svelte b/src/components/BeforeAfter/BeforeAfter.svelte
index e6229af5..c3a8dc62 100644
--- a/src/components/BeforeAfter/BeforeAfter.svelte
+++ b/src/components/BeforeAfter/BeforeAfter.svelte
@@ -1,119 +1,149 @@
-<!-- @migration-task Error while migrating Svelte code: Cannot set properties of undefined (setting 'next') -->
 <!-- @component `BeforeAfter` [Read the docs.](https://reuters-graphics.github.io/graphics-components/?path=/docs/components-graphics-beforeafter--docs) -->
 <script lang="ts">
+  import { type Snippet } from 'svelte';
   import { throttle } from 'lodash-es';
-  import { onMount } from 'svelte';
+
   import Block from '../Block/Block.svelte';
-  import type { ContainerWidth } from '../@types/global';
   import PaddingReset from '../PaddingReset/PaddingReset.svelte';
+  import type { ContainerWidth } from '../@types/global';
+  import { random4 } from '../../utils/';
 
-  /** Width of the chart within the text well. */
-  export let width: ContainerWidth = 'normal'; // options: wide, wider, widest, fluid
-  /** Height of the component */
-  export let height = 600;
+  interface Props {
+    /** Width of the chart within the text well. Options: wide, wider, widest, fluid */
+    width?: ContainerWidth;
+    /** Height of the component */
+    height?: number;
+    /**
+     * If set, makes the height a ratio of the component's width.
+     */
+    heightRatio?: number;
+    /**
+     * Before image source
+     */
+    beforeSrc: string;
+    /**
+     * Before image altText
+     */
+    beforeAlt: string;
+    /**
+     * After image source
+     */
+    afterSrc: string;
+    /**
+     * After image altText
+     */
+    afterAlt: string;
+    /**
+     * Class to target with SCSS.
+     */
+    class?: string;
+    /** Drag handle colour */
+    handleColour?: string;
+    /** Drag handle opacity */
+    handleInactiveOpacity?: number;
+    /** Margin at the edge of the image to stop dragging */
+    handleMargin?: number;
+    /** Percentage of the component width the handle will travel ona key press */
+    keyPressStep?: number;
+    /** Initial offset of the handle, between 0 and 1. */
+    offset?: number;
+    /** ID to target with SCSS. */
+    id?: string;
+    /**
+     * Optional snippet for a custom overlay for the before image.
+     */
+    beforeOverlay?: Snippet;
+    /**
+     * Optional snippet for a custom overlay for the after image.
+     */
+    afterOverlay?: Snippet;
+    /**
+     * Optional snippet for a custom caption.
+     */
+    caption?: Snippet;
+    /** Custom ARIA label language to label the component. */
+    ariaLabel?: string;
+  }
 
-  /**
-   * If set, makes the height a ratio of the component's width.
-   * @type {number}
+  let {
+    width = 'normal',
+    height = 600,
+    heightRatio,
+    beforeSrc,
+    beforeAlt,
+    afterSrc,
+    afterAlt,
+    class: cls = '',
+    handleColour = 'white',
+    handleInactiveOpacity = 0.9,
+    handleMargin = 20,
+    keyPressStep = 0.05,
+    offset = 0.5,
+    id = 'before-after-' + random4() + random4(),
+    beforeOverlay,
+    afterOverlay,
+    caption,
+    ariaLabel = 'Stacked before and after images with an adjustable slider',
+  }: Props = $props();
+
+  /** DOM nodes are undefined until the component is mounted — in other words, you should read it inside an effect or an event handler, but not during component initialisation.
    */
-  export let heightRatio: number | null = null;
+  let img: HTMLImageElement | undefined = $state(undefined);
 
-  /**
-   * Before image src
-   * @required
-   */
-  export let beforeSrc: string | null = null;
-  /**
-   * Before image altText
-   * @required
-   */
-  export let beforeAlt: string | null = null;
-  /**
-   * After image src
-   * @required
-   */
-  export let afterSrc: string | null = null;
-  /**
-   * After image altText
-   * @required
-   */
-  export let afterAlt: string | null = null;
-
-  /**
-   * Set a class to target with SCSS.
-   * @type {string}
-   */
-  let cls: string = '';
-  export { cls as class };
-
-  /** Drag handle colour */
-  export let handleColour = 'white';
-  /** Drag handle opacity */
-  export let handleInactiveOpacity = 0.9;
-  /** Margin at the edge of the image to stop dragging */
-  export let handleMargin = 20;
-  /** Percentage of the component width the handle will travel ona key press */
-  export let keyPressStep = 0.05;
-
-  /** Initial offset of the handle, between 0 and 1. */
-  export let offset = 0.5;
-
-  const random4 = () =>
-    Math.floor((1 + Math.random()) * 0x10000)
-      .toString(16)
-      .substring(1);
-
-  /**
-   * Add an ID to target with SCSS.
-   * @type {string}
-   */
-  export let id: string = 'before-after-' + random4() + random4();
-
-  let img: HTMLImageElement;
-  let imgOffset: DOMRect | null = null;
+  /** Defaults with an empty DOMRect with all values set to 0 */
+  let imgOffset: DOMRect = $state(new DOMRect());
   let sliding = false;
-  let figure: HTMLElement;
-  let beforeOverlayWidth = 0;
+  let figure: HTMLElement | undefined = $state(undefined);
+  let beforeOverlayWidth = $state(0);
   let isFocused = false;
-  let containerWidth: number;
+  let containerWidth: number = $state(0); // Defaults to 0
 
-  $: containerHeight =
-    containerWidth && heightRatio ? containerWidth * heightRatio : height;
+  let containerHeight = $derived(
+    containerWidth && heightRatio ? containerWidth * heightRatio : height
+  );
 
-  $: w = (imgOffset && imgOffset.width) || 0;
-  $: x = w * offset;
-  $: figStyle = `width:100%;height:${containerHeight}px;`;
-  $: imgStyle = 'width:100%;height:100%;';
-  $: beforeOverlayClip =
-    x < beforeOverlayWidth ? Math.abs(x - beforeOverlayWidth) : 0;
+  let w = $derived(imgOffset.width);
+  let x = $derived(w * offset);
+  let figStyle = $derived(`width:100%;height:${containerHeight}px;`);
+  const imgStyle = 'width:100%;height:100%;';
+  let beforeOverlayClip = $derived(
+    x < beforeOverlayWidth ? Math.abs(x - beforeOverlayWidth) : 0
+  );
 
-  const onFocus = () => (isFocused = true);
-  const onBlur = () => (isFocused = false);
+  /** Toggle `isFocused` */
+  const onfocus = () => (isFocused = true);
+  const onblur = () => (isFocused = false);
+
+  /** Handle left or right arrows being pressed */
   const handleKeyDown = (e: KeyboardEvent) => {
     if (!isFocused) return;
-    const { keyCode } = e;
+    const { code, key } = e;
     const margin = handleMargin / w;
-    if (keyCode === 39) {
+    if (code === 'ArrowRight' || key === 'ArrowRight') {
       offset = Math.min(1 - margin, offset + keyPressStep);
-    } else if (keyCode === 37) {
+    } else if (code === 'ArrowLeft' || key === 'ArrowLeft') {
       offset = Math.max(0 + margin, offset - keyPressStep);
     }
   };
 
+  /** Measure image and set image offset */
   const measureImage = () => {
     if (img && img.complete) imgOffset = img.getBoundingClientRect();
   };
 
+  /** Reset image offset on resize */
   const resize = () => {
     measureImage();
   };
 
+  /** Measure image and set image offset on load */
   const measureLoadedImage = (e: Event) => {
     if (e.type === 'load') {
       imgOffset = (e.target as HTMLImageElement).getBoundingClientRect();
     }
   };
 
+  /** Move the slider */
   const move = (e: MouseEvent | TouchEvent) => {
     if (sliding && imgOffset) {
       const el =
@@ -130,115 +160,115 @@
       offset = x / w;
     }
   };
+
+  /** Starts the slider */
   const start = (e: MouseEvent | TouchEvent) => {
     sliding = true;
     move(e);
   };
+
+  /** Sets `sliding` to `false`*/
   const end = () => {
     sliding = false;
   };
 
+  /** Keep this warning since these values are often read from an ArchieML doc, which will not trigger typescript errors even if required values don't exist */
   if (!(beforeSrc && beforeAlt && afterSrc && afterAlt)) {
     console.warn('Missing required src or alt props for BeforeAfter component');
   }
 
-  onMount(() => {
-    // This is necessary b/c on:load doesn't reliably fire on the image...
-    const interval = setInterval(() => {
-      if (imgOffset) clearInterval(interval);
-      if (img && img.complete && !imgOffset) measureImage();
-    }, 50);
-  });
+  /** @TODO - Double check if this onMount is still necessary */
+  // onMount(() => {
+  //   // This is necessary b/c on:load doesn't reliably fire on the image...
+  //   const interval = setInterval(() => {
+  //     if (imgOffset) clearInterval(interval);
+  //     if (img && img.complete && !imgOffset) measureImage();
+  //   }, 50);
+  // });
 </script>
 
 <svelte:window
-  on:touchmove="{move}"
-  on:touchend="{end}"
-  on:mousemove="{move}"
-  on:mouseup="{end}"
-  on:resize="{throttle(resize, 100)}"
-  on:keydown="{handleKeyDown}"
+  ontouchmove={move}
+  ontouchend={end}
+  onmousemove={move}
+  onmouseup={end}
+  onresize={throttle(resize, 100)}
+  onkeydown={handleKeyDown}
 />
 
+<!-- Since we usually read these values from ArchieML, check that they exist -->
 {#if beforeSrc && beforeAlt && afterSrc && afterAlt}
   <Block {width} {id} class="photo before-after fmy-6 {cls}">
-    <div
-      style="height: {containerHeight}px;"
-      bind:clientWidth="{containerWidth}"
-    >
-      <!-- svelte-ignore a11y-no-noninteractive-element-interactions -->
-      <figure
-        style="{figStyle}"
+    <div style="height: {containerHeight}px;" bind:clientWidth={containerWidth}>
+      <button
+        style={figStyle}
         class="before-after-container relative overflow-hidden my-0 mx-auto"
-        on:touchstart="{start}"
-        on:mousedown="{start}"
-        bind:this="{figure}"
-        aria-labelledby="{($$slots.caption && `${id}-caption`) || undefined}"
+        ontouchstart={start}
+        onmousedown={start}
+        bind:this={figure}
+        aria-label={ariaLabel}
       >
         <img
-          bind:this="{img}"
-          src="{afterSrc}"
-          alt="{afterAlt}"
-          on:load="{measureLoadedImage}"
-          on:mousedown|preventDefault
-          style="{imgStyle}"
+          bind:this={img}
+          src={afterSrc}
+          alt={afterAlt}
+          onload={measureLoadedImage}
+          style={imgStyle}
           class="after absolute block m-0 max-w-full object-cover"
-          aria-describedby="{($$slots.beforeOverlay && `${id}-before`) ||
-            undefined}"
+          aria-describedby={beforeOverlay ?
+            `${id}-before-description`
+          : undefined}
         />
 
         <img
-          src="{beforeSrc}"
-          alt="{beforeAlt}"
-          on:mousedown|preventDefault
+          src={beforeSrc}
+          alt={beforeAlt}
           style="clip: rect(0 {x}px {containerHeight}px 0);{imgStyle}"
           class="before absolute block m-0 max-w-full object-cover"
-          aria-describedby="{($$slots.afterOverlay && `${id}-after`) ||
-            undefined}"
+          aria-describedby={afterOverlay ?
+            `${id}-after-description`
+          : undefined}
         />
-        {#if $$slots.beforeOverlay}
+        {#if beforeOverlay}
           <div
-            id="image-before-label"
+            id="{id}-before-description"
             class="overlay-container before absolute"
-            bind:clientWidth="{beforeOverlayWidth}"
+            bind:clientWidth={beforeOverlayWidth}
             style="clip-path: inset(0 {beforeOverlayClip}px 0 0);"
           >
             <!-- Overlay for before image -->
-            <slot
-              name="beforeOverlay"
-              description="{`${id}-before-description`}"
-            />
+            {@render beforeOverlay()}
           </div>
         {/if}
-        {#if $$slots.afterOverlay}
-          <div id="image-after-label" class="overlay-container after absolute">
+        {#if afterOverlay}
+          <div
+            id="{id}-after-description"
+            class="overlay-container after absolute"
+          >
             <!-- Overlay for after image -->
-            <slot
-              name="afterOverlay"
-              description="{`${id}-after-description`}"
-            />
+            {@render afterOverlay()}
           </div>
         {/if}
         <div
           tabindex="0"
           role="slider"
-          aria-valuenow="{Math.round(offset * 100)}"
+          aria-valuenow={Math.round(offset * 100)}
           class="handle"
           style="left: calc({offset *
             100}% - 20px); --before-after-handle-colour: {handleColour}; --before-after-handle-inactive-opacity: {handleInactiveOpacity};"
-          on:focus="{onFocus}"
-          on:blur="{onBlur}"
+          {onfocus}
+          {onblur}
         >
           <div class="arrow-left"></div>
           <div class="arrow-right"></div>
         </div>
-      </figure>
+      </button>
     </div>
-    {#if $$slots.caption}
-      <PaddingReset containerIsFluid="{width === 'fluid'}">
-        <aside class="before-after-caption mx-auto" id="{`${id}-caption`}">
+    {#if caption}
+      <PaddingReset containerIsFluid={width === 'fluid'}>
+        <aside class="before-after-caption mx-auto" id={`${id}-caption`}>
           <!-- Caption for image credits -->
-          <slot name="caption" />
+          {@render caption()}
         </aside>
       </PaddingReset>
     {/if}
@@ -246,9 +276,9 @@
 {/if}
 
 <style lang="scss">
-  @use '../../scss/mixins' as *;
+  @use '../../scss/mixins' as mixins;
 
-  figure.before-after-container {
+  button.before-after-container {
     box-sizing: content-box;
 
     img {
@@ -264,7 +294,7 @@
       user-select: none;
     }
     .overlay-container {
-      position: absolute;
+      top: 0;
       :global(:first-child) {
         margin-top: 0;
       }
@@ -337,9 +367,9 @@
     }
   }
 
-  aside.before-after-caption {
+  .before-after-caption {
     :global(p) {
-      @include body-caption;
+      @include mixins.body-caption;
     }
   }
 </style>
diff --git a/src/components/BeforeAfter/stories/myrne-after.jpg b/src/components/BeforeAfter/images/myrne-after.jpg
similarity index 100%
rename from src/components/BeforeAfter/stories/myrne-after.jpg
rename to src/components/BeforeAfter/images/myrne-after.jpg
diff --git a/src/components/BeforeAfter/stories/myrne-before.jpg b/src/components/BeforeAfter/images/myrne-before.jpg
similarity index 100%
rename from src/components/BeforeAfter/stories/myrne-before.jpg
rename to src/components/BeforeAfter/images/myrne-before.jpg
diff --git a/src/components/BeforeAfter/stories/docs/ariaDescriptions.md b/src/components/BeforeAfter/stories/docs/ariaDescriptions.md
deleted file mode 100644
index 7e87edd3..00000000
--- a/src/components/BeforeAfter/stories/docs/ariaDescriptions.md
+++ /dev/null
@@ -1,35 +0,0 @@
-Use text elements in your overlays as [ARIA descriptions](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Attributes/aria-describedby) for your images by setting an ID on text elements within each overlay with the `description` [slot prop](https://svelte.dev/tutorial/slot-props).
-
-> **💡 TIP:** You must always use the `beforeAlt` / `afterAlt` props to label your image for visually impaired readers, but you can use these descriptions to provide more information or context that the reader might also need.
-
-```svelte
-  <BeforeAfter
-    beforeSrc="{beforeImg}"
-    beforeAlt="Satellite image of Russian base at Myrne taken on July 7, 2020."
-    afterSrc="{afterImg}"
-    afterAlt="Satellite image of Russian base at Myrne taken on Oct. 20, 2020."
-  >
-    <div slot="beforeOverlay" class="overlay p-3 before">
-      <p class="h4 font-bold">July 7, 2020</p>
-      <p class="body-note">Initially, this site was far smaller.</p>
-    </div>
-    <div slot="afterOverlay" class="overlay p-3 after">
-      <p class="h4 font-bold">Oct. 20, 2020</p>
-      <p class="body-note">But then forces built up.</p>
-    </div>
-    <p slot="caption">Photos by MAXAR Technologies, 2021.</p>
-  </BeforeAfter>
-
-  <style lang="scss">
-    .overlay {
-      background: rgba(0, 0, 0, 0.45);
-      max-width: 350px;
-      &.after {
-        text-align: right;
-      }
-      p {
-        color: #ffffff;
-      }
-    }
-  </style>
-```
diff --git a/src/components/BeforeAfter/stories/docs/component.md b/src/components/BeforeAfter/stories/docs/component.md
deleted file mode 100644
index 6998143a..00000000
--- a/src/components/BeforeAfter/stories/docs/component.md
+++ /dev/null
@@ -1,15 +0,0 @@
-A before and after image comparison component.
-
-```svelte
-<script>
-  import { BeforeAfter } from '@reuters-graphics/graphics-components';
-  import { assets } from '$app/paths'; // If using in the Graphics Kit
-</script>
-
-<BeforeAfter
-  beforeSrc="{`${assets}/images/before-after/myrne-before.jpg`}"
-  beforeAlt="Satellite image of Russian base at Myrne taken on July 7, 2020."
-  afterSrc="{`${assets}/images/before-after/myrne-after.jpg`}"
-  afterAlt="Satellite image of Russian base at Myrne taken on Oct. 20, 2020."
-/>
-```
diff --git a/src/components/BeforeAfter/stories/docs/withOverlays.md b/src/components/BeforeAfter/stories/docs/withOverlays.md
deleted file mode 100644
index 4a6028d6..00000000
--- a/src/components/BeforeAfter/stories/docs/withOverlays.md
+++ /dev/null
@@ -1,33 +0,0 @@
-Add overlays with the `beforeOverlay` and `afterOverlay` slots and a caption to the `caption` slot, then style these elements to match your page design as below.
-
-```svelte
-<BeforeAfter
-  beforeSrc="{beforeImg}"
-  beforeAlt="Satellite image of Russian base at Myrne taken on July 7, 2020."
-  afterSrc="{afterImg}"
-  afterAlt="Satellite image of Russian base at Myrne taken on Oct. 20, 2020."
->
-  <div slot="beforeOverlay" class="overlay p-3 before">
-    <p class="h4 font-bold">July 7, 2020</p>
-    <p class="body-note">Initially, this site was far smaller.</p>
-  </div>
-  <div slot="afterOverlay" class="overlay p-3 after">
-    <p class="h4 font-bold">Oct. 20, 2020</p>
-    <p class="body-note">But then forces built up.</p>
-  </div>
-  <p slot="caption">Photos by MAXAR Technologies, 2021.</p>
-</BeforeAfter>
-
-<style lang="scss">
-  .overlay {
-    background: rgba(0, 0, 0, 0.45);
-    max-width: 350px;
-    &.after {
-      text-align: right;
-    }
-    p {
-      color: #ffffff;
-    }
-  }
-</style>
-```
diff --git a/src/components/Block/Block.mdx b/src/components/Block/Block.mdx
new file mode 100644
index 00000000..3ec8a139
--- /dev/null
+++ b/src/components/Block/Block.mdx
@@ -0,0 +1,99 @@
+import { Meta, Canvas } from '@storybook/blocks';
+
+import * as BlockStories from './Block.stories.svelte';
+
+<Meta of={BlockStories} />
+
+# Block
+
+The `Block` component is the basic building block of pages, a responsive container that wraps around each section of your piece.
+
+Blocks are stacked vertically within the well created by the [Article](./?path=/docs/components-page-layout-article--docs) component. They can have different widths on larger screens depending on the `width` prop.
+
+> 📌 Many of our other components already use the `Block` component internally. You'll usually only need to use it yourself if you're making something custom.
+
+```svelte
+<script>
+  import { Block } from '@reuters-graphics/graphics-components';
+</script>
+
+<Block>
+  <!-- Contents for this block goes here -->
+</Block>
+```
+
+<Canvas of={BlockStories.Demo} />
+
+## Custom layouts
+
+Our article well is designed to provide a basic responsive layout for you, but it also lets you customise.
+
+The radical but easiest way to do this is to create a `Block` with a `fluid` width -- which basically cancels out the article well dimensions -- and then code whatever you need from scratch or with another framework.
+
+The demo below does exactly that to create an edge-to-edge grid with [flexbox](https://css-tricks.com/snippets/css/a-guide-to-flexbox/).
+
+```svelte
+<Block width="fluid">
+  <div class="my-radical-container">
+    <!-- Now, you have full control over layout! -->
+  </div>
+</Block>
+```
+
+<Canvas of={BlockStories.CustomLayout} />
+
+## Snap widths
+
+Normally, `Block` containers resize fluidly below the original `width`. Sometimes, though, you may want the container to snap to the next breakpoint -- for example, if you have a static graphic that looks fine at the set block breakpoints, but isn't so great at widths inbetween.
+
+You can use the `snap` prop to force the container to snap to each block width successively as the window sizes down.
+
+```svelte
+<Block width="wider" snap={true}>
+  <!-- Contents for this block -->
+</Block>
+```
+
+<Canvas of={BlockStories.SnapWidthsBasic} />
+
+If you want to skip certain block widths entirely, you can add one or more class of `skip-{block width class}` to the `Block`.
+
+> **NOTE:** The snap width breakpoints only work on `Block` components with widths `wider` and below. `widest` and `fluid` are both **always** fluid, since they go edge-to-edge.
+
+```svelte
+<!-- Will skip wide and go straight to normal column width on resize. -->
+<Block width="wider" snap={true} class="skip-wide">
+  <!-- Contents for this block -->
+</Block>
+```
+
+This is probably easier to see in action than explain in words, so [resize the demo](./?path=/docs/components-page-layout-block--snap-skip-widths) to get a better picture of how it all works.
+
+## Using with custom column widths
+
+Snap width breakpoints are hard-coded to the default article well column widths, so if you set custom `columnWidths` on the [Article](./?path=/docs/components-page-layout-article--docs) component (**rare!**), you need to do a littie work to use this functionality.
+
+Luckily, it's still pretty easy. Just add a `cls` or `id` to your `Block` so you can target it with some custom SCSS. Then define a few SCSS variables corresponding to your custom column widths, and use the `block-snap-widths` SCSS mixin to get the same functionality at your custom breakpoints.
+
+```svelte
+<Block width="wider" snap={true} class="custom-blocks">
+  <!-- Contents for this block -->
+</Block>
+
+<style lang="scss">
+  // Define custom column widths
+  $column-width-narrower: 310px;
+  $column-width-narrow: 450px;
+  $column-width-normal: 600px;
+  $column-width-wide: 860px;
+  $column-width-wider: 1400px;
+
+  @use '@reuters-graphics/graphics-components/scss/mixins' as mixins;
+
+  :global {
+    div.custom-blocks {
+      @include mixins.block-snap-widths; // Use the `block-snap-widths` mixin
+    }
+  }
+</style>
+```
diff --git a/src/components/Block/Block.stories.svelte b/src/components/Block/Block.stories.svelte
index a13a0411..9c985c91 100644
--- a/src/components/Block/Block.stories.svelte
+++ b/src/components/Block/Block.stories.svelte
@@ -1,19 +1,11 @@
 <script module lang="ts">
-  // @ts-ignore raw
-  import componentDocs from './stories/docs/component.md?raw';
-  // @ts-ignore raw
-  import customLayoutsDocs from './stories/docs/customLayouts.md?raw';
-  // @ts-ignore raw
-  import snapWidthsDocs from './stories/docs/snapWidths.md?raw';
-
+  import { defineMeta } from '@storybook/addon-svelte-csf';
   import Block from './Block.svelte';
 
-  import { withComponentDocs, withStoryDocs } from '$docs/utils/withParams.js';
-
-  export const meta = {
+  const { Story } = defineMeta({
     title: 'Components/Page layout/Block',
     component: Block,
-    ...withComponentDocs(componentDocs),
+    tags: ['autodocs'],
     argTypes: {
       width: {
         control: 'select',
@@ -28,35 +20,27 @@
         ],
       },
     },
-  };
+  });
 </script>
 
 <script>
-  import { Template, Story } from '@storybook/addon-svelte-csf';
   import Article from '../Article/Article.svelte';
 </script>
 
-<Template >
-  {#snippet children({ args })}
-    <Article id="block-demo-article">
-      <div class="article-boundaries">
-        <div class="label">Article</div>
-        <Block {...args}>
-          <div class="label">Block</div>
-        </Block>
-      </div>
-    </Article>
-  {/snippet}
-</Template>
+{#snippet template()}
+  <Article id="block-demo-article">
+    <div class="article-boundaries">
+      <div class="label">Article</div>
+      <Block>
+        <div class="label">Block</div>
+      </Block>
+    </div>
+  </Article>
+{/snippet}
 
-<Story
-  name="Default"
-  args="{{
-    width: 'normal',
-  }}"
-/>
+<Story name="Demo" children={template} />
 
-<Story name="Custom layouts" {...withStoryDocs(customLayoutsDocs)}>
+<Story name="Custom layout" exportName="CustomLayout">
   <Block width="fluid">
     <!-- Enter bootstrap grid! -->
     <div id="block-flex-example">
@@ -73,53 +57,76 @@
   </Block>
 </Story>
 
-<Story name="Snap widths" {...withStoryDocs(snapWidthsDocs)}>
+<Story name="Snap widths" exportName="SnapWidthsBasic">
   <Article id="block-demo-article">
     <div class="article-boundaries">
       <div class="label">Article</div>
-      <Block width="narrower" snap="{true}" class="block-snap-widths-demo"
-        >narrower</Block
-      >
-      <Block width="narrow" snap="{true}" class="block-snap-widths-demo"
-        >narrow</Block
-      >
-      <Block width="normal" snap="{true}" class="block-snap-widths-demo"
-        >normal</Block
-      >
-      <Block width="wide" snap="{true}" class="block-snap-widths-demo"
-        >wide</Block
-      >
-      <Block width="wider" snap="{true}" class="block-snap-widths-demo"
-        >wider</Block
-      >
-      <Block width="narrower" snap="{true}" class="block-snap-widths-demo even"
-        >narrower</Block
-      >
-      <Block width="narrow" snap="{true}" class="block-snap-widths-demo even"
-        >narrow</Block
-      >
+      <h4>snap widths</h4>
+      <Block snap={true}>
+        <div class="label">Block</div>
+      </Block>
+    </div>
+  </Article>
+</Story>
+
+<Story name="Snap and skip widths" exportName="SnapSkipWidths">
+  <Article id="block-demo-article">
+    <div class="article-boundaries">
+      <div class="label">Article</div>
+      <h4>Regular layout</h4>
+
+      <Block width="narrower" snap={true} class="block-snap-widths-demo">
+        narrower
+      </Block>
+      <Block width="narrow" snap={true} class="block-snap-widths-demo">
+        narrow
+      </Block>
+      <Block width="normal" snap={true} class="block-snap-widths-demo">
+        normal
+      </Block>
+      <Block width="wide" snap={true} class="block-snap-widths-demo">
+        wide
+      </Block>
+      <Block width="wider" snap={true} class="block-snap-widths-demo">
+        wider
+      </Block>
+
+      <h4>with snap and skip</h4>
+      <Block width="narrower" snap={true} class="block-snap-widths-demo even">
+        narrower
+      </Block>
+      <Block width="narrow" snap={true} class="block-snap-widths-demo even">
+        narrow
+      </Block>
       <Block
         width="normal"
-        snap="{true}"
+        snap={true}
         class="block-snap-widths-demo even skip-narrow"
-        >normal.skip-narrow</Block
       >
+        normal.skip-narrow
+      </Block>
       <Block
         width="wide"
-        snap="{true}"
+        snap={true}
         class="block-snap-widths-demo even skip-normal skip-narrow"
-        >wide.skip-normal.skip-narrow</Block
       >
+        wide.skip-normal.skip-narrow
+      </Block>
       <Block
         width="wider"
-        snap="{true}"
-        class="block-snap-widths-demo even skip-wide">wider.skip-wide</Block
+        snap={true}
+        class="block-snap-widths-demo even skip-wide"
       >
+        wider.skip-wide
+      </Block>
     </div>
   </Article>
 </Story>
 
 <style lang="scss">
+  h4 {
+    text-align: center;
+  }
   :global(#block-demo-article) {
     background-color: #ddd;
     position: relative;
@@ -145,11 +152,12 @@
     background: rgb(211, 132, 123);
   }
   :global(
-      #block-demo-article .label,
-      #block-demo-article div.article-block.block-snap-widths-demo
-    ) {
+    #block-demo-article .label,
+    #block-demo-article div.article-block.block-snap-widths-demo
+  ) {
     padding-left: 3px;
     color: white;
+    font-weight: 500;
   }
 
   div#block-flex-example {
diff --git a/src/components/Block/Block.svelte b/src/components/Block/Block.svelte
index beea07dd..868733cc 100644
--- a/src/components/Block/Block.svelte
+++ b/src/components/Block/Block.svelte
@@ -1,37 +1,44 @@
-<!-- @migration-task Error while migrating Svelte code: Cannot set properties of undefined (setting 'next') -->
 <!-- @component `Block` [Read the docs.](https://reuters-graphics.github.io/graphics-components/?path=/docs/components-page-layout-block--docs) -->
 <script lang="ts">
+  import type { Snippet } from 'svelte';
   import type { ContainerWidth } from '../@types/global';
 
-  /** Width of the block within the article well. */
-  export let width: ContainerWidth = 'normal';
+  interface Props {
+    /** Content that goes inside `<Block>`*/
+    children: Snippet;
+    /** Width of the block within the article well. */
+    width?: ContainerWidth;
+    /** Add an id to the block tag to target it with custom CSS. */
+    id?: string;
+    /** Add custom classes to the block tag to target it with custom CSS. */
+    class?: string;
+    /** Snap block to column widths, rather than fluidly resizing them. */
+    snap?: boolean;
+    /** ARIA [role](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Roles) for the block */
+    role?: string;
+    /** ARIA [label](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Attributes/aria-label) for the block */
+    ariaLabel?: string;
+  }
 
-  /** Add an id to the block tag to target it with custom CSS. */
-  export let id: string = '';
-
-  /** Add extra classes to the block tag to target it with custom CSS. */
-  let cls: string = '';
-  export { cls as class };
-
-  /** Snap block to column widths, rather than fluidly resizing them. */
-  export let snap: boolean = false;
-
-  /** ARIA [role](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Roles) for the block */
-  export let role: string | null = null;
-
-  /** ARIA [label](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Attributes/aria-label) for the block */
-  export let ariaLabel: string | null = null;
+  let {
+    children,
+    width = 'normal',
+    id = '',
+    class: cls = '',
+    snap = false,
+    role,
+    ariaLabel,
+  }: Props = $props();
 </script>
 
 <div
   {id}
   class="article-block fmx-auto {width} {cls}"
-  class:snap="{snap && width !== 'fluid' && width !== 'widest'}"
+  class:snap={snap && width !== 'fluid' && width !== 'widest'}
   {role}
-  aria-label="{ariaLabel}"
+  aria-label={ariaLabel}
 >
-  <!-- block content -->
-  <slot />
+  {@render children()}
 </div>
 
 <style lang="scss">
@@ -66,7 +73,7 @@
       max-width: none;
     }
 
-    // Only setup for the default column widths, b/c can't use
+    // Only setup for the default column widths, b/c we can't use
     // CSS vars in media queries.
     &.snap {
       @include mixins.block-snap-widths;
diff --git a/src/components/Block/stories/docs/component.md b/src/components/Block/stories/docs/component.md
deleted file mode 100644
index d3ba7d87..00000000
--- a/src/components/Block/stories/docs/component.md
+++ /dev/null
@@ -1,15 +0,0 @@
-The `Block` component is the basic building block of stories, a responsive container that wraps each section of your piece.
-
-Blocks are stacked vertically within the well created by the [`Article`](./?path=/docs/layout-article) component. They can have different widths on larger screens depending on the `width` prop.
-
-> 📌 Many of our other components already use the `Block` component, internally. You'll usually only need to use it yourself if you're making something custom.
-
-```svelte
-<script>
-  import { Block } from '@reuters-graphics/graphics-components';
-</script>
-
-<Block width="normal">
-  <!-- Your stuff for this block -->
-</Block>
-```
diff --git a/src/components/Block/stories/docs/customLayouts.md b/src/components/Block/stories/docs/customLayouts.md
deleted file mode 100644
index 74342fdb..00000000
--- a/src/components/Block/stories/docs/customLayouts.md
+++ /dev/null
@@ -1,13 +0,0 @@
-Our article well is designed to provide a basic responsive layout for you, but it's also made to get out of the way quickly when you need to do something custom.
-
-If you need to get really radical, the easiest way is to create a `Block` with a `fluid` width -- which basically cancels out the article well dimensions -- and then code whatever you need from scratch or with another framework.
-
-```svelte
-<Block width="fluid">
-  <div class="my-radical-container">
-    <!-- Now, you have full control! -->
-  </div>
-</Block>
-```
-
-The demo below does exactly that to create an edge-to-edge grid with [flexbox](https://css-tricks.com/snippets/css/a-guide-to-flexbox/).
diff --git a/src/components/Block/stories/docs/snapWidths.md b/src/components/Block/stories/docs/snapWidths.md
deleted file mode 100644
index cd9135f5..00000000
--- a/src/components/Block/stories/docs/snapWidths.md
+++ /dev/null
@@ -1,50 +0,0 @@
-Normally, `Block` containers resize fluidly below the original `width`. Sometimes, though, you may want the container to snap to the next breakpoint -- for example, if you have a static graphic that looks fine at the set block breakpoints, but isn't so great at widths inbetween.
-
-You can use the `snap` prop to force the container to snap to each block width successively as the window sizes down.
-
-```svelte
-<Block width="wider" snap="{true}">
-  <!-- Your stuff for this block -->
-</Block>
-```
-
-If you want to skip certain block widths entirely, you can add one or more class of `skip-{block width class}` to the `Block`.
-
-```svelte
-<!-- Will skip wide and go straight to normal column width on resize. -->
-<Block width="wider" snap="{true}" class="skip-wide">
-  <!-- Your stuff for this block -->
-</Block>
-```
-
-This is probably easier to see in action than explain in words, so resize the window to get a better picture of how it all works.
-
-> **NOTE:** The snap width breakpoints only work on `Block` components with widths `wider` and below. `widest` and `fluid` are both **always** fluid, since they go edge-to-edge.
-
-#### Using with custom column widths
-
-Snap width breakpoints are hard-coded to the default article well column widths, so if you set custom `columnWidths` on the `Article` tag (**rare!**), you can't use this functionality without a little extra work.
-
-Luckily, it's still pretty easy. Just add a `cls` or `id` to your `Block` so you can target it with some custom SCSS. Now, defined a few SCSS variables corresponding to your custom column widths and use the `block-snap-widths` SCSS mixin to get the same functionality at your custom breakpoints.
-
-```svelte
-<Block width="wider" snap="{true}" class="custom-blocks">
-  <!-- Your stuff for this block -->
-</Block>
-
-<style lang="scss">
-  $column-width-narrower: 310px;
-  $column-width-narrow: 450px;
-  $column-width-normal: 600px;
-  $column-width-wide: 860px;
-  $column-width-wider: 1400px;
-
-  @use '@reuters-graphics/graphics-components/scss/mixins' as mixins;
-
-  :global {
-    div.custom-blocks {
-      @include mixins.block-snap-widths;
-    }
-  }
-</style>
-```
diff --git a/src/components/BodyText/BodyText.mdx b/src/components/BodyText/BodyText.mdx
index 9cd25312..d51f7356 100644
--- a/src/components/BodyText/BodyText.mdx
+++ b/src/components/BodyText/BodyText.mdx
@@ -30,10 +30,10 @@ Venison shoulder *ham hock ham leberkas*. Flank beef ribs fatback, jerky meatbal
 
 ## Using with ArchieML docs
 
-With the graphics kit, you'll likely get your text value from an ArchieML doc.
+With the Graphics Kit, you'll likely get your text value from an ArchieML doc...
 
 ```yaml
-# Archie ML doc
+# ArchieML doc
 [blocks]
 
 type: text
@@ -49,6 +49,11 @@ text: Bacon ipsum ...
 
 ```svelte
 <!-- App.svelte -->
+<script>
+  import { BodyText } from '@reuters-graphics/graphics-components';
+  import content from '$locales/en/content.json';
+</script>
+
 {#each content.blocks as block}
   {#if block.type === 'text'}
     <BodyText text={block.text} />
diff --git a/src/components/Byline/Byline.mdx b/src/components/Byline/Byline.mdx
new file mode 100644
index 00000000..3f812644
--- /dev/null
+++ b/src/components/Byline/Byline.mdx
@@ -0,0 +1,106 @@
+import { Meta, Canvas } from '@storybook/blocks';
+
+import * as BylineStories from './Byline.stories.svelte';
+
+<Meta of={BylineStories} />
+
+# Byline
+
+The `Byline` component adds a byline, published and updated datelines to your page.
+
+```svelte
+<script>
+  import { Byline } from '@reuters-graphics/graphics-components';
+</script>
+
+<Byline
+  authors={[
+    'Dea Bankova',
+    'Prasanta Kumar Dutta',
+    'Anurag Rao',
+    'Mariano Zafra',
+  ]}
+  publishTime="2021-09-12T00:00:00.000Z"
+  updateTime="2021-09-12T12:57:00.000Z"
+/>
+```
+
+## Using with ArchieML docs
+
+With the Graphics Kit, you'll likely get your text value from an ArchieML doc...
+
+```yaml
+# ArchieML doc
+[authors]
+* Dea Bankova
+* Prasanta Kumar Dutta
+* Anurag Rao
+* Mariano Zafra
+[]
+publishTime: 2021-09-12T00:00:00.000Z
+updateTime: 2021-09-12T12:57:00.000Z
+```
+
+... which you'll pass to the `Byline` component.
+
+```svelte
+<script>
+  import { Byline } from '@reuters-graphics/graphics-components';
+  import content from '$locales/en/content.json';
+</script>
+
+<Byline
+  authors={content.authors}
+  publishTime={content.publishTime}
+  updateTime={content.updateTime}
+/>
+```
+
+<Canvas of={BylineStories.Demo} />
+
+## Custom byline, published and updated datelines
+
+Use [snippets](https://svelte.dev/docs/svelte/snippet) to customise the byline, published and updated datelines.
+
+```svelte
+<Byline publishTime="2021-09-12T00:00:00Z" updateTime="2021-09-12T13:57:00Z">
+  <!-- Optional custom byline -->
+  {#snippet byline()}
+    <strong>BY REUTERS GRAPHICS</strong>
+  {/snippet}
+
+  <!-- Optional custom published dateline -->
+  {#snippet published()}
+    PUBLISHED on some custom date and time
+  {/snippet}
+
+  <!-- Optional custom updated dateline -->
+  {#snippet updated()}
+    <em>Updated every 5 minutes</em>
+  {/snippet}
+</Byline>
+```
+
+<Canvas of={BylineStories.Customised} />
+
+## Custom author page
+
+By default, the `Byline` component will hyperlink each author's byline to their Reuters.com page, formatted `https://www.reuters.com/authors/{author-slug}/`.
+
+To hyperlink to different pages or email addresses, pass a custom function to the `getAuthorPage` prop.
+
+```svelte
+<!-- Pass a custom function as `getAuthorPage` -->
+<Byline
+  authors={['Dea Bankova', 'Prasanta Kumar Dutta', 'Anurag Rao', 'Mariano Zafra']}
+  publishTime="2021-09-12T00:00:00Z"
+  updateTime="2021-09-12T13:57:00Z"
+  getAuthorPage={(author: string) => {
+      return `mailto:${author.replace(' ', '')}@example.com`;
+    }}
+/>
+
+```
+
+<Canvas of={BylineStories.CustomAuthorPage} />
+````
diff --git a/src/components/Byline/Byline.stories.svelte b/src/components/Byline/Byline.stories.svelte
index 5855ceef..33705d5a 100644
--- a/src/components/Byline/Byline.stories.svelte
+++ b/src/components/Byline/Byline.stories.svelte
@@ -1,17 +1,11 @@
 <script module lang="ts">
   import { defineMeta } from '@storybook/addon-svelte-csf';
   import Byline from './Byline.svelte';
-  // @ts-ignore raw
-  import componentDocs from './stories/docs/component.md?raw';
-
-  import { withComponentDocs } from '$docs/utils/withParams.js';
-
-  import type { ComponentProps } from 'svelte';
 
   const { Story } = defineMeta({
     title: 'Components/Text elements/Byline',
     component: Byline,
-    ...withComponentDocs(componentDocs),
+    tags: ['autodocs'],
     argTypes: {
       align: {
         control: 'select',
@@ -21,17 +15,11 @@
   });
 </script>
 
-{#snippet template(args: ComponentProps<Byline>)}
-  <Byline {...args} />
-{/snippet}
-
 <Story
-  name="Default"
+  name="Demo"
   args={{
-    align: 'left',
     authors: [
       'Dea Bankova',
-      'Aditi Bhandari',
       'Prasanta Kumar Dutta',
       'Anurag Rao',
       'Mariano Zafra',
@@ -39,5 +27,37 @@
     publishTime: new Date('2021-09-12').toISOString(),
     updateTime: new Date('2021-09-12T13:57:00').toISOString(),
   }}
-  children={template}
+/>
+
+<Story name="Customised" tags={['!autodocs', '!dev']}>
+  <Byline publishTime="2021-09-12T00:00:00Z" updateTime="2021-09-12T13:57:00Z">
+    {#snippet byline()}
+      <strong>BY REUTERS GRAPHICS</strong>
+    {/snippet}
+    {#snippet published()}
+      PUBLISHED on some custom date and time
+    {/snippet}
+    {#snippet updated()}
+      <em>Updated every 5 minutes</em>
+    {/snippet}
+  </Byline>
+</Story>
+
+<Story
+  name="Custom author page"
+  exportName="CustomAuthorPage"
+  tags={['!autodocs', '!dev']}
+  args={{
+    authors: [
+      'Dea Bankova',
+      'Prasanta Kumar Dutta',
+      'Anurag Rao',
+      'Mariano Zafra',
+    ],
+    publishTime: '2021-09-12T00:00:00Z',
+    updateTime: '2021-09-12T13:57:00Z',
+    getAuthorPage: (author: string) => {
+      return `mailto:${author.replace(' ', '')}@example.com`;
+    },
+  }}
 />
diff --git a/src/components/Byline/Byline.svelte b/src/components/Byline/Byline.svelte
index 8f67a4e7..4d932679 100644
--- a/src/components/Byline/Byline.svelte
+++ b/src/components/Byline/Byline.svelte
@@ -1,66 +1,88 @@
 <!-- @migration-task Error while migrating Svelte code: Cannot set properties of undefined (setting 'next') -->
 <!-- @component `Byline` [Read the docs.](https://reuters-graphics.github.io/graphics-components/?path=/docs/components-text-elements-byline--docs) -->
 <script lang="ts">
+  import { getAuthorPageUrl } from '../../utils';
   import Block from '../Block/Block.svelte';
-  import slugify from 'slugify';
   import { apdate } from 'journalize';
+  import type { Snippet } from 'svelte';
+
+  interface Props {
+    /**
+     * Array of author names, which will be slugified to create links to Reuters author pages
+     */
+    authors?: string[];
+    /**
+     * Publish time as a datetime string.
+     */
+    publishTime: string;
+    /**
+     * Update time as a datetime string.
+     */
+    updateTime: string;
+    /**
+     * Alignment of the byline.
+     */
+    align?: 'left' | 'center';
+    /**
+     * Add an id to to target with custom CSS.
+     * @type {string}
+     */
+    id?: string;
+    /**
+     * Add extra classes to target with custom CSS.
+     * @type {string}
+     */
+    cls?: string;
+    /**
+     * Custom function that returns an author page URL.
+     */
+    getAuthorPage?: (author: string) => string;
+    /**
+     * Optional snippet for a custom byline.
+     */
+    byline?: Snippet;
+    /**
+     * Optional snippet for a custom published dateline.
+     */
+    published?: Snippet;
+    /**
+     * Optional snippet for a custom updated dateline.
+     */
+    updated?: Snippet;
+  }
+
+  let {
+    authors = [],
+    publishTime,
+    updateTime,
+    align = 'left',
+    id = '',
+    cls = '',
+    getAuthorPage = getAuthorPageUrl,
+    byline,
+    published,
+    updated,
+  }: Props = $props();
+
+  let alignmentClass = $derived(align === 'left' ? 'text-left' : 'text-center');
 
   /**
-   * Array of author names, which will be slugified to create links to Reuters author pages
+  /* Date validation and formatter functions
    */
-  export let authors: string[] = [];
-  /**
-   * Publish time as a datetime string.
-   * @type {string}
-   */
-  export let publishTime: string = '';
-  /**
-   * Update time as a datetime string.
-   * @type {string}
-   */
-  export let updateTime: string = '';
-  /**
-   * Alignment of the byline.
-   * @type {string}
-   */
-  export let align: 'left' | 'center' = 'left';
-  /**
-   * Add an id to to target with custom CSS.
-   * @type {string}
-   */
-  export let id: string = '';
-  /**
-   * Add extra classes to target with custom CSS.
-   * @type {string}
-   */
-  let cls: string = '';
-  export { cls as class };
-
-  /**
-   * Custom function that returns an author page URL.
-   * @param author
-   */
-  export let getAuthorPage = (author: string): string => {
-    const authorSlug = slugify(author.trim(), { lower: true });
-    return `https://www.reuters.com/authors/${authorSlug}/`;
-  };
-
-  $: alignmentClass = align === 'left' ? 'text-left' : 'text-center';
-
-  const isValidDate = (datetime) => {
+  const isValidDate = (datetime: string) => {
     if (!datetime) return false;
     if (!Date.parse(datetime)) return false;
     return true;
   };
 
-  const formatTime = (datetime) =>
+  const formatTime = (datetime: string) =>
     new Date(datetime).toLocaleTimeString([], {
       hour: '2-digit',
       minute: '2-digit',
       timeZoneName: 'short',
     });
 
-  const areSameDay = (first, second) =>
+  const areSameDay = (first: Date, second: Date) =>
     first.getFullYear() === second.getFullYear() &&
     first.getMonth() === second.getMonth() &&
     first.getDate() === second.getDate();
@@ -69,16 +91,16 @@
 <Block {id} class="byline-container {alignmentClass} {cls}" width="normal">
   <aside class="article-metadata font-subhed">
     <div class="byline body-caption fmb-1">
-      {#if $$slots.byline}
+      {#if byline}
         <!-- Custom byline -->
-        <slot name="byline" />
+        {@render byline()}
       {:else}
         By
         {#if authors.length > 0}
           {#each authors as author, i}
             <a
               class="no-underline whitespace-nowrap text-primary font-bold"
-              href="{getAuthorPage(author)}"
+              href={getAuthorPage(author)}
               rel="author"
             >
               {author.trim()}</a
@@ -95,15 +117,17 @@
       {/if}
     </div>
     <div class="dateline body-caption fmt-0">
-      {#if $$slots.published}
+      {#if published}
         <div class="whitespace-nowrap inline-block">
-          <!-- Custom published dateline -->
-          <slot name="published" />
+          <!-- Custom published dateline snippet -->
+          <time datetime={publishTime}>
+            {@render published()}
+          </time>
         </div>
       {:else if isValidDate(publishTime)}
         <div class="whitespace-nowrap inline-block">
           Published
-          <time datetime="{publishTime}">
+          <time datetime={publishTime}>
             {#if isValidDate(updateTime)}
               {apdate(new Date(publishTime))}
             {:else}
@@ -114,15 +138,17 @@
           </time>
         </div>
       {/if}
-      {#if $$slots.updated}
+      {#if updated}
         <div class="whitespace-nowrap inline-block">
-          <!-- Custom updated dateline -->
-          <slot name="updated" />
+          <!-- Custom updated dateline snippet -->
+          <time datetime={updateTime}>
+            {@render updated()}
+          </time>
         </div>
       {:else if isValidDate(publishTime) && isValidDate(updateTime)}
         <div class="whitespace-nowrap inline-block">
           Last updated
-          <time datetime="{updateTime}">
+          <time datetime={updateTime}>
             {#if areSameDay(new Date(publishTime), new Date(updateTime))}
               {formatTime(updateTime)}
             {:else}
diff --git a/src/components/Byline/stories/docs/component.md b/src/components/Byline/stories/docs/component.md
deleted file mode 100644
index fd9eedc0..00000000
--- a/src/components/Byline/stories/docs/component.md
+++ /dev/null
@@ -1,19 +0,0 @@
-Byline and dateline.
-
-```svelte
-<script>
-  import { Byline } from '@reuters-graphics/graphics-components';
-</script>
-
-<Byline
-  authors="{[
-    'Dea Bankova',
-    'Aditi Bhandari',
-    'Prasanta Kumar Dutta',
-    'Anurag Rao',
-    'Mariano Zafra',
-  ]}"
-  publishTime="2021-09-12T00:00:00.000Z"
-  updateTime="2021-09-12T12:57:00.000Z"
-/>
-```
diff --git a/src/components/DocumentCloud/DocumentCloud.mdx b/src/components/DocumentCloud/DocumentCloud.mdx
new file mode 100644
index 00000000..88dec3d1
--- /dev/null
+++ b/src/components/DocumentCloud/DocumentCloud.mdx
@@ -0,0 +1,26 @@
+import { Meta, Canvas } from '@storybook/blocks';
+
+import * as DocumentCloudStories from './DocumentCloud.stories.svelte';
+
+<Meta of={DocumentCloudStories} />
+
+# DocumentCloud
+
+The `DocumentCloud` component embeds a document hosted by [DocumentCloud](https://documentcloud.org).
+
+The document must have its access level set to **public** before it can be embedded. The `slug` can be found after the final slash in the document's URL.
+
+For instance, the document included in the example is found at [documentcloud.org/documents/3259984-Trump-Intelligence-Allegations](https://www.documentcloud.org/documents/3259984-Trump-Intelligence-Allegations). The `slug` is `3259984-Trump-Intelligence-Allegations`.
+
+```svelte
+<script>
+  import { DocumentCloud } from '@reuters-graphics/graphics-components';
+</script>
+
+<DocumentCloud
+  slug="3259984-Trump-Intelligence-Allegations"
+  altText="These Reports Allege Trump Has Deep Ties To Russia"
+/>
+```
+
+<Canvas of={DocumentCloudStories.Demo} />
diff --git a/src/components/DocumentCloud/DocumentCloud.stories.svelte b/src/components/DocumentCloud/DocumentCloud.stories.svelte
index 7a111585..22f69e6d 100644
--- a/src/components/DocumentCloud/DocumentCloud.stories.svelte
+++ b/src/components/DocumentCloud/DocumentCloud.stories.svelte
@@ -1,38 +1,23 @@
 <script module lang="ts">
+  import { defineMeta } from '@storybook/addon-svelte-csf';
   import DocumentCloud from './DocumentCloud.svelte';
-  // @ts-ignore raw
-  import componentDocs from './stories/docs/component.md?raw';
 
-  import { withComponentDocs } from '$lib/docs/utils/withParams.js';
-
-  export const meta = {
+  const { Story } = defineMeta({
     title: 'Components/Multimedia/DocumentCloud',
     component: DocumentCloud,
-    ...withComponentDocs(componentDocs),
     argTypes: {
       width: {
         control: 'select',
         options: ['normal', 'wide', 'wider', 'widest', 'fluid'],
       },
     },
-  };
+  });
 </script>
 
-<script>
-  import { Template, Story } from '@storybook/addon-svelte-csf';
-</script>
-
-<Template >
-  {#snippet children({ args })}
-    <DocumentCloud {...args} />
-  {/snippet}
-</Template>
-
 <Story
-  name="Default"
-  args="{{
-    width: 'normal',
+  name="Demo"
+  args={{
     slug: '3259984-Trump-Intelligence-Allegations',
     altText: 'These Reports Allege Trump Has Deep Ties To Russia',
-  }}"
+  }}
 />
diff --git a/src/components/DocumentCloud/DocumentCloud.svelte b/src/components/DocumentCloud/DocumentCloud.svelte
index 195c4c8a..01a86cc6 100644
--- a/src/components/DocumentCloud/DocumentCloud.svelte
+++ b/src/components/DocumentCloud/DocumentCloud.svelte
@@ -1,43 +1,41 @@
-<!-- @migration-task Error while migrating Svelte code: Cannot set properties of undefined (setting 'next') -->
 <!-- @component `DocumentCloud` [Read the docs.](https://reuters-graphics.github.io/graphics-components/?path=/docs/components-multimedia-documentcloud--docs) -->
 <script lang="ts">
   import type { ContainerWidth } from '../@types/global';
-  /** ✏️ DOCUMENT your chart's props using TypeScript and JSDoc comments like below! */
-
-  /**
-   * Width of the container, one of: normal, wide, wider, widest or fluid
-   */
-  export let width: ContainerWidth = 'normal';
-
-  /**
-   * The unique identifier for the document.
-   * @required
-   */
-  export let slug: string;
-
-  /**
-   * Alt text for the document.
-   * @required
-   */
-  export let altText: string;
-
-  /** Add an ID to target with SCSS. */
-  export let id: string = '';
-
-  /** Add a class to target with SCSS. */
-  let cls: string = '';
-  export { cls as class };
-
   import Block from '../Block/Block.svelte';
+
+  interface Props {
+    /**
+     * The unique identifier for the document.
+     */
+    slug: string;
+    /**
+     * Alt text for the document.
+     */
+    altText: string;
+    /**
+     * Width of the container, one of: normal, wide, wider, widest or fluid
+     */
+    width?: ContainerWidth;
+    /** Add an ID to target with SCSS. */
+    id?: string;
+    /** Add a class to target with SCSS. */
+    class?: string; // Add a class to target with SCSS.
+  }
+
+  let {
+    slug,
+    altText,
+    width = 'normal',
+    id = '',
+    class: cls = '',
+  }: Props = $props();
 </script>
 
 <Block {width} {id} class="photo fmy-6 {cls}">
   <iframe
     class="h-screen"
     src="https://embed.documentcloud.org/documents/{slug}/?embed=1&amp;responsive=1&amp;title=1"
-    title="{altText}"
-    width="700"
-    height="540"
+    title={altText}
     sandbox="allow-scripts allow-same-origin allow-popups allow-forms allow-popups-to-escape-sandbox"
   ></iframe>
 </Block>
diff --git a/src/components/DocumentCloud/stories/docs/component.md b/src/components/DocumentCloud/stories/docs/component.md
deleted file mode 100644
index 6b52ec2a..00000000
--- a/src/components/DocumentCloud/stories/docs/component.md
+++ /dev/null
@@ -1,17 +0,0 @@
-Embed a document hosted by [DocumentCloud](https://documentcloud.org)
-
----
-
-The document must have its access level set to public before it can be embedded. The `slug` argument can be found after the final slash in the document's URL. For instance, the document included in the example is found at [documentcloud.org/documents/3259984-Trump-Intelligence-Allegations](https://www.documentcloud.org/documents/3259984-Trump-Intelligence-Allegations). The slug is "3259984-Trump-Intelligence-Allegations".
-
-```svelte
-<script>
-  import { DocumentCloud } from '@reuters-graphics/graphics-components';
-</script>
-
-<DocumentCloud
-  slug="3259984-Trump-Intelligence-Allegations"
-  altText="These Reports Allege Trump Has Deep Ties To Russia"
-  width="normal"
-/>
-```
diff --git a/src/components/EmbedPreviewerLink/EmbedPreviewerLink.mdx b/src/components/EmbedPreviewerLink/EmbedPreviewerLink.mdx
new file mode 100644
index 00000000..12693e2d
--- /dev/null
+++ b/src/components/EmbedPreviewerLink/EmbedPreviewerLink.mdx
@@ -0,0 +1,19 @@
+import { Meta } from '@storybook/blocks';
+
+import * as EmbedPreviewerLinkStories from './EmbedPreviewerLink.stories.svelte';
+
+<Meta of={EmbedPreviewerLinkStories} />
+
+# EmbedPreviewerLink
+
+The `EmbedPreviewerLink` component is a tool for previewing the embeds in development. It adds an icon at the bottom of the page that, when clicked, opens a previewer with the embeds.
+
+```svelte
+<script>
+  import { EmbedPreviewerLink } from '@reuters-graphics/graphics-components';
+
+  import { dev } from '$app/env';
+</script>
+
+<EmbedPreviewerLink {dev} />
+```
diff --git a/src/components/EmbedPreviewerLink/EmbedPreviewerLink.stories.svelte b/src/components/EmbedPreviewerLink/EmbedPreviewerLink.stories.svelte
index fa380bef..80f2fa4a 100644
--- a/src/components/EmbedPreviewerLink/EmbedPreviewerLink.stories.svelte
+++ b/src/components/EmbedPreviewerLink/EmbedPreviewerLink.stories.svelte
@@ -1,30 +1,17 @@
 <script module lang="ts">
   import EmbedPreviewerLink from './EmbedPreviewerLink.svelte';
-  // @ts-ignore raw
-  import componentDocs from './stories/docs/component.md?raw';
+  import { defineMeta } from '@storybook/addon-svelte-csf';
 
-  import { withComponentDocs } from '$lib/docs/utils/withParams.js';
-
-  export const meta = {
+  const { Story } = defineMeta({
     title: 'Components/Utilities/EmbedPreviewerLink',
     component: EmbedPreviewerLink,
-    ...withComponentDocs(componentDocs),
-  };
+  });
 </script>
 
-<script>
-  import { Template, Story } from '@storybook/addon-svelte-csf';
-</script>
-
-<Template >
-  {#snippet children({ args })}
-    <EmbedPreviewerLink {...args} />
-  {/snippet}
-</Template>
-
 <Story
-  name="Default"
-  args="{{
+  name="Demo"
+  tags={['!autodocs', '!dev']}
+  args={{
     dev: true,
-  }}"
+  }}
 />
diff --git a/src/components/EmbedPreviewerLink/EmbedPreviewerLink.svelte b/src/components/EmbedPreviewerLink/EmbedPreviewerLink.svelte
index 7420449e..21ea835e 100644
--- a/src/components/EmbedPreviewerLink/EmbedPreviewerLink.svelte
+++ b/src/components/EmbedPreviewerLink/EmbedPreviewerLink.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-
   import Fa from 'svelte-fa/src/fa.svelte';
   import { faWindowRestore } from '@fortawesome/free-regular-svg-icons';
   interface Props {
@@ -12,7 +11,7 @@
 {#if dev}
   <div>
     <a rel="external" href="/embed-previewer">
-      <Fa icon="{faWindowRestore}" />
+      <Fa icon={faWindowRestore} />
     </a>
   </div>
 {/if}
diff --git a/src/components/EmbedPreviewerLink/stories/docs/component.md b/src/components/EmbedPreviewerLink/stories/docs/component.md
deleted file mode 100644
index 35b360b1..00000000
--- a/src/components/EmbedPreviewerLink/stories/docs/component.md
+++ /dev/null
@@ -1,11 +0,0 @@
-An embed tool for development in graphics kit.
-
-```svelte
-<script>
-  import { EmbedPreviewerLink } from '@reuters-graphics/graphics-components';
-
-  import { dev } from '$app/env';
-</script>
-
-<EmbedPreviewerLink dev="{dev}" />
-```
diff --git a/src/components/EndNotes/EndNotes.mdx b/src/components/EndNotes/EndNotes.mdx
new file mode 100644
index 00000000..b6f64b5b
--- /dev/null
+++ b/src/components/EndNotes/EndNotes.mdx
@@ -0,0 +1,67 @@
+import { Meta, Canvas } from '@storybook/blocks';
+
+import * as EndNotesStories from './EndNotes.stories.svelte';
+
+<Meta of={EndNotesStories} />
+
+# EndNotes
+
+The `EndNotes` component adds notes such as sources, clarifiying notes and minor corrections that come at the end of a story.
+
+```svelte
+<script>
+  import { EndNotes } from '@reuters-graphics/graphics-components';
+
+  const notes = [
+    {
+      title: 'Note',
+      text: 'Data is current as of today.',
+    },
+    {
+      title: 'Sources',
+      text: 'Data, Inc.',
+    },
+    {
+      title: 'Edited by',
+      text: '<a href="https://www.reuters.com/graphics/">Editor</a>, Copyeditor',
+    },
+  ];
+</script>
+
+<EndNotes {notes} />
+```
+
+<Canvas of={EndNotesStories.Demo} />
+
+## Using with ArchieML docs
+
+With the Graphics Kit, you'll likely get your text value from an ArchieML doc...
+
+```yaml
+# ArchieML doc
+[endNotes]
+title: Note
+text: Data is current as of today
+
+title: Sources
+text: Data, Inc.
+
+title: Edited by
+text: Editor, Copyeditor
+[]
+```
+
+... which you'll pass to the `EndNotes` component.
+
+```svelte
+<!-- Graphics Kit -->
+<script>
+  import { EndNotes } from '@reuters-graphics/graphics-components';
+
+  import content from '$locales/en/content.json';
+</script>
+
+<EndNotes notes={content.endNotes} />
+```
+
+<Canvas of={EndNotesStories.Demo} />
diff --git a/src/components/EndNotes/EndNotes.stories.svelte b/src/components/EndNotes/EndNotes.stories.svelte
index 0a78b84f..19792051 100644
--- a/src/components/EndNotes/EndNotes.stories.svelte
+++ b/src/components/EndNotes/EndNotes.stories.svelte
@@ -1,20 +1,15 @@
 <script module lang="ts">
   import EndNotes from './EndNotes.svelte';
-  // @ts-ignore raw
-  import componentDocs from './stories/docs/component.md?raw';
 
-  import { withComponentDocs } from '$lib/docs/utils/withParams.js';
+  import { defineMeta } from '@storybook/addon-svelte-csf';
 
-  export const meta = {
+  const { Story } = defineMeta({
     title: 'Components/Text elements/EndNotes',
     component: EndNotes,
-    ...withComponentDocs(componentDocs),
-  };
+  });
 </script>
 
 <script>
-  import { Template, Story } from '@storybook/addon-svelte-csf';
-
   const notes = [
     {
       title: 'Note',
@@ -31,10 +26,4 @@
   ];
 </script>
 
-<Template >
-  {#snippet children({ args })}
-    <EndNotes {...args} />
-  {/snippet}
-</Template>
-
-<Story name="Default" args="{{ notes }}" />
+<Story name="Demo" args={{ notes }} />
diff --git a/src/components/EndNotes/EndNotes.svelte b/src/components/EndNotes/EndNotes.svelte
index 5917b29f..32a7ab6e 100644
--- a/src/components/EndNotes/EndNotes.svelte
+++ b/src/components/EndNotes/EndNotes.svelte
@@ -7,40 +7,33 @@
     title: string;
     /**
      * Contents of the note as a markdown string
-     * @required
      */
     text: string;
   }
 
-  
-
   import Block from '../Block/Block.svelte';
   import Markdown from '../Markdown/Markdown.svelte';
   interface Props {
     /**
-   * An array of endnote items.
-   * @required
-   */
-    notes?: EndNote[];
+     * An array of endnote items.
+     */
+    notes: EndNote[];
   }
 
-  let { notes = [] }: Props = $props();
+  let { notes }: Props = $props();
 </script>
 
 <Block class="notes fmt-6 fmb-8">
-  {#if notes}
-    {#each notes as note}
-      <div class="note-title">
-        <Markdown source="{note.title}" />
-      </div>
-      <div class="note-content">
-        <Markdown source="{note.text}" />
-      </div>
-    {/each}
-  {/if}
+  {#each notes as note}
+    <div class="note-title">
+      <Markdown source={note.title} />
+    </div>
+    <div class="note-content">
+      <Markdown source={note.text} />
+    </div>
+  {/each}
 </Block>
 
-<!-- svelte-ignore css_unused_selector -->
 <style lang="scss">
   @use '../../scss/mixins' as mixins;
 
diff --git a/src/components/EndNotes/stories/docs/component.md b/src/components/EndNotes/stories/docs/component.md
deleted file mode 100644
index be0eb489..00000000
--- a/src/components/EndNotes/stories/docs/component.md
+++ /dev/null
@@ -1,24 +0,0 @@
-End notes includes notes to the main article — usually things like sources, clarifiying notes and minor corrections at the end of a story.
-
-```svelte
-<script>
-  import { EndNotes } from '@reuters-graphics/graphics-components';
-
-  const notes = [
-    {
-      title: 'Note',
-      text: 'Data is current as of today.',
-    },
-    {
-      title: 'Sources',
-      text: 'Data, Inc.',
-    },
-    {
-      title: 'Edited by',
-      text: '<a href="https://www.reuters.com/graphics/">Editor</a>, Copyeditor',
-    },
-  ];
-</script>
-
-<EndNotes notes="{notes}" />
-```
diff --git a/src/components/FeaturePhoto/FeaturePhoto.mdx b/src/components/FeaturePhoto/FeaturePhoto.mdx
new file mode 100644
index 00000000..9ea5a3af
--- /dev/null
+++ b/src/components/FeaturePhoto/FeaturePhoto.mdx
@@ -0,0 +1,72 @@
+import { Meta, Canvas } from '@storybook/blocks';
+
+import * as FeaturePhotoStories from './FeaturePhoto.stories.svelte';
+
+<Meta of={FeaturePhotoStories} />
+
+# FeaturePhoto
+
+The `FeaturePhoto` component adds a full-width photo.
+
+```svelte
+<script>
+  import { FeaturePhoto } from '@reuters-graphics/graphics-components';
+  import { assets } from '$app/paths'; // 👈 If using in the Graphics Kit...
+</script>
+
+<FeaturePhoto
+  src={`${assets}/images/myImage.jpg`}
+  altText="Some alt text"
+  caption="A caption"
+/>
+```
+
+<Canvas of={FeaturePhotoStories.Demo} />
+
+## Using with ArchieML docs
+
+With the Graphics Kit, you'll likely get your text value from an ArchieML doc...
+
+```yaml
+# ArchieML doc
+[blocks]
+
+type: photo
+width: normal
+src: images/shark.jpg
+altText: The king of the sea
+caption: Carcharodon carcharias - REUTERS
+
+[]
+```
+
+... which you'll parse out of a ArchieML block object before passing to the `FeaturePhoto` component.
+
+```svelte
+<!-- App.svelte -->
+<script>
+  import { FeaturePhoto } from '@reuters-graphics/graphics-components';
+
+  import content from '$locales/en/content.json';
+  import { assets } from '$app/paths';
+</script>
+
+{#each content.blocks as block}
+  {#if block.Type === 'text'}
+    <!-- ... -->
+  {:else if block.type === 'photo'}
+    <FeaturePhoto
+      width={block.width}
+      src={`${assets}/${block.src}`}
+      altText={block.altText}
+      caption={block.caption}
+    />
+  {/if}
+{/each}
+```
+
+## Missing alt text
+
+`altText` is required in this component. If your photo is missing it, a small red text box will overlay the image.
+
+<Canvas of={FeaturePhotoStories.MissingAltText} />
diff --git a/src/components/FeaturePhoto/FeaturePhoto.stories.svelte b/src/components/FeaturePhoto/FeaturePhoto.stories.svelte
index 07b53afb..55769963 100644
--- a/src/components/FeaturePhoto/FeaturePhoto.stories.svelte
+++ b/src/components/FeaturePhoto/FeaturePhoto.stories.svelte
@@ -1,26 +1,10 @@
 <script module lang="ts">
-    import { defineMeta } from '@storybook/addon-svelte-csf';
-
-  // @ts-ignore raw
-  import componentDocs from './stories/docs/component.md?raw';
-  // @ts-ignore raw
-  import archieMLDocs from './stories/docs/archieML.md?raw';
-  // @ts-ignore raw
-  import missingAltTextDocs from './stories/docs/missingAltText.md?raw';
-
+  import { defineMeta } from '@storybook/addon-svelte-csf';
   import FeaturePhoto from './FeaturePhoto.svelte';
 
-  // import {
-  //   withComponentDocs,
-  //   withStoryDocs,
-  // } from '$lib/docs/utils/withParams.js';
-
-
   const { Story } = defineMeta({
     title: 'Components/Multimedia/FeaturePhoto',
     component: FeaturePhoto,
-    // ...withComponentDocs(componentDocs),
-    tags: ['autodocs'],
     argTypes: {
       width: {
         control: 'select',
@@ -35,38 +19,23 @@
 </script>
 
 <script>
-  // @ts-ignore jpg
-  import sharkSrc from './stories/shark.jpg';
+  import sharkSrc from './images/shark.jpg';
 </script>
 
-
 <Story
-  name="Default"
-  args="{{
+  name="Demo"
+  args={{
     src: sharkSrc,
     altText: 'A shark!',
-    width: 'normal',
     caption: 'Carcharodon carcharias - REUTERS',
-  }}"
+  }}
 />
 
-<Story
-  name="ArchieML"
-  args="{{
-    src: sharkSrc,
-    altText: 'A shark!',
-    width: 'normal',
-    caption: 'Carcharodon carcharias - REUTERS',
-  }}"
-/>
-<!-- {...withStoryDocs(archieMLDocs)} -->
-
 <Story
   name="Missing altText"
-  args="{{
+  exportName="MissingAltText"
+  args={{
     src: sharkSrc,
-    width: 'normal',
     caption: 'Carcharodon carcharias - REUTERS',
-  }}"
+  }}
 />
-<!-- {...withStoryDocs(missingAltTextDocs)} -->
diff --git a/src/components/FeaturePhoto/FeaturePhoto.svelte b/src/components/FeaturePhoto/FeaturePhoto.svelte
index 0ff0b7f6..a750d23d 100644
--- a/src/components/FeaturePhoto/FeaturePhoto.svelte
+++ b/src/components/FeaturePhoto/FeaturePhoto.svelte
@@ -1,75 +1,89 @@
-<!-- @migration-task Error while migrating Svelte code: Cannot set properties of undefined (setting 'next') -->
 <!-- @component `FeaturePhoto` [Read the docs.](https://reuters-graphics.github.io/graphics-components/?path=/docs/components-multimedia-featurephoto--docs) -->
 <script lang="ts">
   import { onMount } from 'svelte';
-  import Block from '../Block/Block.svelte';
   import type { ContainerWidth } from '../@types/global';
+
+  import Block from '../Block/Block.svelte';
   import PaddingReset from '../PaddingReset/PaddingReset.svelte';
 
-  /**
-   * Photo src
-   * @type {string}
-   * @required
-   */
-  export let src: string;
-  /**
-   * Photo altText
-   * @type {string}
-   * @required
-   */
-  export let altText: string;
-  /**
-   * Add an id to target with custom CSS.
-   * @type {string}
-   */
-  export let id: string = '';
-  /**
-   * Add extra classes to target with custom CSS.
-   * @type {string}
-   */
-  let cls: string = '';
-  export { cls as class };
-  /**
-   * Caption below the photo
-   * @type {string}
-   */
-  export let caption: string;
-  /**
-   * Height of the photo placeholder when lazy-loading
-   */
-  export let height: number = 100;
-  /**
-   * Width of the container, one of: normal, wide, wider, widest or fluid
-   */
-  export let width: ContainerWidth = 'normal';
+  interface Props {
+    /**
+     * Photo source
+     */
+    src: string;
+    /**
+     * Photo altText
+     */
+    altText: string;
+    /**
+     * Add an id to target with custom CSS.
+     */
+    id?: string;
+    /**
+     * Add classes to target with custom CSS.
+     */
+    class?: string;
+    /**
+     * Photo caption
+     */
+    caption?: string;
+    /**
+     * Height of the photo placeholder when lazy-loading
+     */
+    height?: number;
+    /**
+     * Width of the container: normal, wide, wider, widest or fluid
+     */
+    width?: ContainerWidth;
+    /**
+     * Set a different width for the text vs the photo. For example, "normal" to keep the title, description and notes inline with the rest of the text well. Can't ever be wider than `width`.
+     */
+    textWidth?: ContainerWidth;
+    /**
+     * Whether to lazy load the photo using the [Intersection Observer API](https://developer.mozilla.org/en-US/docs/Web/API/Intersection_Observer_API)
+     */
+    lazy?: boolean;
+    /**
+     * Set Intersection Observer [rootMargin](https://developer.mozilla.org/en-US/docs/Web/API/Intersection_Observer_API#rootmargin) `top` when lazy loading.
+     */
+    top?: number;
+    /**
+     * Set Intersection Observer [rootMargin](https://developer.mozilla.org/en-US/docs/Web/API/Intersection_Observer_API#rootmargin) `bottom` when lazy loading.
+     */
+    bottom?: number;
+    /**
+     * Set Intersection Observer [rootMargin](https://developer.mozilla.org/en-US/docs/Web/API/Intersection_Observer_API#rootmargin) `left` when lazy loading.
+     */
+    left?: number;
+    /**
+     * Set Intersection Observer [rootMargin](https://developer.mozilla.org/en-US/docs/Web/API/Intersection_Observer_API#rootmargin) `right` when lazy loading.
+     */
+    right?: number;
+  }
 
-  /**
-   * Set a different width for the text within the text well, for example,
-   * "normal" to keep the title, description and notes inline with the rest
-   * of the text well. Can't ever be wider than `width`.
-   * @type {string}
-   */
-  export let textWidth: ContainerWidth | null = 'normal';
+  let {
+    src,
+    altText,
+    id = '',
+    class: cls = '',
+    caption,
+    height = 100,
+    width = 'normal',
+    textWidth = 'normal',
+    lazy = true,
+    top = 0,
+    bottom = 0,
+    left = 0,
+    right = 0,
+  }: Props = $props();
 
-  /**
-   * Whether to lazy load the photo using the [Intersection Observer API](https://developer.mozilla.org/en-US/docs/Web/API/Intersection_Observer_API)
-   */
-  export let lazy: boolean = false;
-  /** Set Intersection Observer [rootMargin](https://developer.mozilla.org/en-US/docs/Web/API/Intersection_Observer_API#rootmargin) `top` when lazy loading. */
-  export let top = 0;
-  /** Set Intersection Observer [rootMargin](https://developer.mozilla.org/en-US/docs/Web/API/Intersection_Observer_API#rootmargin) `bottom` when lazy loading. */
-  export let bottom = 0;
-  /** Set Intersection Observer [rootMargin](https://developer.mozilla.org/en-US/docs/Web/API/Intersection_Observer_API#rootmargin) `left` when lazy loading. */
-  export let left = 0;
-  /** Set Intersection Observer [rootMargin](https://developer.mozilla.org/en-US/docs/Web/API/Intersection_Observer_API#rootmargin) `right` when lazy loading. */
-  export let right = 0;
-
-  let intersecting = false;
-  let container;
+  let intersecting = $state(false);
+  let container: HTMLElement;
   const intersectable = typeof IntersectionObserver !== 'undefined';
 
   onMount(() => {
     if (!lazy) return;
+
     if (intersectable) {
       const rootMargin = `${bottom}px ${left}px ${top}px ${right}px`;
 
@@ -93,18 +107,18 @@
 
 <Block {width} class="photo fmy-6 {cls}" {id}>
   <figure
-    bind:this="{container}"
+    bind:this={container}
     aria-label="media"
     class="w-full flex flex-col relative"
   >
     {#if !lazy || (intersectable && intersecting)}
-      <img class="w-full my-0" {src} alt="{altText}" />
+      <img class="w-full my-0" {src} alt={altText} />
     {:else}
-      <div class="placeholder w-full" style="{`height: ${height}px;`}"></div>
+      <div class="placeholder w-full" style={`height: ${height}px;`}></div>
     {/if}
     {#if caption}
-      <PaddingReset containerIsFluid="{width === 'fluid'}">
-        <Block width="{textWidth}" class="notes w-full fmy-0">
+      <PaddingReset containerIsFluid={width === 'fluid'}>
+        <Block width={textWidth} class="notes w-full fmy-0">
           <figcaption>
             {caption}
           </figcaption>
diff --git a/src/components/FeaturePhoto/stories/shark.jpg b/src/components/FeaturePhoto/images/shark.jpg
similarity index 100%
rename from src/components/FeaturePhoto/stories/shark.jpg
rename to src/components/FeaturePhoto/images/shark.jpg
diff --git a/src/components/FeaturePhoto/stories/docs/archieML.md b/src/components/FeaturePhoto/stories/docs/archieML.md
deleted file mode 100644
index f2b1817a..00000000
--- a/src/components/FeaturePhoto/stories/docs/archieML.md
+++ /dev/null
@@ -1,37 +0,0 @@
-```yaml
-[blocks]
-
-type: photo
-width: normal
-src: images/shark.jpg
-altText: The king of the sea
-caption: Carcharodon carcharias - REUTERS
-
-[]
-```
-
-```svelte
-<!-- App.svelte -->
-<script>
-  import { FeaturePhoto } from '@reuters-graphics/graphics-components';
-
-  import content from '$locales/en/content.json';
-  import { assets } from '$app/paths';
-</script>
-
-{#each content.blocks as block}
-  {#if block.Type === 'text'}
-  <!-- ... -->
-
-  {:else if block.type === 'photo'}
-    <FeaturePhoto
-      width="{block.width}"
-      src="{`${assets}/${block.src}`}"
-      altText="{block.altText}"
-      caption="{block.caption}"
-    />
-
-  <!-- ... -->
-  {/if}
-{/each}
-```
diff --git a/src/components/FeaturePhoto/stories/docs/component.md b/src/components/FeaturePhoto/stories/docs/component.md
deleted file mode 100644
index 846cfcf9..00000000
--- a/src/components/FeaturePhoto/stories/docs/component.md
+++ /dev/null
@@ -1,16 +0,0 @@
-A full-width photo inside the text well.
-
-```svelte
-<script>
-  import { FeaturePhoto } from '@reuters-graphics/graphics-components';
-  import { assets } from '$app/paths'; // 👈 If using in the Graphics Kit...
-</script>
-
-<FeaturePhoto
-  src="{`${assets}/images/myImage.jpg`}"
-  altText="Some alt text"
-  caption="A caption"
-  lazy="{false}"
-  width="normal"
-/>
-```
diff --git a/src/components/FeaturePhoto/stories/docs/missingAltText.md b/src/components/FeaturePhoto/stories/docs/missingAltText.md
deleted file mode 100644
index 48016d3e..00000000
--- a/src/components/FeaturePhoto/stories/docs/missingAltText.md
+++ /dev/null
@@ -1 +0,0 @@
-If your photo is missing `altText` a small warning will overlay the image.
diff --git a/src/components/Framer/Framer.stories.svelte b/src/components/Framer/Framer.stories.svelte
index a9d34b9f..e47c14ba 100644
--- a/src/components/Framer/Framer.stories.svelte
+++ b/src/components/Framer/Framer.stories.svelte
@@ -17,7 +17,7 @@
   import { Template, Story } from '@storybook/addon-svelte-csf';
 </script>
 
-<Template >
+<Template>
   {#snippet children({ args })}
     <Framer {...args} />
   {/snippet}
@@ -25,9 +25,9 @@
 
 <Story
   name="Default"
-  args="{{
+  args={{
     embeds: [
       'https://graphics.reuters.com/USA-CONGRESS/FUNDRAISING/zjvqkawjlvx/embeds/en/embed/?zzz',
     ],
-  }}"
+  }}
 />
diff --git a/src/components/Framer/Framer.svelte b/src/components/Framer/Framer.svelte
index 97e13751..a3ea1eae 100644
--- a/src/components/Framer/Framer.svelte
+++ b/src/components/Framer/Framer.svelte
@@ -62,25 +62,20 @@
 
   <div id="typeahead-container">
     <div class="embed-link">
-      <a
-        rel="external"
-        target="_blank"
-        href="{activeEmbed}"
-        title="{activeEmbed}"
-      >
-        Live link <Fa icon="{faLink}" />
+      <a rel="external" target="_blank" href={activeEmbed} title={activeEmbed}>
+        Live link <Fa icon={faLink} />
       </a>
     </div>
     <Typeahead
       label="Select an embed"
-      value="{embedTitles[embeds.indexOf(activeEmbed)] ||
+      value={embedTitles[embeds.indexOf(activeEmbed)] ||
         embedTitles[activeEmbedIndex] ||
-        embedTitles[0]}"
-      extract="{(d) => embedTitles[d.index]}"
-      data="{embeds.map((embed, index) => ({ index, embed }))}"
-      placeholder="{'Search'}"
-      showDropdownOnFocus="{true}"
-      on:select="{({ detail }) => {
+        embedTitles[0]}
+      extract={(d) => embedTitles[d.index]}
+      data={embeds.map((embed, index) => ({ index, embed }))}
+      placeholder={'Search'}
+      showDropdownOnFocus={true}
+      on:select={({ detail }) => {
         if (typeof window !== 'undefined') {
           window.localStorage.setItem(
             'framer-active-embed',
@@ -89,7 +84,7 @@
         }
         activeEmbed = detail.original.embed;
         activeEmbedIndex = detail.original.index;
-      }}"
+      }}
     />
   </div>
 
@@ -101,7 +96,7 @@
 
 <div id="home-link">
   <a rel="external" href="./../">
-    <Fa icon="{faDesktop}" />
+    <Fa icon={faDesktop} />
   </a>
 </div>
 
diff --git a/src/components/Framer/Resizer/index.svelte b/src/components/Framer/Resizer/index.svelte
index 3c5294ad..212a2baf 100644
--- a/src/components/Framer/Resizer/index.svelte
+++ b/src/components/Framer/Resizer/index.svelte
@@ -11,7 +11,11 @@
     minFrameWidth?: number;
   }
 
-  let { breakpoints = [330, 510, 660, 930, 1200], maxFrameWidth = 1200, minFrameWidth = 320 }: Props = $props();
+  let {
+    breakpoints = [330, 510, 660, 930, 1200],
+    maxFrameWidth = 1200,
+    minFrameWidth = 320,
+  }: Props = $props();
 
   let container = $state();
 
@@ -94,25 +98,25 @@
   onmousemove={move}
   onmouseup={end}
   onkeydown={handleKeyDown}
-  bind:innerWidth="{windowInnerWidth}"
+  bind:innerWidth={windowInnerWidth}
 />
 
 <div id="resizer">
   <div class="slider">
-    <div class="label" style="{`opacity: ${sliding || isFocused ? 1 : 0};`}">
+    <div class="label" style={`opacity: ${sliding || isFocused ? 1 : 0};`}>
       {pixelLabel || $width}px
     </div>
     <button
       class="icon left"
-      disabled="{$width === minWidth}"
+      disabled={$width === minWidth}
       onclick={decrement}
       onfocus={onFocus}
       onmouseover={onFocus}
       onmouseleave={onBlur}
     >
-      <Fa icon="{faMobileAlt}" fw />
+      <Fa icon={faMobileAlt} fw />
     </button>
-    <div class="slider-container" bind:this="{container}">
+    <div class="slider-container" bind:this={container}>
       <div class="track"></div>
       <div
         class="handle"
@@ -126,13 +130,13 @@
     </div>
     <button
       class="icon right"
-      disabled="{$width === maxWidth}"
+      disabled={$width === maxWidth}
       onclick={increment}
       onfocus={onFocus}
       onmouseover={onFocus}
       onmouseleave={onBlur}
     >
-      <Fa icon="{faDesktop}" fw />
+      <Fa icon={faDesktop} fw />
     </button>
   </div>
 </div>
diff --git a/src/components/Framer/Typeahead/index.svelte b/src/components/Framer/Typeahead/index.svelte
index 2e0aafca..dd07ef9b 100644
--- a/src/components/Framer/Typeahead/index.svelte
+++ b/src/components/Framer/Typeahead/index.svelte
@@ -158,55 +158,55 @@
 </script>
 
 <svelte:window
-  on:click="{({ target }) => {
+  on:click={({ target }) => {
     if (!hideDropdown && !comboboxRef?.contains(target)) {
       close();
     }
-  }}"
+  }}
 />
 
 <div
   data-svelte-typeahead
-  bind:this="{comboboxRef}"
+  bind:this={comboboxRef}
   role="combobox"
   aria-haspopup="listbox"
   aria-owns="{id}-listbox"
-  class:dropdown="{results.length > 0}"
+  class:dropdown={results.length > 0}
   aria-controls="{id}-listbox"
-  aria-expanded="{showResults ||
-    (isFocused && value.length > 0 && results.length === 0)}"
+  aria-expanded={showResults ||
+    (isFocused && value.length > 0 && results.length === 0)}
   id="{id}-typeahead"
 >
   <Search
     {id}
-    removeFormAriaAttributes="{true}"
+    removeFormAriaAttributes={true}
     {...$$restProps}
-    bind:ref="{searchRef}"
+    bind:ref={searchRef}
     aria-autocomplete="list"
     aria-controls="{id}-listbox"
     aria-labelledby="{id}-label"
-    aria-activedescendant="{(
+    aria-activedescendant={(
       selectedIndex >= 0 && !hideDropdown && results.length > 0
     ) ?
       `${id}-result-${selectedIndex}`
-    : null}"
+    : null}
     bind:value
     on:type
     on:input
     on:change
     on:focus
-    on:focus="{() => {
+    on:focus={() => {
       open();
       if (showDropdownOnFocus) {
         showResults = true;
         isFocused = true;
       }
-    }}"
+    }}
     on:clear
-    on:clear="{open}"
+    on:clear={open}
     on:blur
     on:keydown
-    on:keydown="{(e) => {
+    on:keydown={(e) => {
       if (results.length === 0) return;
 
       switch (e.key) {
@@ -228,10 +228,10 @@
           close();
           break;
       }
-    }}"
+    }}
   />
   <ul
-    class:svelte-typeahead-list="{true}"
+    class:svelte-typeahead-list={true}
     role="listbox"
     aria-labelledby="{id}-label"
     id="{id}-listbox"
@@ -241,24 +241,24 @@
         <li
           role="option"
           id="{id}-result-{index}"
-          class:selected="{selectedIndex === index}"
-          class:disabled="{result.disabled}"
-          aria-selected="{selectedIndex === index}"
-          on:click="{() => {
+          class:selected={selectedIndex === index}
+          class:disabled={result.disabled}
+          aria-selected={selectedIndex === index}
+          on:click={() => {
             if (result.disabled) return;
             selectedIndex = index;
             select();
-          }}"
-          on:keyup="{(e) => {
+          }}
+          on:keyup={(e) => {
             if (e.key !== 'Enter') return;
             if (result.disabled) return;
             selectedIndex = index;
             select();
-          }}"
-          on:mouseenter="{() => {
+          }}
+          on:mouseenter={() => {
             if (result.disabled) return;
             selectedIndex = index;
-          }}"
+          }}
         >
           <slot {result} {index} {value}>
             {@html result.string}
diff --git a/src/components/GraphicBlock/AriaHidden.svelte b/src/components/GraphicBlock/AriaHidden.svelte
deleted file mode 100644
index 4379590c..00000000
--- a/src/components/GraphicBlock/AriaHidden.svelte
+++ /dev/null
@@ -1,20 +0,0 @@
-<script lang="ts">
-  
-  interface Props {
-    /**
-   * Whether to wrap the graphic with an aria hidden tag.
-   */
-    hidden?: boolean;
-    children?: import('svelte').Snippet;
-  }
-
-  let { hidden = false, children }: Props = $props();
-</script>
-
-{#if hidden}
-  <div aria-hidden="true">
-    {@render children?.()}
-  </div>
-{:else}
-  {@render children?.()}
-{/if}
diff --git a/src/components/GraphicBlock/GraphicBlock.mdx b/src/components/GraphicBlock/GraphicBlock.mdx
new file mode 100644
index 00000000..10ef9fea
--- /dev/null
+++ b/src/components/GraphicBlock/GraphicBlock.mdx
@@ -0,0 +1,215 @@
+import { Meta, Canvas } from '@storybook/blocks';
+
+import * as GraphicBlockStories from './GraphicBlock.stories.svelte';
+
+<Meta of={GraphicBlockStories} />
+
+# GraphicBlock
+
+The `GraphicBlock` component is a special derivative of the [Block](?path=/docs/components-page-layout-block--docs) component that wraps around your graphic. It also adds a title, description, notes and other text elements.
+
+Many other Reuters Graphics components use `GraphicBlock` to wrap graphics with styled text.
+
+```svelte
+<script>
+  import { GraphicBlock } from '@reuters-graphics/graphics-components';
+</script>
+
+<GraphicBlock
+  title="Title for my chart"
+  description="Some description for your chart."
+  notes={`Note: Data current as of Aug. 2, 2022.\n\nSource: [Google research](https://google.com)`}
+>
+  <!-- Your chart goes here -->
+  <div id="my-chart" />
+</GraphicBlock>
+```
+
+<Canvas of={GraphicBlockStories.Demo} />
+
+## Using with ai2svelte and ArchieML docs
+
+The `GraphicBlock` component is built to handle [ai2svelte](https://github.com/reuters-graphics/ai2svelte) graphics in Graphics Kit.
+
+You'll likely get your text value from an ArchieML doc...
+
+```yaml
+# ArchieML doc
+[blocks]
+type: ai-graphic
+width: normal
+chart: AiMap # IMPORTANT: This must match the name of the ai2svelte chart you import in App.svelte
+title: Earthquake in Haiti
+description: The 7.2-magnitude earthquake struck at 8:29 a.m. EST, Aug. 14, 2021.
+notes: \Note: A shakemap represents the ground shaking produced by an earthquake.
+
+\Source: USGIS
+:end
+altText: A map that shows the shake intensity of the earthquake, which was worst in central Haiti.
+:end
+[]
+```
+
+... which you'll parse out of a ArchieML block object before passing to the `GraphicBlock` component.
+
+To pass your ai2svelte graphic into `GraphicBlock` component, import your ai2svelte graphic at the top of `App.svelte` and add it to the `aiCharts` object.
+
+> **Important❗:** Make sure that the value for `chart` in the ArchieML doc matches the name of the ai2svelte file imported in `App.svelte`.
+
+```svelte
+<!-- App.svelte -->
+<script>
+  // IMPORTANT: The name of your ai2svelte chart must match `chart` in your ArchieML doc
+  import AiMap from './ai2svelte/my-map.svelte';
+  // Error handler for missing ai2svelte charts
+  import LogBlock from './components/dev/LogBlock.svelte';
+
+  // If using with the Graphics Kit
+  import { assets } from '$app/paths';
+
+  // A built-in helper function in Graphis Kit for validating container width
+  import { containerWidth } from '$utils/propValidators';
+
+  // Add your imported ai2svelte charts to this object
+  const aiCharts = {
+    AiMap,
+    // Other ai2svelte graphics...
+  };
+</script>
+
+<!-- Loop through ArchieML blocks -->
+{#each content.blocks as block}
+  {#if block.type === 'ai-graphic'}
+    {#if !aiCharts[block.chart]}
+      <!-- Error message for when the ai2svelte chart is missing -->
+      <LogBlock message={`Unable to find "${block.chart}" in aiCharts`} />
+    {:else}
+      <!-- Get the ai2svelte graphic specified by `chart` in ArchieML -->
+      {@const AiChart = aiCharts[block.chart]}
+      <GraphicBlock
+        id={block.chart}
+        width={containerWidth(block.width)}
+        title={block.title}
+        description={block.description}
+        notes={block.notes}
+        ariaDescription={block.altText}
+      >
+        <!-- In Graphics Kit, pass the `assetsPath` prop -->
+        <AiChart assetsPath={assets || '/'} />
+      </GraphicBlock>
+    {/if}
+  {/if}
+{/each}
+```
+
+<Canvas of={GraphicBlockStories.Ai2SvelteAndArchieML} />
+
+## Custom text
+
+You can override the default styles for title and notes by making your own custom elements and passing them as `title` and `notes` [snippets](https://svelte.dev/docs/svelte/snippet) instead of as strings:
+
+```svelte
+<GraphicBlock>
+  <!-- Custom title snippet -->
+  {#snippet title()}
+    <h5>My smaller title</h5>
+  {/snippet}
+
+  <!-- Your graphic -->
+  <div id="my-chart"></div>
+
+  <!-- Custom notes snippet -->
+  {#snippet notes()}
+    <aside>
+      <p><strong>Note:</strong> Data current as of Aug. 2, 2022.</p>
+    </aside>
+  {/snippet}
+</GraphicBlock>
+```
+
+<Canvas of={GraphicBlockStories.CustomText} />
+
+## ARIA descriptions
+
+If the text in your chart isn't easily read by screen readers — for example, a map with annotations that wouldn't make sense without the visual — add an `ariaDescription` that describes the chart.
+
+The `ariaDescription` string will be processed as markdown, so you can add multiple paragraphs, links, headers, etc. in markdown.
+
+> **Note:** When you set an `ariaDescription`, your graphic will be automatically wrapped in a div with [aria-hidden="true"](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Reference/Attributes/aria-hidden), which tells screen readers to read the hidden ARIA description and skip the text in the graphic.
+
+```svelte
+<GraphicBlock
+  title="Earthquake in Haiti"
+  description="The 7.2-magnitude earthquake struck at 8:29 a.m. EST, Aug. 14, 2021."
+  notes="Note: A shakemap represents the ground shaking produced by an earthquake."
+  ariaDescription="A map showing the shake intensity produced by the earthquake."
+>
+  <!-- In Graphics Kit, pass the `assetsPath` prop -->
+  <AiChart assetsPath={assets || '/'} />
+</GraphicBlock>
+```
+
+<Canvas of={GraphicBlockStories.AriaDescription} />
+
+## Custom ARIA descriptions
+
+Sometimes, instead of a simple sentence, we want to provide a data table or something more complex as an ARIA description. To do this, pass the custom elements as an `ariaDescription` [snippet](https://svelte.dev/docs/svelte/snippet) instead of as a string, as in the [example above](?path=/docs/components-graphics-graphicblock--docs#aria-descriptions).
+
+[Read this](https://accessibility.psu.edu/images/charts/) for more information on using screen reader data tables for charts.
+
+> **Note:** The `customAria` snippet will override the `ariaDescription` and will also hide the text in your graphic from screen readers.
+
+```svelte
+<GraphicBlock
+  title="Earthquake in Haiti"
+  description="The 7.2-magnitude earthquake struck at 8:29 a.m. EST, Aug. 14, 2021."
+  notes="Note: A shakemap represents the ground shaking produced by an earthquake."
+>
+  <!-- In Graphics Kit, pass the `assetsPath` prop -->
+  <AiChart assetsPath={assets || '/'} />
+
+  <!-- Custom ARIA description snippet -->
+  {#snippet ariaDescription()}
+    <p>
+      A shakemap shows the intensity of the 7.2-magnitude earthquake that struck
+      Haiti at 8:29 a.m. EST, Aug. 14, 2021.
+    </p>
+    <table>
+      <tbody>
+        <tr>
+          <th>City</th>
+          <th>Felt shake strength</th>
+        </tr>
+        <tr>
+          <td>Les Cayes</td>
+          <td>Very strong</td>
+        </tr>
+        <tr>
+          <td>Jeremie</td>
+          <td>Strong</td>
+        </tr>
+      </tbody>
+    </table>
+  {/snippet}
+</GraphicBlock>
+
+<!-- Optionally, style the visually hidden table nicely for sighted readers who use screen readers -->
+<style lang="scss">
+  table {
+    width: 100%;
+    border-collapse: collapse;
+
+    th,
+    td {
+      border: 1px solid #ddd;
+      padding: 8px;
+    }
+
+    th {
+      background-color: #f2f2f2;
+    }
+  }
+</style>
+```
+
+<Canvas of={GraphicBlockStories.CustomAriaDescription} />
diff --git a/src/components/GraphicBlock/GraphicBlock.stories.svelte b/src/components/GraphicBlock/GraphicBlock.stories.svelte
index 6923b855..f19268eb 100644
--- a/src/components/GraphicBlock/GraphicBlock.stories.svelte
+++ b/src/components/GraphicBlock/GraphicBlock.stories.svelte
@@ -1,23 +1,10 @@
 <script module lang="ts">
-  // @ts-ignore raw
-  import componentDocs from './stories/docs/component.md?raw';
-  // @ts-ignore raw
-  import archieMLDocs from './stories/docs/archieML.md?raw';
-  // @ts-ignore raw
-  import customTextDocs from './stories/docs/customText.md?raw';
-  // @ts-ignore raw
-  import ai2svelteDocs from './stories/docs/ai2svelte.md?raw';
-  // @ts-ignore raw
-  import ariaDocs from './stories/docs/aria.md?raw';
-
+  import { defineMeta } from '@storybook/addon-svelte-csf';
   import GraphicBlock from './GraphicBlock.svelte';
 
-  import { withComponentDocs, withStoryDocs } from '$docs/utils/withParams.js';
-
-  export const meta = {
+  const { Story } = defineMeta({
     title: 'Components/Graphics/GraphicBlock',
     component: GraphicBlock,
-    ...withComponentDocs(componentDocs),
     argTypes: {
       width: {
         control: 'select',
@@ -28,43 +15,28 @@
         options: ['normal', 'wide', 'wider', 'widest', 'fluid'],
       },
     },
-  };
+  });
 </script>
 
 <script>
-  import { Template, Story } from '@storybook/addon-svelte-csf';
-
-  import AiMap from './stories/ai2svelte/ai-chart.svelte';
-
-  // @ts-ignore img
-  import PlaceholderImg from './stories/placeholder.png';
+  import AiMap from './demo/ai2svelte/ai-chart.svelte';
+  import PlaceholderImg from './demo/placeholder.png';
 </script>
 
-<Template >
-  {#snippet children({ args })}
-    <GraphicBlock {...args}>
-      <div class="demo-graphic">
-        <img src="{PlaceholderImg}" alt="placeholder" />
-      </div>
-    </GraphicBlock>
-  {/snippet}
-</Template>
-
-<Story
-  name="Default"
-  args="{{
-    width: 'normal',
-    title: 'Bacon ipsum dolor amet t-bone',
-    description:
-      'Pork loin t-bone jowl prosciutto, short loin flank kevin tri-tip cupim pig pork. Meatloaf tri-tip frankfurter short ribs, cupim brisket bresaola chislic tail jerky burgdoggen pancetta.',
-    notes:
-      'Note: Data current as of Aug. 2, 2022.\n\nSource: [Google research](https://google.com)',
-  }}"
-/>
-
-<Story name="ArchieML" {...withStoryDocs(archieMLDocs)}>
+<Story name="Demo">
+  <GraphicBlock
+    title="Title for my chart"
+    description="Some description for your chart."
+    notes={`Note: Data current as of Aug. 2, 2022.\n\nSource: [Google research](https://google.com)`}
+  >
+    <div id="my-chart">
+      <img src={PlaceholderImg} alt="placeholder" />
+    </div>
+  </GraphicBlock>
+</Story>
+
+<Story name="Ai2svelte and ArchieML" exportName="Ai2SvelteAndArchieML">
   <GraphicBlock
-    width="normal"
     title="Earthquake in Haiti"
     description="The 7.2-magnitude earthquake struck at 8:29 a.m. EST, Aug. 14, 2021."
     notes="Note: A shakemap represents the ground shaking produced by an earthquake."
@@ -73,38 +45,26 @@
   </GraphicBlock>
 </Story>
 
-<Story name="Custom text" {...withStoryDocs(customTextDocs)}>
-  <GraphicBlock width="normal">
-    {#snippet title()}
-        <div >
-        <h5>My smaller title</h5>
-      </div>
-      {/snippet}
+<Story name="Custom text" exportName="CustomText">
+  <GraphicBlock>
     <div class="demo-graphic">
-      <img src="{PlaceholderImg}" alt="placeholder" />
+      <img src={PlaceholderImg} alt="placeholder" />
     </div>
+
+    {#snippet title()}
+      <h5>My smaller title</h5>
+    {/snippet}
+
     {#snippet notes()}
-        <aside >
+      <aside>
         <p><strong>Note:</strong> Data current as of Aug. 2, 2022.</p>
       </aside>
-      {/snippet}
+    {/snippet}
   </GraphicBlock>
 </Story>
 
-<Story name="Ai2svelte" {...withStoryDocs(ai2svelteDocs)}>
+<Story name="AREA description" exportName="AriaDescription">
   <GraphicBlock
-    width="normal"
-    title="Earthquake in Haiti"
-    description="The 7.2-magnitude earthquake struck at 8:29 a.m. EST, Aug. 14, 2021."
-    notes="Note: A shakemap represents the ground shaking produced by an earthquake."
-  >
-    <AiMap />
-  </GraphicBlock>
-</Story>
-
-<Story name="ARIA" {...withStoryDocs(ariaDocs)}>
-  <GraphicBlock
-    width="normal"
     title="Earthquake in Haiti"
     description="The 7.2-magnitude earthquake struck at 8:29 a.m. EST, Aug. 14, 2021."
     notes="Note: A shakemap represents the ground shaking produced by an earthquake."
@@ -114,6 +74,38 @@
   </GraphicBlock>
 </Story>
 
+<Story name="Custom AREA description" exportName="CustomAriaDescription">
+  <GraphicBlock
+    title="Earthquake in Haiti"
+    description="The 7.2-magnitude earthquake struck at 8:29 a.m. EST, Aug. 14, 2021."
+    notes="Note: A shakemap represents the ground shaking produced by an earthquake."
+  >
+    <AiMap />
+    {#snippet ariaDescription()}
+      <p>
+        A shakemap shows the intensity of the 7.2-magnitude earthquake that
+        struck Haiti at 8:29 a.m. EST, Aug. 14, 2021.
+      </p>
+      <table>
+        <tbody>
+          <tr>
+            <th>City</th>
+            <th>Felt shake strength</th>
+          </tr>
+          <tr>
+            <td>Les Cayes</td>
+            <td>Very strong</td>
+          </tr>
+          <tr>
+            <td>Jeremie</td>
+            <td>Strong</td>
+          </tr>
+        </tbody>
+      </table>
+    {/snippet}
+  </GraphicBlock>
+</Story>
+
 <style lang="scss">
   div.demo-graphic {
     height: 400px;
@@ -125,4 +117,18 @@
       opacity: 0.4;
     }
   }
+
+  // Style the table nicely
+  table {
+    width: 100%;
+    border-collapse: collapse;
+    th,
+    td {
+      border: 1px solid #ddd;
+      padding: 8px;
+    }
+    th {
+      background-color: #f2f2f2;
+    }
+  }
 </style>
diff --git a/src/components/GraphicBlock/GraphicBlock.svelte b/src/components/GraphicBlock/GraphicBlock.svelte
index f6824c1c..e8cef209 100644
--- a/src/components/GraphicBlock/GraphicBlock.svelte
+++ b/src/components/GraphicBlock/GraphicBlock.svelte
@@ -1,145 +1,148 @@
-<!-- @migration-task Error while migrating Svelte code: Cannot set properties of undefined (setting 'next') -->
 <!-- @component `GraphicBlock` [Read the docs.](https://reuters-graphics.github.io/graphics-components/?path=/docs/components-graphics-graphicblock--docs) -->
 <script lang="ts">
+  // Types
   import type { ContainerWidth } from '../@types/global';
+  import type { Snippet } from 'svelte';
 
-  /**
-   * Width of the component within the text well.
-   * @type {string}
-   */
-  export let width: ContainerWidth = 'normal';
-
-  /**
-   * Add an id to the block tag to target it with custom CSS.
-   * @type {string}
-   */
-  export let id: string = '';
-  /**
-   * Add extra classes to the block tag to target it with custom CSS.
-   * @type {string}
-   */
-  let cls: string = '';
-  export { cls as class };
-
-  /** Snap block to column widths, rather than fluidly resizing them. */
-  export let snap: boolean = false;
-
-  /**
-   * ARIA [role](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Roles) for the block
-   * @type {string}
-   */
-  export let role: string | null = null;
-
-  /**
-   * Notes to the graphic, passed in as a markdown string.
-   * @type {string}
-   */
-  export let notes: string | null = null;
-
-  /**
-   * Set a different width for the text within the text well, for example,
-   * "normal" to keep the title, description and notes inline with the rest
-   * of the text well. Can't ever be wider than `width`.
-   * @type {string}
-   */
-  export let textWidth: ContainerWidth | null = 'normal';
-
-  /**
-   * Title of the graphic
-   * @type {string}
-   */
-  export let title: string | null = null;
-
-  /**
-   * Description of the graphic, passed in as a markdown string.
-   * @type {string}
-   */
-  export let description: string | null = null;
-
-  /**
-   * ARIA [label](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Attributes/aria-label) for the block
-   * @type {string}
-   */
-  export let ariaLabel: string = 'chart';
-  /**
-   * ARIA description, passed in as a markdown string.
-   * @type {string}
-   */
-  export let ariaDescription: string | null = null;
-
-  import AriaHidden from './AriaHidden.svelte';
-  import TextBlock from './TextBlock.svelte';
+  // Components
+  import AriaHidden from './components/AriaHidden.svelte';
+  import TextBlock from './components/TextBlock.svelte';
   import Block from '../Block/Block.svelte';
   import PaddingReset from '../PaddingReset/PaddingReset.svelte';
   import Markdown from '../Markdown/Markdown.svelte';
+
+  interface Props {
+    /** Content to place inside `GraphicBlock` */
+    children: Snippet;
+    /**
+     * Add an id to the block tag to target it with custom CSS.
+     */
+    id?: string;
+    /**
+     * Add classes to the block tag to target it with custom CSS.
+     */
+    class?: string;
+    /** Snap block to column widths, rather than fluidly resizing them. */
+    snap?: boolean;
+    /**
+     * ARIA [role](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Roles) for the block
+     */
+    role?: string;
+    /**
+     * Notes to the graphic, passed in as a markdown string OR as a custom snippet.
+     */
+    notes?: string | Snippet;
+    /**
+     * Width of the component within the text well.
+     */
+    width?: ContainerWidth;
+    /**
+     * Set a different width for the text within the text well, for example, "normal" to keep the title, description and notes inline with the rest of the text well. Can't ever be wider than `width`.
+     */
+    textWidth?: ContainerWidth;
+    /**
+     * Title of the graphic as a string or a custom snippet.
+     */
+    title?: string | Snippet;
+    /**
+     * Description of the graphic, passed in as a markdown string.
+     */
+    description?: string;
+    /**
+     * ARIA [label](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Attributes/aria-label) for the block
+     */
+    ariaLabel?: string;
+    /**
+     * ARIA description, passed in as a markdown string OR as a custom snippet.
+     */
+    ariaDescription?: string | Snippet;
+  }
+
+  let {
+    children,
+    id = '',
+    class: cls = '',
+    snap = false,
+    role,
+    notes,
+    width = 'normal',
+    textWidth = 'normal',
+    title,
+    description,
+    ariaLabel = 'chart',
+    ariaDescription,
+  }: Props = $props();
 </script>
 
-<Block {id} {snap} {role} {width} {ariaLabel} class="graphic fmy-6 {cls}">
-  {#if $$slots.title}
-    <PaddingReset containerIsFluid="{width === 'fluid'}">
-      <TextBlock width="{textWidth}">
-        <!-- Custom title content -->
-        <slot name="title" />
-      </TextBlock>
-    </PaddingReset>
-  {:else if title}
-    <PaddingReset containerIsFluid="{width === 'fluid'}">
-      <TextBlock width="{textWidth}">
-        <h3>{title}</h3>
-        {#if description}
-          <Markdown source="{description}" />
+<div class="container">
+  <Block {id} {snap} {role} {width} {ariaLabel} class="graphic fmy-6 {cls}">
+    <!-- Check if `title` is a snippet -->
+    {#if typeof title === 'string'}
+      <PaddingReset containerIsFluid={width === 'fluid'}>
+        <TextBlock width={textWidth}>
+          <h3>{title}</h3>
+          {#if description}
+            <Markdown source={description} />
+          {/if}
+        </TextBlock>
+      </PaddingReset>
+    {:else if title}
+      <PaddingReset containerIsFluid={width === 'fluid'}>
+        <TextBlock width={textWidth}>
+          <!-- Custom title snippet -->
+          {@render title()}
+        </TextBlock>
+      </PaddingReset>
+    {/if}
+    <AriaHidden hidden={!!ariaDescription}>
+      <!-- Graphic content -->
+      {@render children()}
+    </AriaHidden>
+    {#if ariaDescription}
+      <div class="visually-hidden">
+        {#if typeof ariaDescription === 'string'}
+          <Markdown source={ariaDescription} />
+        {:else}
+          <!-- Custom ARIA snippet -->
+          {@render ariaDescription()}
         {/if}
-      </TextBlock>
-    </PaddingReset>
-  {/if}
-  <AriaHidden hidden="{!!$$slots.aria || !!ariaDescription}">
-    <!-- Graphic content -->
-    <slot />
-  </AriaHidden>
-  {#if $$slots.aria || ariaDescription}
-    <div class="visually-hidden">
-      {#if $$slots.aria}
-        <!-- Custom ARIA markup -->
-        <slot name="aria" />
-      {:else}
-        <Markdown source="{ariaDescription}" />
-      {/if}
-    </div>
-  {/if}
-  {#if $$slots.notes}
-    <PaddingReset containerIsFluid="{width === 'fluid'}">
-      <TextBlock width="{textWidth}">
-        <!-- Custom notes content -->
-        <slot name="notes" />
-      </TextBlock>
-    </PaddingReset>
-  {:else if notes}
-    <PaddingReset containerIsFluid="{width === 'fluid'}">
-      <TextBlock width="{textWidth}">
-        <aside>
-          <Markdown source="{notes}" />
-        </aside>
-      </TextBlock>
-    </PaddingReset>
-  {/if}
-</Block>
+      </div>
+    {/if}
+    {#if typeof notes === 'string'}
+      <PaddingReset containerIsFluid={width === 'fluid'}>
+        <TextBlock width={textWidth}>
+          <aside>
+            <Markdown source={notes} />
+          </aside>
+        </TextBlock>
+      </PaddingReset>
+    {:else if notes}
+      <PaddingReset containerIsFluid={width === 'fluid'}>
+        <TextBlock width={textWidth}>
+          <!-- Custom notes content -->
+          {@render notes()}
+        </TextBlock>
+      </PaddingReset>
+    {/if}
+  </Block>
+</div>
 
-<!-- svelte-ignore css-unused-selector -->
-<style lang="scss" global>
+<style lang="scss">
   @use '../../scss/mixins' as mixins;
 
-  .article-block.graphic {
+  div.container {
+    display: contents;
+
     // Dek
-    p {
+    :global(.article-block.graphic p) {
       @include mixins.body-note;
       @include mixins.font-light;
     }
+
     // Caption and Sources
-    aside {
-      p {
-        @include mixins.body-caption;
-        @include mixins.fmy-1;
-      }
+    :global(.article-block.graphic aside p) {
+      @include mixins.body-caption;
+      @include mixins.fmy-1;
     }
   }
 </style>
diff --git a/src/components/GraphicBlock/TextBlock.svelte b/src/components/GraphicBlock/TextBlock.svelte
deleted file mode 100644
index 9c09a42c..00000000
--- a/src/components/GraphicBlock/TextBlock.svelte
+++ /dev/null
@@ -1,21 +0,0 @@
-<script lang="ts">
-  import type { ContainerWidth } from '../@types/global';
-
-  
-  import Block from '../Block/Block.svelte';
-  interface Props {
-    /** Width of the component within the text well. */
-    width?: ContainerWidth | null;
-    children?: import('svelte').Snippet;
-  }
-
-  let { width = null, children }: Props = $props();
-</script>
-
-{#if width}
-  <Block {width} class="notes fmy-0">
-    {@render children?.()}
-  </Block>
-{:else}
-  {@render children?.()}
-{/if}
diff --git a/src/components/GraphicBlock/components/AriaHidden.svelte b/src/components/GraphicBlock/components/AriaHidden.svelte
new file mode 100644
index 00000000..6186b2ec
--- /dev/null
+++ b/src/components/GraphicBlock/components/AriaHidden.svelte
@@ -0,0 +1,22 @@
+<script lang="ts">
+  import type { Snippet } from 'svelte';
+
+  interface Props {
+    /**
+     * Whether to wrap the graphic with an aria hidden tag.
+     */
+    hidden?: boolean;
+    /** Content to put inside `AriaHidden`*/
+    children: Snippet;
+  }
+
+  let { hidden = false, children }: Props = $props();
+</script>
+
+{#if hidden}
+  <div aria-hidden="true">
+    {@render children()}
+  </div>
+{:else}
+  {@render children()}
+{/if}
diff --git a/src/components/GraphicBlock/components/TextBlock.svelte b/src/components/GraphicBlock/components/TextBlock.svelte
new file mode 100644
index 00000000..c7413fd5
--- /dev/null
+++ b/src/components/GraphicBlock/components/TextBlock.svelte
@@ -0,0 +1,23 @@
+<script lang="ts">
+  import type { Snippet } from 'svelte';
+  import type { ContainerWidth } from '../../@types/global';
+
+  import Block from '../../Block/Block.svelte';
+
+  interface Props {
+    /** Width of the component within the text well. */
+    width?: ContainerWidth;
+    /** Content to put inside `TextBlock`*/
+    children: Snippet;
+  }
+
+  let { width, children }: Props = $props();
+</script>
+
+{#if width}
+  <Block {width} class="notes fmy-0">
+    {@render children()}
+  </Block>
+{:else}
+  {@render children()}
+{/if}
diff --git a/src/components/GraphicBlock/stories/ai2svelte/ai-chart.svelte b/src/components/GraphicBlock/demo/ai2svelte/ai-chart.svelte
similarity index 98%
rename from src/components/GraphicBlock/stories/ai2svelte/ai-chart.svelte
rename to src/components/GraphicBlock/demo/ai2svelte/ai-chart.svelte
index f837d3a2..9b9c11fe 100644
--- a/src/components/GraphicBlock/stories/ai2svelte/ai-chart.svelte
+++ b/src/components/GraphicBlock/demo/ai2svelte/ai-chart.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-  
   // For demo purposes only, hard-wiring img paths from Vite
   // @ts-ignore img
   import chartXs from '../imgs/ai-chart-xs.png';
@@ -18,7 +17,7 @@
 
 <!-- Generated by ai2html v0.100.0 - 2021-09-29 12:37 -->
 
-<div id="g-_ai-chart-box" bind:clientWidth="{width}">
+<div id="g-_ai-chart-box" bind:clientWidth={width}>
   <!-- Artboard: xs -->
   {#if width && width >= 0 && width < 510}
     <div id="g-_ai-chart-xs" class="g-artboard" style="">
@@ -27,7 +26,7 @@
         id="g-_ai-chart-xs-img"
         class="g-aiImg"
         alt=""
-        style="{`background-image: url(${chartXs});`}"
+        style={`background-image: url(${chartXs});`}
       ></div>
       <div
         id="g-ai0-1"
@@ -160,7 +159,7 @@
         id="g-_ai-chart-sm-img"
         class="g-aiImg"
         alt=""
-        style="{`background-image: url(${chartSm});`}"
+        style={`background-image: url(${chartSm});`}
       ></div>
       <div
         id="g-ai1-1"
@@ -293,7 +292,7 @@
         id="g-_ai-chart-md-img"
         class="g-aiImg"
         alt=""
-        style="{`background-image: url(${chartMd});`}"
+        style={`background-image: url(${chartMd});`}
       ></div>
       <div
         id="g-ai2-1"
diff --git a/src/components/GraphicBlock/stories/imgs/ai-chart-md.png b/src/components/GraphicBlock/demo/imgs/ai-chart-md.png
similarity index 100%
rename from src/components/GraphicBlock/stories/imgs/ai-chart-md.png
rename to src/components/GraphicBlock/demo/imgs/ai-chart-md.png
diff --git a/src/components/GraphicBlock/stories/imgs/ai-chart-sm.png b/src/components/GraphicBlock/demo/imgs/ai-chart-sm.png
similarity index 100%
rename from src/components/GraphicBlock/stories/imgs/ai-chart-sm.png
rename to src/components/GraphicBlock/demo/imgs/ai-chart-sm.png
diff --git a/src/components/GraphicBlock/stories/imgs/ai-chart-xs.png b/src/components/GraphicBlock/demo/imgs/ai-chart-xs.png
similarity index 100%
rename from src/components/GraphicBlock/stories/imgs/ai-chart-xs.png
rename to src/components/GraphicBlock/demo/imgs/ai-chart-xs.png
diff --git a/src/components/GraphicBlock/stories/placeholder.png b/src/components/GraphicBlock/demo/placeholder.png
similarity index 100%
rename from src/components/GraphicBlock/stories/placeholder.png
rename to src/components/GraphicBlock/demo/placeholder.png
diff --git a/src/components/GraphicBlock/stories/docs/ai2svelte.md b/src/components/GraphicBlock/stories/docs/ai2svelte.md
deleted file mode 100644
index e87c2c0e..00000000
--- a/src/components/GraphicBlock/stories/docs/ai2svelte.md
+++ /dev/null
@@ -1,19 +0,0 @@
-A more detailed example of using `GraphicBlock` with components created by [ai2svelte](https://github.com/reuters-graphics/ai2svelte).
-
-```svelte
-<script>
-  import { GraphicBlock } from '@reuters-graphics/graphics-components';
-  import MyAiMap from './ai2svelte/my-map.svelte';
-  import { assets } from '$app/paths'; // If using with the Graphics Kit
-</script>
-
-<GraphicBlock
-  width="normal"
-  title="Earthquake in Haiti"
-  description="The 7.2-magnitude earthquake struck at 8:29 a.m. EST, Aug. 14, 2021."
-  notes="Note: A shakemap represents the ground shaking produced by an earthquake."
-  ariaDescription="A map showing shake intensity of the quake."
->
-  <MyAiMap assetsPath="{assets}" />
-</GraphicBlock>
-```
diff --git a/src/components/GraphicBlock/stories/docs/archieML.md b/src/components/GraphicBlock/stories/docs/archieML.md
deleted file mode 100644
index d3a8a212..00000000
--- a/src/components/GraphicBlock/stories/docs/archieML.md
+++ /dev/null
@@ -1,40 +0,0 @@
-For Graphics Kit users, the `GraphicBlock` component is built-in to handle [ai2svelte](https://github.com/reuters-graphics/ai2svelte) graphics.
-
-First, import your ai2svelte graphic in `App.svelte` and add it to the `aiCharts` object;
-
-```svelte
-<!-- App.svelte -->
-<script>
-  // Other stuff...
-
-  import AiMap from './ai2svelte/my-map.svelte';
-
-  const aiCharts = {
-    // Other charts...
-    AiMap,
-  };
-</script>
-```
-
-Then add the following structure to your ArchieML doc, taking care that the name of your chart in the `aiCharts` object matches the name of your `chart`:
-
-```yaml
-[blocks]
-# ...
-
-type: ai-graphic
-chart: AiMap
-width: normal
-textWidth: normal
-title: Earthquake in Haiti
-description: The 7.2-magnitude earthquake struck at 8:29 a.m. EST, Aug. 14, 2021.
-notes: \Note: A shakemap represents the ground shaking produced by an earthquake.
-
-\Source: USGIS
-:end
-altText: A map that shows the shake intensity of the earthquake, which was worst in central Haiti.
-:end
-
-# ...
-[]
-```
diff --git a/src/components/GraphicBlock/stories/docs/aria.md b/src/components/GraphicBlock/stories/docs/aria.md
deleted file mode 100644
index 2ef6fef7..00000000
--- a/src/components/GraphicBlock/stories/docs/aria.md
+++ /dev/null
@@ -1,56 +0,0 @@
-If your chart isn't easily read by screen readers — for example, it has annotations that when read without the visual won't make sense — you should add an `ariaDescription` that better describes the chart.
-
-The `ariaDescription` string will be processed as markdown, so you can add multiple paragraphs, links, headers or whatever else you need in markdown.
-
-> **Note:** When you set an `ariaDescription`, your graphic will be automatically wrapped in a div that tells screen readers not to read the text in the graphic, but instead read the hidden ARIA description.
-
-```svelte
-<GraphicBlock
-  width="normal"
-  title="Earthquake in Haiti"
-  description="The 7.2-magnitude earthquake struck at 8:29 a.m. EST, Aug. 14, 2021."
-  notes="Note: A shakemap represents the ground shaking produced by an earthquake."
-  ariaDescription="A map showing the shake intensity produced by the earthquake."
->
-  <MyAiMap assetsPath="{assets}" />
-</GraphicBlock>
-```
-
-Sometimes, instead of a simple ARIA description for graphics, we want to also provide a data table or something else that requires more complex markup.
-
-You can add custom markup for screen readers only by using the `aria` named slot.
-
-> **Note:** The `aria` slot will override the `ariaDescription` and will also hide the text in your graphic from screen readers.
-
-```svelte
-<GraphicBlock
-  width="normal"
-  title="Earthquake in Haiti"
-  description="The 7.2-magnitude earthquake struck at 8:29 a.m. EST, Aug. 14, 2021."
-  notes="Note: A shakemap represents the ground shaking produced by an earthquake."
->
-  <MyAiMap basePath="{assets}" />
-  <div slot="aria">
-    <p>
-      A shakemap shows the intensity of the 7.2-magnitude earthquake that struck
-      Haiti at 8:29 a.m. EST, Aug. 14, 2021.
-    </p>
-    <table>
-      <tr>
-        <th>City</th>
-        <th>Felt shake strength</th>
-      </tr>
-      <tr>
-        <td>Les Cayes</td>
-        <td>Very strong</td>
-      </tr>
-      <tr>
-        <td>Jeremie</td>
-        <td>Strong</td>
-      </tr>
-    </table>
-  </div>
-</GraphicBlock>
-```
-
-[Read this](https://accessibility.psu.edu/images/charts/) for more information on using screen reader data tables for charts.
diff --git a/src/components/GraphicBlock/stories/docs/component.md b/src/components/GraphicBlock/stories/docs/component.md
deleted file mode 100644
index cc46d41d..00000000
--- a/src/components/GraphicBlock/stories/docs/component.md
+++ /dev/null
@@ -1,20 +0,0 @@
-The `GraphicBlock` component is a special derivative of the [`Block`](./?path=/docs/layout-block) component that also handles text elements around a graphic.
-
-Many other components use this one to wrap graphics with styled text. When you use it, you'll also wrap your chart elements or component with it like this:
-
----
-
-```svelte
-<script>
-  import { GraphicBlock } from '@reuters-graphics/graphics-components';
-</script>
-
-<GraphicBlock
-  width="normal"
-  title="Title for my chart"
-  description="Pork loin t-bone jowl prosciutto, short loin flank kevin tri-tip cupim pig pork. Meatloaf tri-tip frankfurter short ribs, cupim brisket bresaola chislic tail jerky burgdoggen pancetta."
-  notes="Note: Data current as of Aug. 2, 2022.\n\nSource: [Google research](https://google.com)"
->
-  <div id="my-chart"></div>
-</GraphicBlock>
-```
diff --git a/src/components/GraphicBlock/stories/docs/customText.md b/src/components/GraphicBlock/stories/docs/customText.md
deleted file mode 100644
index e6ab9ee7..00000000
--- a/src/components/GraphicBlock/stories/docs/customText.md
+++ /dev/null
@@ -1,14 +0,0 @@
-You can override the markup used to generate the chart text elements by using the `title` and/or `notes` named slots like this:
-
-```svelte
-<GraphicBlock
-  width="normal"
-  notes="{'Note: Data current as of Aug. 2, 2022.\n\nSource: [Google research](https://google.com)'}"
->
-  <h5 slot="title">My smaller title</h5>
-  <div id="my-chart"></div>
-  <aside slot="notes">
-    <p><strong>Note:</strong> Data current as of Aug. 2, 2022.</p>
-  </aside>
-</GraphicBlock>
-```
diff --git a/src/components/Headline/Headline.mdx b/src/components/Headline/Headline.mdx
new file mode 100644
index 00000000..dd2f3e58
--- /dev/null
+++ b/src/components/Headline/Headline.mdx
@@ -0,0 +1,152 @@
+import { Meta, Canvas } from '@storybook/blocks';
+
+import * as HeadlineStories from './Headline.stories.svelte';
+
+<Meta of={HeadlineStories} />
+
+# Headline
+
+The `Headline` component creates headlines in the legacy Reuters Graphics style, with the text centred on the page.
+
+```svelte
+<script>
+  import { Headline } from '@reuters-graphics/graphics-components';
+</script>
+
+<Headline
+  hed="Reuters Graphics Interactive"
+  dek="The beginning of a beautiful page"
+  section="World News"
+/>
+```
+
+<Canvas of={HeadlineStories.Demo} />
+
+## With bylines and dateline
+
+Optionally, you can add authors and a publish time to the headline, which the `Headline` component internally renders with the [Byline](./?path=/docs/components-text-elements-byline--docs) component.
+
+> **Note**: Since `Headline` uses `Byline`, you can customise the author page hyperlink and bylines with the `getAuthorPage`, `byline`, `published` and `updated` props.
+
+```svelte
+<script>
+  import { Headline } from '@reuters-graphics/graphics-components';
+</script>
+
+<Headline
+  hed={'Reuters Graphics Interactive'}
+  dek={'The beginning of a beautiful page'}
+  section={'Global news'}
+  authors={['Jane Doe']}
+  publishTime={new Date('2020-01-01').toISOString()}
+    getAuthorPage={(author: string) => {
+      return `mailto:${author.replace(' ', '')}@example.com`;
+    }}
+/>
+```
+
+<Canvas of={HeadlineStories.Byline} />
+
+## Custom hed and dek
+
+Use the `hed` and/or `dek` [snippets](https://svelte.dev/docs/svelte/snippet) to override those elements with custom elements.
+
+```svelte
+<script>
+  import { Headline } from '@reuters-graphics/graphics-components';
+</script>
+
+<Headline width="wide">
+  <!-- Custom hed snippet -->
+  {#snippet hed()}
+    <h1 class="custom-hed">
+      <span class="small block text-base">The secret to</span>
+      “The Nutcracker's”
+      <span class="small block text-base fpt-1">success</span>
+    </h1>
+  {/snippet}
+
+  <!-- Custom dek snippet -->
+  {#snippet dek()}
+    <p class="custom-dek !fmt-3">
+      How “The Nutcracker” ballet became an<span
+        class="font-medium mx-1 px-1.5 py-1">American holday staple</span
+      >and a financial pillar of ballet companies across the country
+    </p>
+  {/snippet}
+</Headline>
+
+<!-- Custom styles -->
+<style lang="scss">
+  .custom-hed {
+    line-height: 0.9;
+  }
+  .custom-dek {
+    span {
+      background-color: #fde68a;
+    }
+  }
+</style>
+```
+
+<Canvas of={HeadlineStories.CustomHedDek} />
+
+## With crown image
+
+To add a crown image, use the `crown` [snippet](https://svelte.dev/docs/svelte/snippet).
+
+```svelte
+<script>
+  import { Headline } from '@reuters-graphics/graphics-components';
+  import { assets } from '$app/paths';
+</script>
+
+<Headline
+  class="!fmt-3"
+  hed="Europa"
+  publishTime={new Date('2020-01-01').toISOString()}
+>
+  <!-- Add a crown -->
+  {#snippet crown()}
+    <img
+      src={crownImgSrc}
+      width="100"
+      class="mx-auto mb-0"
+      alt="Illustration of Europe"
+    />
+  {/snippet}
+</Headline>
+```
+
+<Canvas of={HeadlineStories.CrownImage} />
+
+## With crown graphic
+
+Add a full graphic or any other component in the crown.
+
+```svelte
+<script>
+  import { Headline } from '@reuters-graphics/graphics-components';
+  import { assets } from '$app/paths'; // If in Graphis Kit
+
+  import Map from './ai2svelte/graphic.svelte'; // Import the crown graphic component
+</script>
+
+<Headline
+  width="wider"
+  class="!fmt-1"
+  hed={'Unfriendly skies'}
+  dek={'How Russia’s invasion of Ukraine is redrawing air routes'}
+  section={'Ukraine Crisis'}
+  authors={['Simon Scarr', 'Vijdan Mohammad Kawoosa']}
+  publishTime={new Date('2022-03-04').toISOString()}
+>
+  <!-- Add a crown graphic -->
+  {#snippet crown()}
+    <!-- Pass `assetsPath` if in Graphics Kit -->
+    <Map assetsPath={assets || '/'} />
+  {/snippet}
+</Headline>
+```
+
+<Canvas of={HeadlineStories.CrownGraphic} />
diff --git a/src/components/Headline/Headline.stories.svelte b/src/components/Headline/Headline.stories.svelte
index 720d119b..0b48df75 100644
--- a/src/components/Headline/Headline.stories.svelte
+++ b/src/components/Headline/Headline.stories.svelte
@@ -1,28 +1,10 @@
 <script module lang="ts">
-  // @ts-ignore raw
-  import componentDocs from './stories/docs/component.md?raw';
-  // @ts-ignore raw
-  import withBylineDocs from './stories/docs/withByline.md?raw';
-  // @ts-ignore raw
-  import withDekDocs from './stories/docs/withDek.md?raw';
-  // @ts-ignore raw
-  import customHedDocs from './stories/docs/customHed.md?raw';
-  // @ts-ignore raw
-  import withCrownImgDocs from './stories/docs/withCrownImage.md?raw';
-  // @ts-ignore raw
-  import withCrownGraphicDocs from './stories/docs/withCrownGraphic.md?raw';
-
+  import { defineMeta } from '@storybook/addon-svelte-csf';
   import Headline from './Headline.svelte';
 
-  import {
-    withComponentDocs,
-    withStoryDocs,
-  } from '$lib/docs/utils/withParams.js';
-
-  export const meta = {
+  const { Story } = defineMeta({
     title: 'Components/Text elements/Headline',
     component: Headline,
-    ...withComponentDocs(componentDocs),
     argTypes: {
       hedSize: {
         control: 'select',
@@ -33,115 +15,97 @@
         options: ['normal', 'wide', 'wider', 'widest'],
       },
     },
-  };
+  });
 </script>
 
 <script>
-  import { Template, Story } from '@storybook/addon-svelte-csf';
-
-  // @ts-ignore img
-  import crownImgSrc from './stories/crown.png';
-  import Map from './stories/graphic.svelte';
+  import crownImgSrc from './demo/crown.png';
+  import Map from './demo/graphic.svelte';
 </script>
 
-<Template >
-  {#snippet children({ args })}
-    <Headline {...args} />
-  {/snippet}
-</Template>
-
 <Story
-  name="Default"
-  args="{{
-    section: 'World News',
+  name="Demo"
+  args={{
     hed: 'Reuters Graphics interactive',
-    hedSize: 'normal',
-    dek: '',
-    authors: [],
-  }}"
+    dek: 'The beginning of a beautiful page',
+    section: 'World News',
+  }}
 />
 
-<Story name="With dek" {...withStoryDocs(withDekDocs)}>
+<Story name="With byline and dateline" exportName="Byline">
   <Headline
-    hed="{'Reuters Graphics Interactive'}"
-    dek="{'The beginning of a beautiful page'}"
-    section="{'Global news'}"
+    hed={'Reuters Graphics Interactive'}
+    dek={'The beginning of a beautiful page'}
+    section={'Global news'}
+    authors={['Jane Doe']}
+    publishTime={new Date('2020-01-01').toISOString()}
+    getAuthorPage={(author: string) => {
+      return `mailto:${author.replace(' ', '')}@example.com`;
+    }}
   />
 </Story>
 
-<Story name="With byline" {...withStoryDocs(withBylineDocs)}>
-  <Headline
-    hed="{'Reuters Graphics Interactive'}"
-    dek="{'The beginning of a beautiful page'}"
-    section="{'Global news'}"
-    authors="{['Dea Bankova', 'Aditi Bhandari']}"
-    publishTime="{new Date('2020-01-01').toISOString()}"
-  />
-</Story>
-
-<Story name="With custom hed" {...withStoryDocs(customHedDocs)}>
+<Story name="Custom hed and dek" exportName="CustomHedDek">
   <Headline width="wide">
     {#snippet hed()}
-        <h1 class="custom-hed" >
+      <h1 class="custom-hed">
         <span class="small block text-base">The secret to</span>
         “The Nutcracker's”
         <span class="small block text-base fpt-1">success</span>
       </h1>
-      {/snippet}
+    {/snippet}
     {#snippet dek()}
-        <p class="custom-dek !fmt-3" >
+      <p class="custom-dek !fmt-3">
         How “The Nutcracker” ballet became an<span
           class="font-medium mx-1 px-1.5 py-1">American holday staple</span
         >and a financial pillar of ballet companies across the country
       </p>
-      {/snippet}
+    {/snippet}
   </Headline>
-  <style lang="scss">
-    .custom-hed {
-      line-height: 0.9;
-    }
-    .custom-dek {
-      span {
-        background-color: #fde68a;
-      }
-    }
-  </style>
 </Story>
 
-<Story name="With crown image" {...withStoryDocs(withCrownImgDocs)}>
-  <Headline class="!fmt-3" publishTime="{new Date('2020-01-01').toISOString()}">
+<Story name="Crown image" exportName="CrownImage">
+  <Headline
+    class="!fmt-3"
+    hed="Europa"
+    publishTime={new Date('2020-01-01').toISOString()}
+  >
     <!-- Add a crown -->
     {#snippet crown()}
-        <img
-        
-        src="{crownImgSrc}"
+      <img
+        src={crownImgSrc}
         width="100"
         class="mx-auto mb-0"
         alt="Illustration of Europe"
       />
-      {/snippet}
-    <!-- Override the hed with a named slot -->
-    {#snippet hed()}
-        <h1  class="!font-serif !tracking-wide">Europa</h1>
-      {/snippet}
+    {/snippet}
   </Headline>
 </Story>
 
-<Story name="With crown graphic" {...withStoryDocs(withCrownGraphicDocs)}>
+<Story name="Crown graphic" exportName="CrownGraphic">
   <Headline
     width="wider"
     class="!fmt-1"
-    hed="{'Unfriendly skies'}"
-    dek="{'How Russia’s invasion of Ukraine is redrawing air routes'}"
-    section="{'Ukraine Crisis'}"
-    authors="{['Simon Scarr', 'Vijdan Mohammad Kawoosa']}"
-    publishTime="{new Date('2022-03-04').toISOString()}"
+    hed={'Unfriendly skies'}
+    dek={'How Russia’s invasion of Ukraine is redrawing air routes'}
+    section={'Ukraine Crisis'}
+    authors={['Simon Scarr', 'Vijdan Mohammad Kawoosa']}
+    publishTime={new Date('2022-03-04').toISOString()}
   >
     <!-- Add a crown graphic -->
     {#snippet crown()}
-        <div >
-        <Map />
-      </div>
-      {/snippet}
+      <Map />
+    {/snippet}
   </Headline>
 </Story>
+
+<style lang="scss">
+  .custom-hed {
+    line-height: 0.9;
+  }
+  .custom-dek {
+    span {
+      background-color: #fde68a;
+    }
+  }
+</style>
diff --git a/src/components/Headline/Headline.svelte b/src/components/Headline/Headline.svelte
index ef10aa1b..07e77005 100644
--- a/src/components/Headline/Headline.svelte
+++ b/src/components/Headline/Headline.svelte
@@ -1,60 +1,76 @@
-<!-- @migration-task Error while migrating Svelte code: Cannot set properties of undefined (setting 'next') -->
 <!-- @component `Headline` [Read the docs.](https://reuters-graphics.github.io/graphics-components/?path=/docs/components-text-elements-headline--docs) -->
 <script lang="ts">
+  // Types
   import type { HeadlineSize } from './../@types/global';
+  import type { Snippet } from 'svelte';
 
-  /**
-   * Headline, parsed as an _inline_ markdown string in an `h1` element.
-   * @type {string}
-   */
-  export let hed: string = 'Reuters Graphics Interactive';
-
-  /** Add extra classes to the block tag to target it with custom CSS. */
-  let cls: string = '';
-  export { cls as class };
-
-  /**
-   * Headline size
-   * @type {string}
-   */
-  export let hedSize: HeadlineSize = 'normal';
-
-  /**
-   * Dek, parsed as a markdown string.
-   * @type {string}
-   */
-  export let dek: string | null = null;
-  /**
-   * Section title
-   * @type {string}
-   */
-  export let section: string | null = null;
-  /**
-   * Array of author names, which will be slugified to create links to Reuters author pages
-   */
-  export let authors: string[] = [];
-  /**
-   * Publish time as a datetime string.
-   * @type {string}
-   */
-  export let publishTime: string = '';
-  /**
-   * Update time as a datetime string.
-   * @type {string}
-   */
-  export let updateTime: string = '';
-
-  /**
-   * Width of the headline.
-   */
-  export let width: 'normal' | 'wide' | 'wider' | 'widest' = 'normal';
-
+  // Components
   import Block from '../Block/Block.svelte';
   import Byline from '../Byline/Byline.svelte';
   import Markdown from '../Markdown/Markdown.svelte';
 
-  let hedClass: string;
-  $: {
+  interface Props {
+    /** Headline, parsed as an _inline_ markdown string in an `h1` element OR as a custom snippet. */
+    hed: string | Snippet;
+
+    /** Add extra classes to the block tag to target it with custom CSS. */
+    class?: string;
+    /** Headline size: small, normal, big, bigger, biggest */
+    hedSize?: HeadlineSize;
+    /** Dek, parsed as a markdown string OR as a custom snippet. */
+    dek?: string | Snippet;
+
+    /** Section title */
+    section?: string;
+    /** Array of author names, which will be slugified to create links to Reuters author pages */
+    authors?: string[];
+
+    /** Publish time as a datetime string. */
+    publishTime?: string;
+    /** Update time as a datetime string. */
+    updateTime?: string;
+    /** Width of the headline: normal, wide, wider, widest */
+    width?: 'normal' | 'wide' | 'wider' | 'widest';
+    /**
+     * Custom function that returns an author page URL.
+     */
+    getAuthorPage?: (author: string) => string;
+    /** Custom crown snippet */
+    crown?: Snippet;
+    /**
+     * Optional snippet for a custom byline.
+     */
+    byline?: Snippet;
+    /**
+     * Optional snippet for a custom published dateline.
+     */
+    published?: Snippet;
+    /**
+     * Optional snippet for a custom updated dateline.
+     */
+    updated?: Snippet;
+  }
+
+  let {
+    hed = 'Reuters Graphics Interactive',
+    class: cls = '',
+    hedSize = 'normal',
+    dek,
+    section,
+    authors = [],
+    publishTime = '',
+    updateTime = '',
+    width = 'normal',
+    getAuthorPage,
+    crown,
+    byline,
+    published,
+    updated,
+  }: Props = $props();
+
+  // Set the headline text size class based on the `hedSize` prop
+  let hedClass = $state('text-3xl');
+  $effect(() => {
     switch (hedSize) {
       case 'biggest':
         hedClass = 'text-6xl';
@@ -71,16 +87,16 @@
       default:
         hedClass = 'text-3xl';
     }
-  }
+  });
 </script>
 
 <div class="headline-wrapper" style="display:contents;">
   <Block {width} class="headline text-center fmt-7 fmb-6 {cls}">
     <header class="relative">
-      {#if $$slots.crown}
+      {#if crown}
         <div class="crown-container">
-          <!-- Crown named slot -->
-          <slot name="crown" />
+          <!-- Crown snippet -->
+          {@render crown()}
         </div>
       {/if}
       <div class="title">
@@ -91,53 +107,56 @@
             {section}
           </p>
         {/if}
-        {#if $$slots.hed}
-          <!-- Headline named slot -->
-          <slot name="hed" />
-        {:else}
-          <h1 class="{hedClass}">
-            <Markdown source="{hed}" parseInline />
+        {#if typeof hed === 'string'}
+          <h1 class={hedClass}>
+            <Markdown source={hed} parseInline />
           </h1>
+        {:else if hed}
+          <!-- Headline snippet -->
+          {@render hed()}
         {/if}
-        {#if $$slots.dek}
-          <!-- Dek named slot-->
+        {#if typeof dek === 'string'}
           <div class="dek fmx-auto fmb-6">
-            <slot name="dek" />
+            <Markdown source={dek} />
           </div>
         {:else if dek}
+          <!-- Dek snippet-->
           <div class="dek fmx-auto fmb-6">
-            <Markdown source="{dek}" />
+            {@render dek()}
           </div>
         {/if}
       </div>
-      {#if $$slots.byline}
-        <!-- Custom byline/dateline -->
-        <slot name="byline" />
-      {:else if authors.length > 0 || publishTime}
+      {#if authors.length > 0 || publishTime}
         <Byline
-          class="fmy-4"
+          cls="fmy-4"
           {authors}
           {publishTime}
           {updateTime}
+          {getAuthorPage}
+          {published}
+          {updated}
           align="center"
         />
+      {:else if byline}
+        <!-- Custom byline/dateline -->
+        {@render byline()}
       {/if}
     </header>
   </Block>
 </div>
 
 <style lang="scss">
-  @use '../../scss/mixins' as *;
+  @use '../../scss/mixins' as mixins;
   .headline-wrapper {
     :global(.dek) {
-      max-width: $column-width-normal;
+      max-width: mixins.$column-width-normal;
     }
     :global(.dek p) {
-      @include fmt-0;
-      @include font-note;
-      @include leading-tight;
-      @include font-light;
-      @include fmb-3;
+      @include mixins.fmt-0;
+      @include mixins.font-note;
+      @include mixins.leading-tight;
+      @include mixins.font-light;
+      @include mixins.fmb-3;
     }
   }
 </style>
diff --git a/src/components/Headline/stories/crown.png b/src/components/Headline/demo/crown.png
similarity index 100%
rename from src/components/Headline/stories/crown.png
rename to src/components/Headline/demo/crown.png
diff --git a/src/components/Headline/stories/graphic-lg.png b/src/components/Headline/demo/graphic-lg.png
similarity index 100%
rename from src/components/Headline/stories/graphic-lg.png
rename to src/components/Headline/demo/graphic-lg.png
diff --git a/src/components/Headline/stories/graphic-md.png b/src/components/Headline/demo/graphic-md.png
similarity index 100%
rename from src/components/Headline/stories/graphic-md.png
rename to src/components/Headline/demo/graphic-md.png
diff --git a/src/components/Headline/stories/graphic-sm.png b/src/components/Headline/demo/graphic-sm.png
similarity index 100%
rename from src/components/Headline/stories/graphic-sm.png
rename to src/components/Headline/demo/graphic-sm.png
diff --git a/src/components/Headline/stories/graphic-xl.png b/src/components/Headline/demo/graphic-xl.png
similarity index 100%
rename from src/components/Headline/stories/graphic-xl.png
rename to src/components/Headline/demo/graphic-xl.png
diff --git a/src/components/Headline/stories/graphic-xs.png b/src/components/Headline/demo/graphic-xs.png
similarity index 100%
rename from src/components/Headline/stories/graphic-xs.png
rename to src/components/Headline/demo/graphic-xs.png
diff --git a/src/components/Headline/stories/graphic.svelte b/src/components/Headline/demo/graphic.svelte
similarity index 98%
rename from src/components/Headline/stories/graphic.svelte
rename to src/components/Headline/demo/graphic.svelte
index 28a6b06c..bfccbab4 100644
--- a/src/components/Headline/stories/graphic.svelte
+++ b/src/components/Headline/demo/graphic.svelte
@@ -14,7 +14,7 @@
   let width = $state(null);
 </script>
 
-<div id="g-graphic-box" bind:clientWidth="{width}">
+<div id="g-graphic-box" bind:clientWidth={width}>
   <!-- Artboard: xs -->
   {#if width && width >= 0 && width < 510}
     <div id="g-graphic-xs" class="g-artboard" style="">
@@ -22,7 +22,7 @@
       <div
         id="g-graphic-xs-img"
         class="g-aiImg"
-        style="{`background-image: url(${chartXs});`}"
+        style={`background-image: url(${chartXs});`}
       ></div>
       <div
         id="g-ai0-3"
@@ -89,7 +89,7 @@
       <div
         id="g-graphic-sm-img"
         class="g-aiImg"
-        style="{`background-image: url(${chartSm});`}"
+        style={`background-image: url(${chartSm});`}
       ></div>
       <div
         id="g-ai1-1"
@@ -213,7 +213,7 @@
       <div
         id="g-graphic-md-img"
         class="g-aiImg"
-        style="{`background-image: url(${chartMd});`}"
+        style={`background-image: url(${chartMd});`}
       ></div>
 
       <div
@@ -346,7 +346,7 @@
       <div
         id="g-graphic-lg-img"
         class="g-aiImg"
-        style="{`background-image: url(${chartLg});`}"
+        style={`background-image: url(${chartLg});`}
       ></div>
       <div
         id="g-ai3-1"
@@ -485,7 +485,7 @@
       <div
         id="g-graphic-xl-img"
         class="g-aiImg"
-        style="{`background-image: url(${chartXl});`}"
+        style={`background-image: url(${chartXl});`}
       ></div>
       <div
         id="g-ai4-1"
diff --git a/src/components/Headline/stories/docs/component.md b/src/components/Headline/stories/docs/component.md
deleted file mode 100644
index c20fc753..00000000
--- a/src/components/Headline/stories/docs/component.md
+++ /dev/null
@@ -1,13 +0,0 @@
-Reuters Graphics headline
-
-```svelte
-<script>
-  import { Headline } from '@reuters-graphics/graphics-components';
-</script>
-
-<Headline
-  hed="{'Reuters Graphics Interactive'}"
-  dek="{'The beginning of a beautiful page'}"
-  section="{'World News'}"
-/>
-```
diff --git a/src/components/Headline/stories/docs/customHed.md b/src/components/Headline/stories/docs/customHed.md
deleted file mode 100644
index 25228bd3..00000000
--- a/src/components/Headline/stories/docs/customHed.md
+++ /dev/null
@@ -1,31 +0,0 @@
-Use the `hed` and/or `dek` named slots to override those elements with completely custom markup.
-
-```svelte
-<script>
-  import { Headline } from '@reuters-graphics/graphics-components';
-</script>
-
-<Headline width="wide">
-  <h1 class="custom-hed" slot="hed">
-    <span class="small block text-base">The secret to</span>
-    “The Nutcracker's”
-    <span class="small block text-base fpt-1">success</span>
-  </h1>
-  <p class="custom-dek !fmt-3" slot="dek">
-    How “The Nutcracker” ballet became an<span
-      class="font-medium mx-1 px-1.5 py-1">American holday staple</span
-    >and a financial pillar of ballet companies across the country
-  </p>
-</Headline>
-
-<style lang="scss">
-  .custom-hed {
-    line-height: 0.9;
-  }
-  .custom-dek {
-    span {
-      background-color: #fde68a;
-    }
-  }
-</style>
-```
diff --git a/src/components/Headline/stories/docs/withByline.md b/src/components/Headline/stories/docs/withByline.md
deleted file mode 100644
index eff73515..00000000
--- a/src/components/Headline/stories/docs/withByline.md
+++ /dev/null
@@ -1,13 +0,0 @@
-```svelte
-<script>
-  import { Headline } from '@reuters-graphics/graphics-components';
-</script>
-
-<Headline
-  hed="{'Reuters Graphics Interactive'}"
-  dek="{'The beginning of a beautiful page'}"
-  section="{'Global news'}"
-  authors="{['Dea Bankova', 'Aditi Bhandari']}"
-  publishTime="{new Date('2020-01-01').toISOString()}"
-/>
-```
diff --git a/src/components/Headline/stories/docs/withCrownGraphic.md b/src/components/Headline/stories/docs/withCrownGraphic.md
deleted file mode 100644
index 48a7099a..00000000
--- a/src/components/Headline/stories/docs/withCrownGraphic.md
+++ /dev/null
@@ -1,24 +0,0 @@
-Add a full graphic or any other component in the crown.
-
-```svelte
-<script>
-  import { Headline } from '@reuters-graphics/graphics-components';
-  import Map from './ai2svelte/graphic.svelte';
-  import { assets } from '$app/paths';
-</script>
-
-<Headline
-  width="wider"
-  class="!fmt-1"
-  hed="{'Unfriendly skies'}"
-  dek="{'How Russia’s invasion of Ukraine is redrawing air routes'}"
-  section="{'Ukraine Crisis'}"
-  authors="{['Simon Scarr', 'Vijdan Mohammad Kawoosa']}"
-  publishTime="{new Date('2022-03-04').toISOString()}"
->
-  <!-- Add a crown graphic -->
-  <div slot="crown">
-    <Map assetsPath="{assets}" />
-  </div>
-</Headline>
-```
diff --git a/src/components/Headline/stories/docs/withCrownImage.md b/src/components/Headline/stories/docs/withCrownImage.md
deleted file mode 100644
index f705d9cb..00000000
--- a/src/components/Headline/stories/docs/withCrownImage.md
+++ /dev/null
@@ -1,21 +0,0 @@
-Add a crown image in the `crown` named slot and override the headline in the `hed` named slot.
-
-```svelte
-<script>
-  import { Headline } from '@reuters-graphics/graphics-components';
-  import { assets } from '$app/paths';
-</script>
-
-<Headline class="!fmt-3" publishTime="{new Date('2020-01-01').toISOString()}">
-  <!-- Add a crown -->
-  <img
-    slot="crown"
-    src="{crownImgSrc}"
-    width="100"
-    class="mx-auto mb-0"
-    alt="Illustration of Europe"
-  />
-  <!-- Override the hed with a named slot -->
-  <h1 slot="hed" class="!font-serif !tracking-wide">Europa</h1>
-</Headline>
-```
diff --git a/src/components/Headline/stories/docs/withDek.md b/src/components/Headline/stories/docs/withDek.md
deleted file mode 100644
index 63b808c7..00000000
--- a/src/components/Headline/stories/docs/withDek.md
+++ /dev/null
@@ -1,11 +0,0 @@
-```svelte
-<script>
-  import { Headline } from '@reuters-graphics/graphics-components';
-</script>
-
-<Headline
-  hed="{'Reuters Graphics Interactive'}"
-  dek="{'The beginning of a beautiful page'}"
-  section="{'Global news'}"
-/>
-```
diff --git a/src/components/HeroHeadline/Hero.stories.svelte b/src/components/HeroHeadline/Hero.stories.svelte
index 91b9e59a..1e0af245 100644
--- a/src/components/HeroHeadline/Hero.stories.svelte
+++ b/src/components/HeroHeadline/Hero.stories.svelte
@@ -75,14 +75,14 @@
 
 <Story
   name="With backdrop photo"
-  args="{{
+  args={{
     section: 'World News',
     hed: 'Reuters Graphics Interactive',
     dek: 'The beginning of a beautiful page',
     authors: ['Simon Scarr', 'Vijdan Mohammad Kawoosa'],
     publishTime: new Date('2022-03-04').toISOString(),
     img: polarImgSrc,
-  }}"
+  }}
 />
 
 <Story name="With transparent header" {...withStoryDocs(transparentHeaderDocs)}>
@@ -95,9 +95,9 @@
       section="World News"
       hed="Reuters Graphics Interactive"
       dek="The beginning of a beautiful page"
-      authors="{['Simon Scarr', 'Vijdan Mohammad Kawoosa']}"
-      publishTime="{new Date('2022-03-04').toISOString()}"
-      img="{polarImgSrc}"
+      authors={['Simon Scarr', 'Vijdan Mohammad Kawoosa']}
+      publishTime={new Date('2022-03-04').toISOString()}
+      img={polarImgSrc}
     />
   </div>
 </Story>
@@ -108,12 +108,12 @@
   </Block>
 
   <HeroHeadline
-    hed="{'Earthquake devastates Afghanistan'}"
-    hedSize="{'big'}"
+    hed={'Earthquake devastates Afghanistan'}
+    hedSize={'big'}
     hedWidth="wide"
     class="custom-hero mb-0"
     dek=""
-    authors="{[
+    authors={[
       'Anand Katakam',
       'Vijdan Mohammad Kawoosa',
       'Adolfo Arranz',
@@ -123,8 +123,8 @@
       'Jitesh Chowdhury',
       'Manas Sharma',
       'Aditi Bhandari',
-    ]}"
-    publishTime="{new Date('2022-06-24').toISOString()}"
+    ]}
+    publishTime={new Date('2022-06-24').toISOString()}
   >
     <div slot="background">
       <GraphicBlock
@@ -135,7 +135,7 @@
         notes=""
         ariaDescription="Earthquake impact map"
       >
-        <svelte:component this="{QuakeMap}" />
+        <svelte:component this={QuakeMap} />
       </GraphicBlock>
     </div>
   </HeroHeadline>
@@ -186,16 +186,16 @@
     hed="The conflict in Ethiopia"
     hedSize="bigger"
     hedWidth="wide"
-    authors="{['Aditi Bhandari ', 'David Lewis']}"
-    publishTime="{new Date('2020-12-18').toISOString()}"
+    authors={['Aditi Bhandari ', 'David Lewis']}
+    publishTime={new Date('2020-12-18').toISOString()}
   >
     <div slot="background">
       <Video
         width="widest"
         class="my-0"
-        showControls="{false}"
+        showControls={false}
         preloadVideo="auto"
-        playVideoWhenInView="{false}"
+        playVideoWhenInView={false}
         src="https://vm.reuters.tv/9c72e/titlef2ac(425954_R21MP41500).mp4"
         poster="https://www.reuters.com/resizer/vexYmtEuXKmfnsCbfS6jSMVbHms=/1080x0/filters:quality(80)/cloudfront-us-east-2.images.arcpublishing.com/reuters/VKJHKJEENVO4DASDND3VLHPV5Y.jpg"
         notes="Drone footage from the Village 8 refugee camp in Sudan."
@@ -227,13 +227,13 @@
   </Block>
 
   <HeroHeadline
-    hed="{'Buried under the bricks'}"
+    hed={'Buried under the bricks'}
     hedWidth="wide"
     class="mb-0"
-    dek="{'How mud-brick housing made the Morocco earthquake so deadly'}"
-    section="{'Global news'}"
-    authors="{['Mariano Zafra']}"
-    publishTime="{new Date('2020-01-01').toISOString()}"
+    dek={'How mud-brick housing made the Morocco earthquake so deadly'}
+    section={'Global news'}
+    authors={['Mariano Zafra']}
+    publishTime={new Date('2020-01-01').toISOString()}
   >
     <div slot="inline">
       <FeaturePhoto
@@ -253,13 +253,13 @@
   </Block>
 
   <HeroHeadline
-    hed="{'The plunge from 29,000 feet'}"
+    hed={'The plunge from 29,000 feet'}
     hedWidth="wide"
     class="mb-0"
-    dek="{'How China Eastern Airlines flight MU5735 went from an uneventful flight at cruising altitude to disaster in just minutes.'}"
-    section="{'Global news'}"
-    authors="{['Simon Scarr', 'Vijdan Mohammad Kawoosa']}"
-    publishTime="{new Date('2020-01-01').toISOString()}"
+    dek={'How China Eastern Airlines flight MU5735 went from an uneventful flight at cruising altitude to disaster in just minutes.'}
+    section={'Global news'}
+    authors={['Simon Scarr', 'Vijdan Mohammad Kawoosa']}
+    publishTime={new Date('2020-01-01').toISOString()}
   >
     <div slot="inline">
       <GraphicBlock
@@ -270,7 +270,7 @@
         notes="Source: Satellite image from Google, Maxar Technologies, CNES/Airbus, Landsat/Copernicus"
         ariaDescription="Aerial map showing trajectory of crash"
       >
-        <svelte:component this="{CrashMap}" />
+        <svelte:component this={CrashMap} />
       </GraphicBlock>
     </div>
   </HeroHeadline>
@@ -282,21 +282,21 @@
   </Block>
 
   <HeroHeadline
-    hed="{'Devastation in Derna'}"
+    hed={'Devastation in Derna'}
     hedWidth="wide"
     class="mb-0"
-    dek="{'How raging floods burst dams, destroyed neighbourhoods and killed thousands in Libya'}"
-    section="{'Global news'}"
-    authors="{['Simon Scarr']}"
-    publishTime="{new Date('2020-01-01').toISOString()}"
+    dek={'How raging floods burst dams, destroyed neighbourhoods and killed thousands in Libya'}
+    section={'Global news'}
+    authors={['Simon Scarr']}
+    publishTime={new Date('2020-01-01').toISOString()}
   >
     <div slot="inline">
       <Video
         width="widest"
         class="my-0"
-        showControls="{false}"
+        showControls={false}
         preloadVideo="auto"
-        playVideoWhenInView="{false}"
+        playVideoWhenInView={false}
         src="https://www.reuters.com/graphics/LIBYA-STORM/EXPLAINER/klvyzqebzpg/cdn/video/drone.mp4"
         notes="Drone shots of Derna, Libya. September 14, 2023. REUTERS"
         ariaDescription="alttext fot video"
@@ -308,14 +308,14 @@
 <Story name="With custom hed" {...withStoryDocs(customHedDocs)}>
   <HeroHeadline
     class="custom-hed"
-    authors="{[
+    authors={[
       'Prasanta Kumar Dutta',
       'Dea Bankova',
       'Aditi Bhandari',
       'Anurag Rao',
-    ]}"
-    publishTime="{new Date('2023-05-11').toISOString()}"
-    img="{eurovisImgSrc}"
+    ]}
+    publishTime={new Date('2023-05-11').toISOString()}
+    img={eurovisImgSrc}
   >
     <h1 slot="hed">
       <div class="body-note">A visual guide to</div>
diff --git a/src/components/HeroHeadline/Hero.svelte b/src/components/HeroHeadline/Hero.svelte
index 8bc3e39e..731493f9 100644
--- a/src/components/HeroHeadline/Hero.svelte
+++ b/src/components/HeroHeadline/Hero.svelte
@@ -96,7 +96,7 @@
         {#if $$slots.hed}
           <Headline
             class="{cls} !text-{hedAlign}"
-            width="{hedWidth}"
+            width={hedWidth}
             {section}
             {hedSize}
             {hed}
@@ -110,7 +110,7 @@
         {:else}
           <Headline
             class="{cls} !text-{hedAlign}"
-            width="{hedWidth}"
+            width={hedWidth}
             {section}
             {hedSize}
             {hed}
@@ -144,11 +144,11 @@
     <!-- Inline hero -->
     {#if $$slots.inline}
       <Block width="fluid" class="hero-headline inline-hero">
-        <PaddingReset containerIsFluid="{true}">
+        <PaddingReset containerIsFluid={true}>
           {#if $$slots.hed}
             <Headline
               class="{cls} !text-{hedAlign}"
-              width="{hedWidth}"
+              width={hedWidth}
               {section}
               {hedSize}
               {hed}
@@ -162,7 +162,7 @@
           {:else}
             <Headline
               class="{cls} !text-{hedAlign}"
-              width="{hedWidth}"
+              width={hedWidth}
               {section}
               {hedSize}
               {hed}
diff --git a/src/components/HeroHeadline/stories/graphics/crash.svelte b/src/components/HeroHeadline/stories/graphics/crash.svelte
index 66355933..1fc73b82 100644
--- a/src/components/HeroHeadline/stories/graphics/crash.svelte
+++ b/src/components/HeroHeadline/stories/graphics/crash.svelte
@@ -18,7 +18,7 @@
 
 <!-- Generated by ai2html v0.100.0 - 2022-03-29 17:01 -->
 
-<div id="g-CRASH_1-box" bind:clientWidth="{width}">
+<div id="g-CRASH_1-box" bind:clientWidth={width}>
   <!-- Artboard: xs -->
   {#if width && width >= 0 && width < 510}
     <div id="g-CRASH_1-xs" class="g-artboard" style="">
@@ -27,7 +27,7 @@
         id="g-CRASH_1-xs-img"
         class="g-aiImg"
         alt=""
-        style="{`background-image: url(${chartXs});`}"
+        style={`background-image: url(${chartXs});`}
       ></div>
       <div
         id="g-ai0-1"
@@ -80,7 +80,7 @@
         id="g-CRASH_1-sm-img"
         class="g-aiImg"
         alt=""
-        style="{`background-image: url(${chartSm});`}"
+        style={`background-image: url(${chartSm});`}
       ></div>
       <div
         id="g-ai1-1"
@@ -133,7 +133,7 @@
         id="g-CRASH_1-md-img"
         class="g-aiImg"
         alt=""
-        style="{`background-image: url(${chartMd});`}"
+        style={`background-image: url(${chartMd});`}
       ></div>
       <div
         id="g-ai2-1"
@@ -194,7 +194,7 @@
         id="g-CRASH_1-lg-img"
         class="g-aiImg"
         alt=""
-        style="{`background-image: url(${chartLg});`}"
+        style={`background-image: url(${chartLg});`}
       ></div>
       <div
         id="g-ai3-1"
@@ -255,7 +255,7 @@
         id="g-CRASH_1-xl-img"
         class="g-aiImg"
         alt=""
-        style="{`background-image: url(${chartXl});`}"
+        style={`background-image: url(${chartXl});`}
       ></div>
       <div
         id="g-ai4-1"
@@ -316,7 +316,7 @@
         id="g-CRASH_1-xl_copy-img"
         class="g-aiImg"
         alt=""
-        style="{`background-image: url(${chartXxl});`}"
+        style={`background-image: url(${chartXxl});`}
       ></div>
       <div
         id="g-ai5-1"
diff --git a/src/components/HeroHeadline/stories/graphics/quakemap.svelte b/src/components/HeroHeadline/stories/graphics/quakemap.svelte
index 941a391b..5ca06cdd 100644
--- a/src/components/HeroHeadline/stories/graphics/quakemap.svelte
+++ b/src/components/HeroHeadline/stories/graphics/quakemap.svelte
@@ -13,7 +13,7 @@
   import chartXl from '././quake-map-top-xl.jpeg';
 </script>
 
-<div id="g-quake-map-top-box" bind:clientWidth="{width}">
+<div id="g-quake-map-top-box" bind:clientWidth={width}>
   <!-- Artboard: xs -->
   {#if width && width >= 0 && width < 510}
     <div id="g-quake-map-top-xs" class="g-artboard" style="">
@@ -21,7 +21,7 @@
       <div
         id="g-quake-map-top-xs-img"
         class="g-aiImg"
-        style="{`background-image: url(${chartXs});`}"
+        style={`background-image: url(${chartXs});`}
       ></div>
       <div
         id="g-ai0-1"
@@ -102,7 +102,7 @@
       <div
         id="g-quake-map-top-sm-img"
         class="g-aiImg"
-        style="{`background-image: url(${chartSm});`}"
+        style={`background-image: url(${chartSm});`}
       ></div>
       <div
         id="g-ai1-1"
@@ -183,7 +183,7 @@
       <div
         id="g-quake-map-top-md-img"
         class="g-aiImg"
-        style="{`background-image: url(${chartMd});`}"
+        style={`background-image: url(${chartMd});`}
       ></div>
       <div
         id="g-ai2-1"
@@ -271,7 +271,7 @@
       <div
         id="g-quake-map-top-lg-img"
         class="g-aiImg"
-        style="{`background-image: url(${chartLg});`}"
+        style={`background-image: url(${chartLg});`}
       ></div>
       <div
         id="g-ai3-1"
@@ -359,7 +359,7 @@
       <div
         id="g-quake-map-top-xl-img"
         class="g-aiImg"
-        style="{`background-image: url(${chartXl});`}"
+        style={`background-image: url(${chartXl});`}
       ></div>
       <div
         id="g-ai4-1"
diff --git a/src/components/InfoBox/InfoBox.mdx b/src/components/InfoBox/InfoBox.mdx
new file mode 100644
index 00000000..9c23d192
--- /dev/null
+++ b/src/components/InfoBox/InfoBox.mdx
@@ -0,0 +1,122 @@
+import { Meta, Canvas } from '@storybook/blocks';
+
+import * as InfoBoxStories from './InfoBox.stories.svelte';
+
+<Meta of={InfoBoxStories} />
+
+# InfoBox
+
+The `InfoBox` component creates a stylised text box that provides additional information that needs to be visually separate from the main content flow, such as methodology, detailed notes about data and extra context.
+
+```svelte
+<script>
+  import { InfoBox } from '@reuters-graphics/graphics-components';
+</script>
+
+<InfoBox
+  title="About this data"
+  text={'Reuters is collecting daily COVID-19 infections and deaths data for 240 countries and territories around the world, updated regularly throughout each day. \n\n Every country reports those figures a little differently and, inevitably, misses undiagnosed infections and deaths. With this project we are focusing on the trends within countries as they try to contain the virus’ spread, whether they are approaching or past peak infection rates, or if they are seeing a resurgence of infections or deaths.'}
+  notes={'[Read more about our methodology](https://www.reuters.com/world-coronavirus-tracker-and-maps/en/methodology/)'}
+/>
+```
+
+<Canvas of={InfoBoxStories.Demo} />
+
+## Using with ArchieML docs
+
+With the graphics kit, you'll likely get your text value from an ArchieML doc...
+
+```yaml
+# Archie ML doc
+[blocks]
+
+type: info-box
+title: What you need to know about the war
+text: Reuters is collecting daily COVID-19 infections and deaths data for 240 countries and territories around the world, updated regularly throughout each day.
+
+Every country reports those figures a little differently and, inevitably, misses undiagnosed infections and deaths. With this project we are focusing on the trends within countries as they try to contain the virus’ spread, whether they are approaching or past peak infection rates, or if they are seeing a resurgence of infections or deaths.
+:end
+notes: [Read more about our methodology](https://www.reuters.com/world-coronavirus-tracker-and-maps/en/methodology/)
+[]
+```
+
+... which you'll parse out of a ArchieML block object before passing to the `InfoBox` component.
+
+```svelte
+<!-- Graphics Kit -->
+<script>
+  import { InfoBox } from '@reuters-graphics/graphics-components';
+  import content from '$locales/en/content.json';
+</script>
+
+# Graphics Kit
+{#each content.blocks as block}
+  {#if block.type === 'info-box'}
+    <InfoBox title={block.title} text={block.text} notes={block.notes} />
+    <!-- ... -->
+  {/if}
+{/each}
+```
+
+<Canvas of={InfoBoxStories.Demo} />
+
+## Lists
+
+Use markdown to add lists to `InfoBox`.
+
+```svelte
+<script>
+  import { InfoBox } from '@reuters-graphics/graphics-components';
+</script>
+
+<InfoBox
+  title="What you need to know about the war"
+  text={"- **Food crisis**: [Russia's invasion of Ukraine](#) in late February dramatically worsened the outlook for already inflated global food prices.\n- **Under fire**: Civillian homes destroyed in the conflict and Russia accused of war crimes.\n- **Nordstream sabotage**: A series of clandestine bombings and subsequent underwater gas leaks occurred on the Nord Stream 1 and Nord Stream 2 natural gas pipelines."}
+  notes={'[Read more about our methodology](https://www.reuters.com/world-coronavirus-tracker-and-maps/en/methodology/)'}
+/>
+```
+
+<Canvas of={InfoBoxStories.Lists} />
+## Customisation
+
+Use [snippets](https://svelte.dev/docs/svelte/snippet) to customise the `InfoBox`, such as adding tables, icons and thumbnail images.
+
+```svelte
+<InfoBox title="About this data">
+  <!-- Optional custom header -->
+  {#snippet header()}
+    <h3>Global video game market</h3>
+  {/snippet}
+  <!-- Optional custom body -->
+  {#snippet body()}
+    <table>
+      <thead>
+        <tr>
+          <th>Year</th>
+          <th>Market size ($bln)</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td>2024</td>
+          <td>274.63</td>
+        </tr>
+        <tr>
+          <td>2023</td>
+          <td>281.77</td>
+        </tr>
+        <tr>
+          <td>2022</td>
+          <td>249.55</td>
+        </tr>
+      </tbody>
+    </table>
+  {/snippet}
+  <!-- Optional custom footer -->
+  {#snippet updated()}
+    <div class="text-xs font-note">Source: Precedence Research</div>
+  {/snippet}
+</InfoBox>
+```
+
+<Canvas of={InfoBoxStories.Customised} />
diff --git a/src/components/InfoBox/InfoBox.stories.svelte b/src/components/InfoBox/InfoBox.stories.svelte
index 6ccd3d47..f07fc990 100644
--- a/src/components/InfoBox/InfoBox.stories.svelte
+++ b/src/components/InfoBox/InfoBox.stories.svelte
@@ -1,15 +1,12 @@
 <script module lang="ts">
-  // @ts-ignore raw
-  import componentDocs from './stories/docs/component.md?raw';
-
+  import { defineMeta } from '@storybook/addon-svelte-csf';
   import InfoBox from './InfoBox.svelte';
+  import BodyText from '../BodyText/BodyText.svelte';
 
-  import { withComponentDocs } from '$lib/docs/utils/withParams.js';
-
-  export const meta = {
+  const { Story } = defineMeta({
     title: 'Components/Text elements/InfoBox',
     component: InfoBox,
-    ...withComponentDocs(componentDocs),
+    tags: ['autodocs'],
     argTypes: {
       theme: {
         control: 'select',
@@ -20,38 +17,82 @@
         options: ['normal', 'wide', 'wider', 'widest', 'fluid'],
       },
     },
-  };
+  });
 </script>
 
-<script>
-  import { Template, Story } from '@storybook/addon-svelte-csf';
-
-  import BodyText from '../BodyText/BodyText.svelte';
-</script>
-
-<Template >
-  {#snippet children({ args })}
-    <InfoBox {...args} />
-  {/snippet}
-</Template>
-
-<Story name="Default">
+<Story name="Demo">
   <BodyText
-    text="If you haven't seen Game of Thrones, go watch it right now. If you have then you'll totally get why this Hodor themed lorem ipsum generator is just brilliant."
+    text="Bacon ipsum dolor amet turducken buffalo beef ribs bresaola pancetta ribeye pork belly doner hamburger biltong cupim porchetta chuck ham tenderloin. Turducken bresaola jerky chicken."
   />
   <InfoBox
     title="About this data"
-    text="{'Reuters is collecting daily COVID-19 infections and deaths data for 240 countries and territories around the world, updated regularly throughout each day. \n\n Every country reports those figures a little differently and, inevitably, misses undiagnosed infections and deaths. With this project we are focusing on the trends within countries as they try to contain the virus’ spread, whether they are approaching or past peak infection rates, or if they are seeing a resurgence of infections or deaths.'}"
-    notes="{'[Read more about our methodology](https://www.reuters.com/world-coronavirus-tracker-and-maps/en/methodology/)'}"
+    text={'Reuters is collecting daily COVID-19 infections and deaths data for 240 countries and territories around the world, updated regularly throughout each day. \n\n Every country reports those figures a little differently and, inevitably, misses undiagnosed infections and deaths. With this project we are focusing on the trends within countries as they try to contain the virus’ spread, whether they are approaching or past peak infection rates, or if they are seeing a resurgence of infections or deaths.'}
+    notes={'[Read more about our methodology](https://www.reuters.com/world-coronavirus-tracker-and-maps/en/methodology/)'}
   />
   <BodyText
-    text="In case you don't read Twitter, the news, or just can't get enough of The Apprentice host's legendary oration, try this Trump lorem ipsum generator on for size."
+    text="Ham drumstick tail ribeye pancetta, leberkas hamburger chicken spare ribs buffalo jerky sausage ground round meatball. Leberkas kevin short loin, tri-tip shank spare ribs buffalo beef pork belly corned beef chislic tongue."
   />
 </Story>
+<Story
+  name="Lists"
+  tags={['!autodocs', '!dev']}
+  args={{
+    title: 'What you need to know about the war',
+    text: "- **Food crisis**: [Russia's invasion of Ukraine](#) in late February dramatically worsened the outlook for already inflated global food prices. \n- **Under fire**: Civillian homes destroyed in the conflict and Russia accused of war crimes. \n- **Nordstream sabotage**: A series of clandestine bombings and subsequent underwater gas leaks occurred on the Nord Stream 1 and Nord Stream 2 natural gas pipelines. ",
+  }}
+/>
+<Story name="Customised" tags={['!autodocs', '!dev']}>
+  <InfoBox>
+    {#snippet header()}
+      <h3>Global video game market</h3>
+    {/snippet}
+    {#snippet body()}
+      <table>
+        <thead>
+          <tr>
+            <th>Year</th>
+            <th>Market size ($bln)</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr>
+            <td>2024</td>
+            <td>274.63</td>
+          </tr>
+          <tr>
+            <td>2023</td>
+            <td>281.77</td>
+          </tr>
+          <tr>
+            <td>2022</td>
+            <td>249.55</td>
+          </tr>
+        </tbody>
+      </table>
+    {/snippet}
+    {#snippet footer()}
+      <div class="text-xs font-note">Source: Precedence Research</div>
+    {/snippet}
+  </InfoBox>
+</Story>
 
-<Story name="List">
-  <InfoBox
-    title="What you need to know about the war"
-    text="{"- **Food crisis**: [Russia's invasion of Ukraine](#) in late February dramatically worsened the outlook for already inflated global food prices. \n- **Under fire**: Civillian homes destroyed in the conflict and Russia accused of war crimes. \n- **Nordstream sabotage**: A series of clandestine bombings and subsequent underwater gas leaks occurred on the Nord Stream 1 and Nord Stream 2 natural gas pipelines. "}"
-  />
-</Story>
+<style lang="scss">
+  h3 {
+    margin: 0;
+  }
+  // Style the table nicely
+  table {
+    width: 100%;
+    border-collapse: collapse;
+    border-spacing: 0;
+  }
+  th,
+  td {
+    border: 1px solid #ddd;
+    padding: 8px;
+    text-align: center;
+  }
+  th {
+    background-color: #f2f2f2;
+  }
+</style>
diff --git a/src/components/InfoBox/InfoBox.svelte b/src/components/InfoBox/InfoBox.svelte
index 98ddbd0a..52d915a8 100644
--- a/src/components/InfoBox/InfoBox.svelte
+++ b/src/components/InfoBox/InfoBox.svelte
@@ -1,47 +1,59 @@
-<!-- @migration-task Error while migrating Svelte code: Cannot set properties of undefined (setting 'next') -->
 <!-- @component `InfoBox` [Read the docs.](https://reuters-graphics.github.io/graphics-components/?path=/docs/components-text-elements-infobox--docs) -->
 <script lang="ts">
+  import type { Snippet } from 'svelte';
   import type { ContainerWidth } from '../@types/global';
 
   type Theme = 'light' | 'dark';
 
-  /**
-   * Title of the box
-   */
-  export let title: string | null = null;
+  interface Props {
+    /**
+     * Title of the box
+     */
+    title?: string | null;
+    /**
+     * Contents of the note as a markdown string
+     */
+    text?: string;
+    /**
+     * Additional footnotes
+     */
+    notes?: string | null;
+    /**
+     * Width of the component within the text well.
+     */
+    width?: ContainerWidth;
+    /**
+     * Add extra classes to the block tag to target it with custom CSS.
+     */
+    class?: string;
+    /**
+     * Add an id to the block tag to target it with custom CSS.
+     */
+    id?: string;
+    /**
+     * Page theme
+     */
+    theme?: Theme;
+    /** Optional custom header snippet */
+    header?: Snippet;
+    /** Optional custom body snippet */
+    body?: Snippet;
+    /** Optional custom footer snippet */
+    footer?: Snippet;
+  }
 
-  /**
-   * Contents of the note as a markdown string
-   */
-  export let text: string = '';
-
-  /**
-   * Additional footnotes
-   */ export let notes: string | null = null;
-
-  /**
-   * Width of the component within the text well.
-   * @type {string}
-   */
-  export let width: ContainerWidth = 'normal';
-
-  /**
-   * Add extra classes to the block tag to target it with custom CSS.
-   * @type {string}
-   */
-  let cls: string = '';
-  export { cls as class };
-
-  /**
-   * Add an id to the block tag to target it with custom CSS.
-   * @type {string}
-   */
-  export let id: string = '';
-
-  /**
-   * Page theme
-   */
-  export let theme: Theme = 'light';
+  let {
+    title = null,
+    text,
+    notes = null,
+    width = 'normal',
+    class: cls = '',
+    id = '',
+    theme = 'light',
+    header,
+    body,
+    footer,
+  }: Props = $props();
 
   import Block from '../Block/Block.svelte';
   import Markdown from '../Markdown/Markdown.svelte';
@@ -53,36 +65,36 @@
     {id}
     class="{cls} fmy-6 fpx-6 fpy-5 border border-solid rounded"
   >
-    {#if $$slots.header}
+    {#if header}
       <div class="header fmb-2">
-        <!-- Custom title content -->
-        <slot name="header" />
+        <!-- Custom header content -->
+        {@render header()}
       </div>
     {:else if title}
       <div class="header fmb-2">
-        <Markdown source="{title}" />
+        <Markdown source={title} />
       </div>
     {/if}
 
-    {#if $$slots.body}
+    {#if body}
       <div class="body">
-        <!-- Custom content -->
-        <slot name="body" />
+        <!-- Custom body content -->
+        {@render body()}
       </div>
     {:else}
       <div class="body">
-        <Markdown source="{text}" />
+        <Markdown source={text} />
       </div>
     {/if}
 
-    {#if $$slots.footer}
+    {#if footer}
       <div class="footer fmt-2">
         <!-- Custom footer content -->
-        <slot name="footer" />
+        {@render footer()}
       </div>
     {:else if notes}
       <div class="footer fmt-2">
-        <Markdown source="{notes}" />
+        <Markdown source={notes} />
       </div>
     {/if}
   </Block>
diff --git a/src/components/InfoBox/stories/docs/component.md b/src/components/InfoBox/stories/docs/component.md
deleted file mode 100644
index 909ae106..00000000
--- a/src/components/InfoBox/stories/docs/component.md
+++ /dev/null
@@ -1,17 +0,0 @@
-InfoBox is used to provide additional information that needs to be visually set aside from the main content flow. e.g. Methodology, Detailed notes about data, Extra context as text stories.
-
-Switch the theme prop to `dark` for a dark page infobox.
-
-Use the slots to customize the content as needed, e.g. adding icons and thumbnail images etc.
-
-```svelte
-<script>
-  import { InfoBox } from '@reuters-graphics/graphics-components';
-</script>
-
-<InfoBox
-  title="About this data"
-  text="{'Reuters is collecting daily COVID-19 infections and deaths data for 240 countries and territories around the world, updated regularly throughout each day. \n\n Every country reports those figures a little differently and, inevitably, misses undiagnosed infections and deaths. With this project we are focusing on the trends within countries as they try to contain the virus’ spread, whether they are approaching or past peak infection rates, or if they are seeing a resurgence of infections or deaths.'}"
-  notes="{'[Read more about our methodology](https://www.reuters.com/world-coronavirus-tracker-and-maps/en/methodology/)'}"
-/>
-```
diff --git a/src/components/Markdown/stories/docs/component.md b/src/components/Markdown/Markdown.mdx
similarity index 54%
rename from src/components/Markdown/stories/docs/component.md
rename to src/components/Markdown/Markdown.mdx
index 5ba4ae0a..e454f0bf 100644
--- a/src/components/Markdown/stories/docs/component.md
+++ b/src/components/Markdown/Markdown.mdx
@@ -1,20 +1,27 @@
-The Markdown component renders markdown into HTML. That's it!
+import { Meta, Canvas } from '@storybook/blocks';
+import * as MarkdownStories from './Markdown.stories.svelte';
 
----
+<Meta of={MarkdownStories} />
+
+# Markdown
+
+The `Markdown` component renders a markdown string into HTML.
 
 ```svelte
 <script>
   import { Markdown } from '@reuters-graphics/graphics-components';
 </script>
 
-<Markdown source="{'My markdown **string**!'}" />
+<Markdown source={'My *awesome* text in **markdown** with "smart quotes".'} />
 ```
 
+<Canvas of={MarkdownStories.Demo} />
+
 ... well, almost.
 
-Owing to a weird quirk of Svelte's [`@html`](https://svelte.dev/docs/special-tags#html) directive (see [this issue](https://github.com/reuters-graphics/graphics-components/issues/148)), if you want your resulting HTML to be dynamic — e.g., update after a SvelteKit app [hydrates](https://kit.svelte.dev/docs/glossary#hydration) — then you may need to set the included `$staticMarkdown` store to `false` in the browser.
+Owing to a weird quirk of Svelte's [`@html`](https://svelte.dev/docs/special-tags#html) directive (see [this issue](https://github.com/reuters-graphics/graphics-components/issues/148)), if you want your resulting HTML to be dynamic — e.g., update after a SvelteKit app [hydrates](https://kit.svelte.dev/docs/glossary#hydration) — then you may need to set the included `staticMarkdown` rune to `{ static: false }` in the browser.
 
-For example, if you're refreshing some data with markdown strings in a SvelteKit project using a [load function](https://kit.svelte.dev/docs/load), set the store to reflect the [`building`](https://kit.svelte.dev/docs/modules#$app-environment-building) variable, which will correctly [prerender](https://kit.svelte.dev/docs/glossary#prerendering) your markdown content AND update it after fresh data is fetched in the browser.
+For example, if you're refreshing some data with markdown strings in a SvelteKit project using a [load function](https://kit.svelte.dev/docs/load), set the rune to reflect the [`building`](https://kit.svelte.dev/docs/modules#$app-environment-building) variable, which will correctly [prerender](https://kit.svelte.dev/docs/glossary#prerendering) your markdown content AND update it after fresh data is fetched in the browser.
 
 ```javascript
 // +layout.js
@@ -23,8 +30,8 @@ import { building } from '$app/environment';
 
 /** @type {import('./$types').LayoutLoad} */
 export const load = async () => {
-  // Set the staticMarkdown store with the value of building.
-  staticMarkdown.set(building);
+  // Set the staticMarkdown rune with the value of building.
+  staticMarkdown.static = building;
 
   // Now this content will correctly refresh when a reader loads your page.
   const resp = await fetch(
@@ -36,4 +43,4 @@ export const load = async () => {
 };
 ```
 
-If you're not updating your markdown content as above, you can safely leave the `$staticMarkdown` store alone and your page will do the right thing.
+If you're not updating your markdown content as above, you can safely leave the `staticMarkdown` rune alone and your page will do the right thing.
diff --git a/src/components/Markdown/Markdown.stories.svelte b/src/components/Markdown/Markdown.stories.svelte
index 99464d60..e2041319 100644
--- a/src/components/Markdown/Markdown.stories.svelte
+++ b/src/components/Markdown/Markdown.stories.svelte
@@ -1,35 +1,16 @@
 <script module lang="ts">
-  // @ts-ignore raw
-  import componentDocs from './stories/docs/component.md?raw';
-
+  import { defineMeta } from '@storybook/addon-svelte-csf';
   import Markdown from './Markdown.svelte';
 
-  import { withComponentDocs } from '$lib/docs/utils/withParams.js';
-
-  export const meta = {
+  const { Story } = defineMeta({
     title: 'Components/Text elements/Markdown',
     component: Markdown,
-    ...withComponentDocs(componentDocs),
-  };
+  });
 </script>
 
-<script>
-  import { Template, Story } from '@storybook/addon-svelte-csf';
-
-  import Block from '../Block/Block.svelte';
-</script>
-
-<Template >
-  {#snippet children({ args })}
-    <Block>
-      <Markdown {...args} />
-    </Block>
-  {/snippet}
-</Template>
-
 <Story
-  name="Default"
-  args="{{
-    source: 'This is *some* text in **markdown**.',
-  }}"
+  name="Demo"
+  args={{
+    source: 'My *awesome* text in **markdown** with "smart quotes".',
+  }}
 />
diff --git a/src/components/Markdown/Markdown.svelte b/src/components/Markdown/Markdown.svelte
index 5f503e4f..235b3541 100644
--- a/src/components/Markdown/Markdown.svelte
+++ b/src/components/Markdown/Markdown.svelte
@@ -2,21 +2,25 @@
 <script lang="ts">
   import type { Action } from 'svelte/action';
   import { marked } from 'marked';
-  import { staticMarkdown } from './stores';
+  import { markedSmartypants } from 'marked-smartypants';
+  import { staticMarkdown } from './state.svelte';
 
-  
+  marked.use(markedSmartypants());
 
-  
   interface Props {
     /** A Markdown formatted string */
-    source?: string;
+    source: string;
     /** Parse markdown inline, i.e., without wrapping it in paragraph tags */
     parseInline?: boolean;
   }
 
-  let { source = '', parseInline = false }: Props = $props();
+  let { source, parseInline = false }: Props = $props();
 
-  let markdown = $derived(parseInline ? marked.parseInline(source) : marked.parse(source));
+  let markdown = $derived(
+    parseInline ?
+      (marked.parseInline(source) as string)
+    : (marked.parse(source) as string)
+  );
 
   const setInnerHTML: Action<HTMLElement, string> = (node, html) => {
     node.innerHTML = html;
@@ -32,13 +36,15 @@
 </script>
 
 {#if source}
-  {#if $staticMarkdown}
-    <div>
-      {@html markdown}
-    </div>
-  {:else}
-    <div use:setInnerHTML="{markdown}"></div>
-  {/if}
+  {#key source}
+    {#if staticMarkdown.static}
+      <div>
+        {@html markdown}
+      </div>
+    {:else}
+      <div use:setInnerHTML={markdown}></div>
+    {/if}
+  {/key}
 {/if}
 
 <style>
diff --git a/src/components/Markdown/stores.ts b/src/components/Markdown/state.svelte.ts
similarity index 82%
rename from src/components/Markdown/stores.ts
rename to src/components/Markdown/state.svelte.ts
index 5705ac9d..714d01fd 100644
--- a/src/components/Markdown/stores.ts
+++ b/src/components/Markdown/state.svelte.ts
@@ -1,5 +1,3 @@
-import { writable } from 'svelte/store';
-
 /**
  * Set to `false` in the browser to ensure Markdown content correctly updates
  * when a SvelteKit app hyrates.
@@ -12,7 +10,7 @@ import { writable } from 'svelte/store';
  *
  * export const load = async() => {
  *   // Set the store with the value of building.
- *   staticMarkdown.set(building);
+ *   staticMarkdown.static = building;
  *
  *   // Markdown using this content will correctly refresh when
  *   // a reader loads your page.
@@ -22,4 +20,4 @@ import { writable } from 'svelte/store';
  * }
  * ```
  */
-export const staticMarkdown = writable(true);
+export const staticMarkdown = $state({ static: true });
diff --git a/src/components/PaddingReset/PaddingReset.mdx b/src/components/PaddingReset/PaddingReset.mdx
new file mode 100644
index 00000000..17b8cb1a
--- /dev/null
+++ b/src/components/PaddingReset/PaddingReset.mdx
@@ -0,0 +1,54 @@
+import { Meta, Canvas } from '@storybook/blocks';
+
+import * as PaddingResetStories from './PaddingReset.stories.svelte';
+
+<Meta of={PaddingResetStories} />
+
+# PaddingReset
+
+Sometimes you want a visual element to be fluid, i.e., edge-to-edge, but keep padding on adjacent text such as notes or captions. The `PaddingReset` component resets our normal well padding inside a `fluid` container.
+
+```svelte
+<script>
+  import { Block, PaddingReset } from '@reuters-graphics/graphics-components';
+</script>
+
+<Block width="fluid">
+  <!-- Edge-to-edge image -->
+  <img src="https:..." alt="Alt text" class="fmb-1" />
+
+  <!-- Wrap text in `PaddingReset`to add padding back in -->
+  <PaddingReset>
+    <div class="body-note">
+      A caption for the image that is padded when Block is fluid.
+    </div>
+  </PaddingReset>
+</Block>
+```
+
+<Canvas of={PaddingResetStories.Demo} />
+
+## Conditional padding
+
+You can add the padding conditionally by setting the `containerIsFluid` prop to `true` when the `Block` width is `fluid`, which is what many other components in this library do.
+
+```svelte
+<script>
+  import { Block, PaddingReset } from '@reuters-graphics/graphics-components';
+
+  export let src = 'https://...';
+  export let width = 'fluid';
+</script>
+
+<Block {width}>
+  <!-- Edge-to-edge image -->
+  <img src="https:..." alt="Alt text" class="fmb-1" />
+
+  <!-- Set conditional padding with the `containerIsFluid` prop -->
+  <PaddingReset containerIsFluid={width === 'fluid'}>
+    <div class="body-note">
+      A caption for the image that is padded when Block is fluid.
+    </div>
+  </PaddingReset>
+</Block>
+```
diff --git a/src/components/PaddingReset/PaddingReset.stories.svelte b/src/components/PaddingReset/PaddingReset.stories.svelte
index e85df8e5..1d222aa3 100644
--- a/src/components/PaddingReset/PaddingReset.stories.svelte
+++ b/src/components/PaddingReset/PaddingReset.stories.svelte
@@ -1,51 +1,49 @@
 <script module lang="ts">
-  // @ts-ignore raw
-  import componentDocs from './stories/docs/component.md?raw';
-
+  import { defineMeta } from '@storybook/addon-svelte-csf';
   import PaddingReset from './PaddingReset.svelte';
 
-  import { withComponentDocs } from '$lib/docs/utils/withParams.js';
-
-  export const meta = {
+  const { Story } = defineMeta({
     title: 'Components/Page layout/PaddingReset',
     component: PaddingReset,
-    ...withComponentDocs(componentDocs),
-  };
+  });
 </script>
 
 <script>
-  import { Template, Story } from '@storybook/addon-svelte-csf';
   import Block from '../Block/Block.svelte';
+  let width: 'wide' | 'fluid' = 'fluid';
+
+  import sharkSrc from './shark.jpg';
 </script>
 
-<Template >
-  {#snippet children({ args })}
-    <Block width="fluid">
-      <div class="outer"></div>
-      <PaddingReset {...args}>
-        <div class="inner"></div>
-      </PaddingReset>
-    </Block>
-  {/snippet}
-</Template>
-
-<Story
-  name="Default"
-  args="{{
-    containerIsFluid: true,
-  }}"
-/>
+<Story name="Demo">
+  <!-- Fluid block -->
+  <Block {width}>
+    <img src={sharkSrc} alt="shark" class="fmb-1" />
+    <PaddingReset containerIsFluid={width === 'fluid' ? true : false}>
+      <div class="body-note">
+        A caption for the image that is padded when its containing <code
+          >Block</code
+        > is fluid.
+      </div>
+    </PaddingReset>
+  </Block>
+</Story>
 
 <style lang="scss">
-  div {
-    height: 30px;
-    width: 100%;
-    margin-bottom: 2px;
-    &.outer {
-      background: grey;
-    }
-    &.inner {
-      background: salmon;
-    }
+  // Style span as code block with unicode font
+  code {
+    line-height: 1;
+    margin: 0px 2px;
+    padding: 3px 5px;
+    white-space: nowrap;
+    border-radius: 3px;
+    font-size: 13px;
+    border: 1px solid rgb(236, 244, 249);
+    color: rgba(46, 52, 56, 0.9);
+    background-color: rgb(247, 250, 252);
   }
+
+  // p {
+  //   background: rgb(222, 222, 222);
+  // }
 </style>
diff --git a/src/components/PaddingReset/PaddingReset.svelte b/src/components/PaddingReset/PaddingReset.svelte
index abc7dda6..cfc012b5 100644
--- a/src/components/PaddingReset/PaddingReset.svelte
+++ b/src/components/PaddingReset/PaddingReset.svelte
@@ -1,12 +1,16 @@
 <!-- @component `PaddingReset` [Read the docs.](https://reuters-graphics.github.io/graphics-components/?path=/docs/components-page-layout-paddingreset--docs) -->
 <script lang="ts">
-  
+  import type { Snippet } from 'svelte';
+
   interface Props {
     /**
-   * If parent container is fluid, which resets the padding around contained elements.
-   */
+     * Set to `true` if the parent container is fluid.
+     */
     containerIsFluid?: boolean;
-    children?: import('svelte').Snippet;
+    /**
+     * Content to be padded.
+     */
+    children: Snippet;
   }
 
   let { containerIsFluid = true, children }: Props = $props();
@@ -15,11 +19,11 @@
 {#if containerIsFluid}
   <div>
     <!-- Padded content -->
-    {@render children?.()}
+    {@render children()}
   </div>
 {:else}
   <!-- Padded content -->
-  {@render children?.()}
+  {@render children()}
 {/if}
 
 <style>
diff --git a/src/components/PaddingReset/shark.jpg b/src/components/PaddingReset/shark.jpg
new file mode 100644
index 00000000..5b54e9f3
Binary files /dev/null and b/src/components/PaddingReset/shark.jpg differ
diff --git a/src/components/PaddingReset/stories/docs/component.md b/src/components/PaddingReset/stories/docs/component.md
deleted file mode 100644
index 75c5cf90..00000000
--- a/src/components/PaddingReset/stories/docs/component.md
+++ /dev/null
@@ -1,35 +0,0 @@
-Sometimes you want a visual element to be fluid, i.e., edge-to-edge, but keep padding on text that's adajcent to it.
-
-The `PaddingReset` component resets padding on the `Article` well that's been cancelled by a `Block` with a `fluid` width.
-
-```svelte
-<script>
-  import { Block, PaddingReset } from '@reuters-graphics/graphics-components';
-</script>
-
-<Block width="fluid">
-  <!-- An edge-to-edge image -->
-  <img src="https//..." alt="..." width="100%" />
-  <PaddingReset>
-    <p>A caption for the image that will still be padded.</p>
-  </PaddingReset>
-</Block>
-```
-
-You can also add the padding conditionally by using the `containerIsFluid` prop, which is what many other components in this library do.
-
-```svelte
-<script>
-  import { Block, PaddingReset } from '@reuters-graphics/graphics-components';
-
-  export let src = 'https://...';
-  export let width = 'fluid';
-</script>
-
-<Block width="{width}">
-  <img src="{src}" alt="..." width="100%" />
-  <PaddingReset containerIsFluid="{width === 'fluid'}">
-    <p>A caption for the image that will be padded when Block is fluid.</p>
-  </PaddingReset>
-</Block>
-```
diff --git a/src/components/PhotoCarousel/PhotoCarousel.mdx b/src/components/PhotoCarousel/PhotoCarousel.mdx
new file mode 100644
index 00000000..d2ef465f
--- /dev/null
+++ b/src/components/PhotoCarousel/PhotoCarousel.mdx
@@ -0,0 +1,128 @@
+import { Meta, Canvas } from '@storybook/blocks';
+
+import * as PhotoCarouselStories from './PhotoCarousel.stories.svelte';
+
+<Meta of={PhotoCarouselStories} />
+
+# PhotoCarousel
+
+The `PhotoCarousel` component creates a simple and accessible photo carousel with built-in lazy-loading and mobile swipe.
+
+```svelte
+<script>
+  import { PhotoCarousel } from '@reuters-graphics/graphics-components';
+
+  const photos = [
+    {
+      src: 'https://.../myImage.jpg',
+      altText: 'A picture of...',
+      caption: 'My caption...', // Optional
+      credit: 'REUTERS/Jane Doe', // Optional
+      objectFit: 'contain', // Optional
+      objectPosition: '50% 50%', // Optional
+    },
+  ];
+</script>
+
+<PhotoCarousel {photos} />
+```
+
+<Canvas of={PhotoCarouselStories.Demo} />
+
+## Using with ArchieML docs
+
+With the Graphics Kit, you'll likely get your text value from an ArchieML doc...
+
+```yaml
+# ArchieML doc
+[blocks]
+type: photo-carousel
+
+# List of photo data
+[.images]
+  # Photo 1
+  src: 'images/myImage.jpg', # The source path can be a URL or a local path
+  altText: 'A picture of...',
+  caption: 'My caption...', // Optional
+  credit: 'REUTERS/Jane Doe', // Optional
+  objectFit: 'contain', // Optional
+  objectPosition: '50% 50%', // Optional
+
+  # Photo 2
+  src: 'images/myImage2.jpg',
+  altText: 'A picture of...',
+  caption: 'My caption...', // Optional
+  credit: 'REUTERS/Jane Doe', // Optional
+  objectFit: 'contain', // Optional
+  objectPosition: '50% 50%', // Optional
+  ...
+[]
+[]
+```
+
+... which you'll parse out of a ArchieML block object before passing to the `PhotoCarousel` component.
+
+> **Note:** If you're using local images files stored in your Graphics Kit project, prefix `assets` to the image source path, as in the example below.
+
+```svelte
+<!-- App.svelte -->
+<script>
+  import { PhotoCarousel } from '@reuters-graphics/graphics-components';
+  import { assets } from '$app/paths'; // 👈 If using in the Graphics Kit...
+
+  import content from '$locales/en/content.json';
+</script>
+
+{#each content.blocks as block}
+  {#if block.type === 'photo-carousel'}
+    <PhotoCarousel
+      images={block.images.map((img) => ({
+        ...img,
+        src: `${assets}/${img.src}`,
+      }))}
+    />
+  {/if}
+{/each}
+```
+
+<Canvas of={PhotoCarouselStories.Demo} />
+
+## Custom text
+
+To customise the credit and/or caption style, use the `credit` and `caption` [snippets](https://svelte.dev/docs/svelte/snippet) and pass `photo` as an argument.
+
+```svelte
+<PhotoCarousel {images}>
+  <!-- Pass `image` and use the `image.credit` string in the HTML -->
+  {#snippet credit(image)}
+    <p class="custom-credit">{image.credit}</p>
+  {/snippet}
+
+  <!-- Pass `image` and use the `image.caption` string in the HTML -->
+  {#snippet caption(image)}
+    <p class="custom-caption">{image.caption}</p>
+  {/snippet}
+</PhotoCarousel>
+
+<!-- Customise credit and caption styles -->
+<style lang="scss">
+  p {
+    position: absolute;
+    color: white;
+    background-color: rgba(0, 0, 0, 0.6);
+    font-family: sans-serif;
+    font-size: 0.8rem;
+    padding: 0 5px;
+    &.custom-credit {
+      top: 0;
+      right: 0;
+    }
+    &.custom-caption {
+      bottom: 5px;
+      left: 0;
+    }
+  }
+</style>
+```
+
+<Canvas of={PhotoCarouselStories.CustomText} />
diff --git a/src/components/PhotoCarousel/PhotoCarousel.stories.svelte b/src/components/PhotoCarousel/PhotoCarousel.stories.svelte
index 3b1bc3a0..0092f7f6 100644
--- a/src/components/PhotoCarousel/PhotoCarousel.stories.svelte
+++ b/src/components/PhotoCarousel/PhotoCarousel.stories.svelte
@@ -1,68 +1,40 @@
 <script module lang="ts">
-  // @ts-ignore raw
-  import componentDocs from './stories/docs/component.md?raw';
-  // @ts-ignore raw
-  import customDocs from './stories/docs/withCustom.md?raw';
-
+  import { defineMeta } from '@storybook/addon-svelte-csf';
   import PhotoCarousel from './PhotoCarousel.svelte';
 
-  import { withComponentDocs, withStoryDocs } from '$docs/utils/withParams.js';
-
-  export const meta = {
+  const { Story } = defineMeta({
     title: 'Components/Multimedia/PhotoCarousel',
     component: PhotoCarousel,
-    ...withComponentDocs(componentDocs),
     argTypes: {
       width: {
         control: 'select',
         options: ['normal', 'wide', 'wider', 'widest', 'fluid'],
       },
     },
-  };
+  });
 </script>
 
 <script>
-  import { Template, Story } from '@storybook/addon-svelte-csf';
+  import imagesJson from './demo/images.json';
 
-  import photosJson from './stories/photos.json';
-
-  const photos = photosJson.map((p) => ({ ...p, altText: p.caption }));
+  const images = imagesJson.map((img) => ({ ...img, altText: img.caption }));
 </script>
 
-<Template >
-  {#snippet children({ args })}
-    <PhotoCarousel {...args} />
-  {/snippet}
-</Template>
-
 <Story
-  name="Default"
-  args="{{
-    width: 'wider',
-    photos,
-  }}"
+  name="Demo"
+  args={{
+    images,
+  }}
 />
 
-<Story
-  name="Custom credits and captions"
-  args="{{
-    width: 'wider',
-    photos,
-  }}"
-  {...withStoryDocs(customDocs)}
->
-  <PhotoCarousel
-    {...{
-      width: 'wider',
-      photos,
-    }}
-  >
-    {#snippet credit({ credit })}
-        <p class="custom-credit"  >{credit}</p>
-      {/snippet}
-    {#snippet caption({ caption })}
-        <p class="custom-caption"  >{caption}</p>
-      {/snippet}
+<Story name="Custom text" exportName="CustomText">
+  <PhotoCarousel {images}>
+    {#snippet credit(image)}
+      <p class="custom-credit">{image.credit}</p>
+    {/snippet}
+    {#snippet caption(image)}
+      <p class="custom-caption">{image.caption}</p>
+    {/snippet}
   </PhotoCarousel>
 </Story>
 
diff --git a/src/components/PhotoCarousel/PhotoCarousel.svelte b/src/components/PhotoCarousel/PhotoCarousel.svelte
index a785c761..a420e542 100644
--- a/src/components/PhotoCarousel/PhotoCarousel.svelte
+++ b/src/components/PhotoCarousel/PhotoCarousel.svelte
@@ -1,108 +1,86 @@
-<!-- @migration-task Error while migrating Svelte code: Cannot set properties of undefined (setting 'next') -->
 <!-- @component `PhotoCarousel` [Read the docs.](https://reuters-graphics.github.io/graphics-components/?path=/docs/components-multimedia-photocarousel--docs) -->
 <script lang="ts">
-  type ContainerWidth = 'normal' | 'wide' | 'wider' | 'widest' | 'fluid';
-
-  /** Width of the component within the text well. */
-  export let width: ContainerWidth = 'wider';
-
-  /**
-   * Set a different width for captions within the text well, for example,
-   * "normal" to keep captions inline with the rest of the text well.
-   * Can't ever be wider than `width`.
-   * @type {string}
-   */
-  export let textWidth: ContainerWidth = 'normal';
-
-  /** Add an ID to target with SCSS. */
-  export let id: string = '';
-
-  /** Add a class to target with SCSS. */
-  let cls: string = '';
-  export { cls as class };
-
-  interface Image {
-    /**
-     * Image src
-     * @required
-     */
-    src: string;
-    /**
-     * Image alt-text
-     * @required
-     */
-    altText: string;
-    /** Optional caption */
-    caption?: string;
-    /** Optional credit */
-    credit?: string;
-    /** Optional object-fit rule */
-    objectFit?: string;
-    /** Optional object-position rule */
-    objectPosition?: string;
-  }
-
-  /**
-   * Array of photos.
-   * @required
-   */
-  export let photos: Image[] = [];
-
-  /**
-   * Max height of the carousel
-   */
-  export let maxHeight: number = 660;
-
-  type ObjectFit = 'cover' | 'contain';
-
-  /**
-   * Default Image object-fit style, either `cover` or `contain`.
-   */
-  export let defaultImageObjectFit: ObjectFit = 'cover';
-
-  /**
-   * Default image object-position style, e.g., `center center` or `50% 50%`.
-   */
-  export let defaultImageObjectPosition: string = 'center center';
-
-  /**
-   * ARIA label for the carousel.
-   * @required
-   */
-  export let carouselAriaLabel: string = 'Photo gallery';
-
-  /**
-   * Set height of the carousel as a ratio of its width
-   * as long as its below whatever you set in `maxHeight`.
-   */
-  export let heightRatio: number = 0.68;
-
-  /**
-   * Number of images to preload ahead of the active image.
-   */
-  export let preloadImages: number = 1;
-
-  import Block from '../Block/Block.svelte';
-  import { Splide, SplideSlide, SplideTrack } from '@splidejs/svelte-splide';
+  // Utils
   import '@splidejs/svelte-splide/css/core';
-  // @ts-ignore no types
+  import { fly } from 'svelte/transition';
+  import { Splide, SplideSlide, SplideTrack } from '@splidejs/svelte-splide';
+
+  // Icons
   import Fa from 'svelte-fa/src/fa.svelte';
   import {
     faChevronLeft,
     faChevronRight,
   } from '@fortawesome/free-solid-svg-icons';
-  import { fly } from 'svelte/transition';
+
+  // Components
+  import Block from '../Block/Block.svelte';
   import PaddingReset from '../PaddingReset/PaddingReset.svelte';
+
+  // Types
   import type { MoveEventDetail } from '@splidejs/svelte-splide/types';
+  import type { Snippet } from 'svelte';
+  import type { PhotoCarouselImage } from '../@types/global';
 
-  let containerWidth: number;
+  type ContainerWidth = 'normal' | 'wide' | 'wider' | 'widest' | 'fluid';
 
-  let activeImageIndex = 0;
+  type ObjectFit = 'cover' | 'contain';
 
-  $: carouselHeight =
+  interface Props {
+    /** Array of images. */
+    images: PhotoCarouselImage[];
+    /** Width of the component within the text well: normal, wide, wider, widest, fluid */
+    width?: ContainerWidth;
+    /**
+     * Set a different width for captions within the text well, e.g. "normal," to keep captions inline with the rest of the text well. Can't ever be wider than `width`.
+     */
+    textWidth?: ContainerWidth;
+    /** Add an ID to target with SCSS. */
+    id?: string;
+    /** Add a class to target with SCSS. */
+    cls?: string;
+    /** Max height of the carousel */
+    maxHeight?: number;
+    /** Default Image object-fit style: cover, contain */
+    defaultImageObjectFit?: ObjectFit;
+    /** Default image object-position style, e.g., `center center` or `50% 50%`. */
+    defaultImageObjectPosition?: string;
+    /** ARIA label for the carousel. */
+    carouselAriaLabel?: string;
+    /** Set height of the carousel as a ratio of its width as long as its below whatever you set in `maxHeight`. */
+    heightRatio?: number;
+    /** Number of images to preload ahead of the active image. */
+    preloadImages?: number;
+    /** Optional custom credit format as a snippet, which takes the argument `photo`. */
+    credit?: Snippet<[PhotoCarouselImage]>;
+    /** Optional custom caption format as a snippet, which takes the argument `photo`. */
+    caption?: Snippet<[PhotoCarouselImage]>;
+  }
+
+  let {
+    width = 'wider',
+    textWidth = 'normal',
+    id = '',
+    cls = '',
+    images,
+    maxHeight = 660,
+    defaultImageObjectFit = 'cover',
+    defaultImageObjectPosition = 'center center',
+    carouselAriaLabel = 'Photo gallery',
+    heightRatio = 0.68,
+    preloadImages = 1,
+    credit,
+    caption,
+  }: Props = $props();
+
+  let containerWidth: number | undefined = $state(undefined);
+  let activeImageIndex = $state(0);
+
+  // Derive carousel height based on container width
+  let carouselHeight = $derived(
     containerWidth ?
       Math.min(containerWidth * heightRatio, maxHeight)
-    : maxHeight;
+    : maxHeight
+  );
 
   const handleActiveChange = (e?: CustomEvent<MoveEventDetail>) => {
     if (!e) return;
@@ -111,21 +89,21 @@
 </script>
 
 <Block {width} {id} class="photo-carousel fmy-6 {cls}">
-  <div class="carousel-container" bind:clientWidth="{containerWidth}">
+  <div class="carousel-container" bind:clientWidth={containerWidth}>
     <Splide
-      hasTrack="{false}"
-      options="{{
+      hasTrack={false}
+      options={{
         height: carouselHeight,
         fixedHeight: carouselHeight,
         lazyLoad: 'nearby',
         preloadPages: preloadImages,
-      }}"
-      aria-label="{carouselAriaLabel}"
-      on:move="{handleActiveChange}"
+      }}
+      aria-label={carouselAriaLabel}
+      on:move={handleActiveChange}
     >
       <div class="image-container">
         <SplideTrack>
-          {#each photos as photo}
+          {#each images as image}
             <SplideSlide>
               <div class="photo-slide w-full h-full relative">
                 <figure
@@ -134,21 +112,23 @@
                 >
                   <img
                     class="w-full h-full fmy-0"
-                    data-splide-lazy="{photo.src}"
-                    alt="{photo.altText}"
-                    style:object-fit="{photo.objectFit ||
-                      defaultImageObjectFit}"
-                    style:object-position="{photo.objectPosition ||
-                      defaultImageObjectPosition}"
+                    data-splide-lazy={image.src}
+                    alt={image.altText}
+                    style:object-fit={image.objectFit || defaultImageObjectFit}
+                    style:object-position={image.objectPosition ||
+                      defaultImageObjectPosition}
                   />
-                  {#if $$slots.credit}
-                    <slot name="credit" credit="{photo.credit}" />
-                  {:else}
+                  <!-- Render custom credit if credit snippet and string both exist -->
+                  {#if credit && image.credit}
+                    {@render credit(image)}
+
+                    <!-- Otherwise, render with default credit style -->
+                  {:else if image.credit}
                     <span
                       class="credit absolute fmb-1 fml-1 leading-tighter font-note text-xxs"
-                      class:contain-fit="{photo.objectFit === 'contain' ||
-                        defaultImageObjectFit === 'contain'}"
-                      >{photo.credit}</span
+                      class:contain-fit={image.objectFit === 'contain' ||
+                        defaultImageObjectFit === 'contain'}
+                      >{image.credit}</span
                     >
                   {/if}
                 </figure>
@@ -157,21 +137,24 @@
           {/each}
         </SplideTrack>
 
-        {#if photos[activeImageIndex].caption}
-          <PaddingReset containerIsFluid="{width === 'fluid'}">
-            <Block width="{textWidth}">
-              {#if $$slots.caption}
-                <slot
-                  name="caption"
-                  caption="{photos[activeImageIndex].caption}"
-                />
-              {:else}
+        {#if images[activeImageIndex].caption}
+          {@const activePhoto = images[activeImageIndex]}
+          <PaddingReset containerIsFluid={width === 'fluid'}>
+            <Block width={textWidth}>
+              <!-- Render custom caption if caption snippet and string both exist -->
+              {#if caption && activePhoto.caption}
+                {#key activeImageIndex}
+                  {@render caption(activePhoto)}
+                {/key}
+
+                <!-- Otherwise, render with default caption style -->
+              {:else if activePhoto.caption}
                 {#key activeImageIndex}
                   <p
                     class="caption body-caption text-center"
-                    in:fly|local="{{ x: 20, duration: 175 }}"
+                    in:fly|local={{ x: 20, duration: 175 }}
                   >
-                    {photos[activeImageIndex].caption}
+                    {activePhoto.caption}
                   </p>
                 {/key}
               {/if}
@@ -185,10 +168,10 @@
 
         <div class="splide__arrows fp-1">
           <button class="splide__arrow splide__arrow--prev">
-            <Fa icon="{faChevronLeft}" fw />
+            <Fa icon={faChevronLeft} fw />
           </button>
           <button class="splide__arrow splide__arrow--next">
-            <Fa icon="{faChevronRight}" fw />
+            <Fa icon={faChevronRight} fw />
           </button>
         </div>
       </div>
diff --git a/src/components/PhotoCarousel/stories/photos.json b/src/components/PhotoCarousel/demo/images.json
similarity index 100%
rename from src/components/PhotoCarousel/stories/photos.json
rename to src/components/PhotoCarousel/demo/images.json
diff --git a/src/components/PhotoCarousel/demo/photos.json b/src/components/PhotoCarousel/demo/photos.json
new file mode 100644
index 00000000..a713aad9
--- /dev/null
+++ b/src/components/PhotoCarousel/demo/photos.json
@@ -0,0 +1,72 @@
+[
+  {
+    "src": "https://graphics.thomsonreuters.com/cdn/django-tools/media/graphics-gallery/galleries/world-cup-2022/spain-germany-11-27/2022-11-27T194630Z_544493697_UP1E.jpeg",
+    "caption": "Spain's Sergio Busquets and Aymeric Laporte react before a Germany goal is disallowed following a VAR review.",
+    "credit": "REUTERS/Molly Darlington"
+  },
+  {
+    "src": "https://graphics.thomsonreuters.com/cdn/django-tools/media/graphics-gallery/galleries/world-cup-2022/spain-germany-11-27/2022-11-27T194619Z_2007900040_UP1.jpeg",
+    "caption": "Spain's Sergio Busquets fouls Germany's Jamal Musiala before being shown yellow card.",
+    "credit": "REUTERS/Kai Pfaffenbach"
+  },
+  {
+    "src": "https://graphics.thomsonreuters.com/cdn/django-tools/media/graphics-gallery/galleries/world-cup-2022/spain-germany-11-27/2022-11-27T194619Z_635809122_UP1E.jpeg",
+    "caption": "Spain's Sergio Busquets is shown a yellow card by referee Danny Desmond Makkelie.",
+    "credit": "REUTERS/Albert Gea"
+  },
+  {
+    "src": "https://graphics.thomsonreuters.com/cdn/django-tools/media/graphics-gallery/galleries/world-cup-2022/spain-germany-11-27/2022-11-27T191015Z_1293757566_UP1.jpeg",
+    "caption": "Spain's Sergio Busquets in action with Germany's Thomas Muller.",
+    "credit": "REUTERS/John Sibley"
+  },
+  {
+    "src": "https://graphics.thomsonreuters.com/cdn/django-tools/media/graphics-gallery/galleries/world-cup-2022/spain-germany-11-27/2022-11-27T181411Z_1_MTZXEIBR0QNN.jpeg",
+    "caption": "Spain fans inside the stadium before the match.",
+    "credit": "REUTERS/Albert Gea"
+  },
+  {
+    "src": "https://graphics.thomsonreuters.com/cdn/django-tools/media/graphics-gallery/galleries/world-cup-2022/spain-germany-11-27/2022-11-27T194827Z_345059331_UP1E.jpeg",
+    "caption": "Spain's Gavi.",
+    "credit": "REUTERS/Fabrizio Bensch"
+  },
+  {
+    "src": "https://graphics.thomsonreuters.com/cdn/django-tools/media/graphics-gallery/galleries/world-cup-2022/spain-germany-11-27/2022-11-27T175149Z_1_MTZXEIBR0PMD.jpeg",
+    "caption": "",
+    "credit": "REUTERS/John Sibley"
+  },
+  {
+    "src": "https://graphics.thomsonreuters.com/cdn/django-tools/media/graphics-gallery/galleries/world-cup-2022/spain-germany-11-27/2022-11-27T203232Z_890709671_UP1E.jpeg",
+    "caption": "Spain's Alvaro Morata scores their first goal.",
+    "credit": "REUTERS/Kai Pfaffenbach"
+  },
+  {
+    "src": "https://graphics.thomsonreuters.com/cdn/django-tools/media/graphics-gallery/galleries/world-cup-2022/spain-germany-11-27/2022-11-27T203612Z_1399473226_UP1.jpeg",
+    "caption": "Spain's Alvaro Morata celebrates scoring their first goal.",
+    "credit": "REUTERS/Molly Darlington"
+  },
+  {
+    "src": "https://graphics.thomsonreuters.com/cdn/django-tools/media/graphics-gallery/galleries/world-cup-2022/spain-germany-11-27/2022-11-27T204305Z_1795686896_UP1.jpeg",
+    "caption": "Germany's Niclas Fullkrug scores their first goal.",
+    "credit": "REUTERS/Molly Darlington"
+  },
+  {
+    "src": "https://graphics.thomsonreuters.com/cdn/django-tools/media/graphics-gallery/galleries/world-cup-2022/spain-germany-11-27/2022-11-27T204528Z_151067034_UP1E.jpeg",
+    "caption": "Germany's Niclas Fullkrug celebrates scoring their first goal.",
+    "credit": "REUTERS/Molly Darlington"
+  },
+  {
+    "src": "https://graphics.thomsonreuters.com/cdn/django-tools/media/graphics-gallery/galleries/world-cup-2022/spain-germany-11-27/2022-11-27T205041Z_2076149593_UP1.jpeg",
+    "caption": "Spain coach Luis Enrique.",
+    "credit": "REUTERS/John Sibley"
+  },
+  {
+    "src": "https://graphics.thomsonreuters.com/cdn/django-tools/media/graphics-gallery/galleries/world-cup-2022/spain-germany-11-27/2022-11-27T205604Z_1468073277_UP1.jpeg",
+    "caption": "Germany's Manuel Neuer applauds fans after the match.",
+    "credit": "REUTERS/Kai Pfaffenbach"
+  },
+  {
+    "src": "https://graphics.thomsonreuters.com/cdn/django-tools/media/graphics-gallery/galleries/world-cup-2022/spain-germany-11-27/2022-11-27T205854Z_408619749_UP1E.jpeg",
+    "caption": "Spain players applaud fans after the match.",
+    "credit": "REUTERS/Albert Gea"
+  }
+]
diff --git a/src/components/PhotoCarousel/stories/docs/component.md b/src/components/PhotoCarousel/stories/docs/component.md
deleted file mode 100644
index c85a042f..00000000
--- a/src/components/PhotoCarousel/stories/docs/component.md
+++ /dev/null
@@ -1,21 +0,0 @@
-A simple, accessible photo carousel with lazy-loading and mobile swipe built in.
-
-```svelte
-<script>
-  import { PhotoCarousel } from '@reuters-graphics/graphics-components';
-
-  const photos = [
-    {
-      src: 'https://.../myImage.jpg',
-      altText: 'A picture of...',
-      caption: 'My caption...', // Optional
-      credit: 'REUTERS/Jane Doe', // Optional
-      objectFit: 'contain', // Optional
-      objectPosition: '50% 50%', // Optional
-    },
-    // ...
-  ];
-</script>
-
-<PhotoCarousel photos="{photos}" />
-```
diff --git a/src/components/PhotoCarousel/stories/docs/withCustom.md b/src/components/PhotoCarousel/stories/docs/withCustom.md
deleted file mode 100644
index 849ee394..00000000
--- a/src/components/PhotoCarousel/stories/docs/withCustom.md
+++ /dev/null
@@ -1,27 +0,0 @@
-Use named slots to style your own custom credits and/or captions.
-
-```svelte
-<PhotoCarousel photos="{photos}">
-  <p slot="credit" class="custom-credit" let:credit>{credit}</p>
-  <p slot="caption" class="custom-caption" let:caption>{caption}</p>
-</PhotoCarousel>
-
-<style lang="scss">
-  p {
-    position: absolute;
-    color: white;
-    background-color: rgba(0, 0, 0, 0.6);
-    font-family: sans-serif;
-    font-size: 0.8rem;
-    padding: 0 5px;
-    &.custom-credit {
-      top: 0;
-      right: 0;
-    }
-    &.custom-caption {
-      bottom: 5px;
-      left: 0;
-    }
-  }
-</style>
-```
diff --git a/src/components/PhotoPack/PhotoPack.mdx b/src/components/PhotoPack/PhotoPack.mdx
new file mode 100644
index 00000000..dd1fecc5
--- /dev/null
+++ b/src/components/PhotoPack/PhotoPack.mdx
@@ -0,0 +1,125 @@
+import { Meta, Canvas } from '@storybook/blocks';
+
+import * as PhotoPackStories from './PhotoPack.stories.svelte';
+
+<Meta of={PhotoPackStories} />
+
+# PhotoPack
+
+The `PhotoPack` component makes simple photo grids with custom layouts at various breakpoints.
+
+`images` are defined with their src, alt text, captions and an optional `maxHeight`, which ensures that the images are no taller than that height in any layout.
+
+`layouts` describe how images will be laid out at different breakpoints. The default layout is one photo per row, stacked vertically -- i.e. mobile layout. You can customise the layouts and group images into `rows` above a certain `breakpoint` by specifying the number of images that should go in that row. For example:
+
+```javascript
+const layouts = [
+  {
+    breakpoint: 450,
+    rows: [1, 2, 1],
+  },
+];
+```
+
+... tells the component that when the `PhotoPack` container is 450 pixels or wider, it should group the 4 images in 3 rows: 1 in the first, 2 in the second and 1 in the last.
+
+You can define as many layouts for as many images as you like.
+
+```svelte
+<script>
+  import { PhotoPack } from '@reuters-graphics/graphics-components';
+
+  /** Array of photo metadata */
+  const images = [
+    {
+      src: 'https://...',
+      altText: 'Alt text',
+      caption: 'Lorem ipsum. REUTERS/Photog',
+      // Optional max-height of images across all layouts
+      maxHeight: 800,
+    },
+    // ...
+  ];
+
+  /** Set the number of photos in each row at various breakpoints */
+  const layouts = [
+    {
+      breakpoint: 450, // Applies to containers wider than 450px
+      rows: [1, 2, 1], // Number of photos in each row
+    },
+    // Another layout for containers wider than 750px
+    { breakpoint: 750, rows: [1, 3] },
+  ];
+</script>
+
+<PhotoPack {images} {layouts} />
+```
+
+<Canvas of={PhotoPackStories.Demo} />
+
+## Using with ArchieML docs
+
+With the Graphics Kit, you'll likely get your text value from an ArchieML doc...
+
+```yaml
+# ArchieML doc
+[blocks]
+type: photo-pack
+id: my-photo-pack # Optional
+class: mb-2 # Optional
+width: wide # Optional
+textWidth: normal # Optional
+gap: 10 # Optional; must be a number.
+
+# Array of image metadata
+  [.images]
+    src: images/my-img-1.jpg
+    altText: Alt text
+    caption: Lorem ipsum. REUTERS/Photog
+
+    src: images/my-img-2.jpg
+    altText: Alt text
+    caption: Lorem ipsum. REUTERS/Photog
+
+    ...
+  []
+
+[]
+```
+
+... which you'll parse out of a ArchieML block object before passing to the `PhotoPack` component.
+
+> **Important ❗**: The prop `gap` must be a number. ArchieML renders all values -- including numbers -- as strings, so convert the `prop` value to a number before passing it to `PhotoPack`.
+
+```svelte
+<!-- App.svelte -->
+<script>
+  import { PhotoPack } from '@reuters-graphics/graphics-components';
+  import { assets } from '$app/paths'; // 👈 If using in the Graphics Kit...
+
+  import content from '$locales/en/content.json';
+</script>
+
+{#each content.blocks as block}
+  {#if block.type === 'photo-pack'}
+    <!-- Pass `assets` into the image source in Graphics Kit -->
+    <PhotoPack
+      id={block.id}
+      class={block.class}
+      width={block.width}
+      textWidth={block.textWidth}
+      gap={Number(block.gap)}
+      images={block.images.map((img) => ({
+        ...img,
+        src: `${assets}/${img.src}`,
+      }))}
+      layouts={[
+        { breakpoint: 750, rows: [2, 3] },
+        { breakpoint: 450, rows: [1, 2, 2] },
+      ]}
+    />
+  {/if}
+{/each}
+```
+
+<Canvas of={PhotoPackStories.ArchieML} />
diff --git a/src/components/PhotoPack/PhotoPack.stories.svelte b/src/components/PhotoPack/PhotoPack.stories.svelte
index f2acea98..1cd4b8ed 100644
--- a/src/components/PhotoPack/PhotoPack.stories.svelte
+++ b/src/components/PhotoPack/PhotoPack.stories.svelte
@@ -1,19 +1,10 @@
 <script module lang="ts">
-  // @ts-ignore raw
-  import componentDocs from './stories/docs/component.md?raw';
-  // @ts-ignore raw
-  import archieMLDocs from './stories/docs/archieML.md?raw';
-  // @ts-ignore raw
-  import missingAltTextDocs from './stories/docs/missingAltText.md?raw';
-
+  import { defineMeta } from '@storybook/addon-svelte-csf';
   import PhotoPack from './PhotoPack.svelte';
 
-  import { withComponentDocs, withStoryDocs } from '$docs/utils/withParams.js';
-
-  export const meta = {
+  const { Story } = defineMeta({
     title: 'Components/Multimedia/PhotoPack',
     component: PhotoPack,
-    ...withComponentDocs(componentDocs),
     argTypes: {
       width: {
         control: 'select',
@@ -24,37 +15,34 @@
         options: ['normal', 'wide', 'wider', 'widest', 'fluid'],
       },
     },
-  };
+  });
 </script>
 
 <script>
-  import { Template, Story } from '@storybook/addon-svelte-csf';
-
   const defaultImages = [
     {
-      src: 'https://via.placeholder.com/1024x768.jpg',
-      altText: 'alt text',
+      src: 'https://graphics.thomsonreuters.com/cdn/django-tools/media/graphics-gallery/galleries/world-cup-2022/spain-germany-11-27/2022-11-27T194630Z_544493697_UP1E.jpeg',
       caption:
-        'A residential building destroyed by shelling in the settlement of Borodyanka in the Kyiv region, Ukraine March 3, 2022. Picture taken with a drone. REUTERS/Maksim Levin',
-      maxHeight: 400,
+        "Spain's Sergio Busquets and Aymeric Laporte react before a Germany goal is disallowed following a VAR review.",
+      altText: 'alt text',
     },
     {
-      src: 'https://via.placeholder.com/1640x1180.jpg',
-      altText: 'alt text',
+      src: 'https://graphics.thomsonreuters.com/cdn/django-tools/media/graphics-gallery/galleries/world-cup-2022/spain-germany-11-27/2022-11-27T194619Z_2007900040_UP1.jpeg',
       caption:
-        'Surveillance footage shows a missile hitting a residential building in Kyiv, Ukraine, February 26, 2022, in this still image taken from a video obtained by REUTERS',
+        "Spain's Sergio Busquets fouls Germany's Jamal Musiala before being shown yellow card.",
+      altText: 'alt text',
     },
     {
-      src: 'https://via.placeholder.com/1200x900.jpg',
-      altText: 'alt text',
+      src: 'https://graphics.thomsonreuters.com/cdn/django-tools/media/graphics-gallery/galleries/world-cup-2022/spain-germany-11-27/2022-11-27T194619Z_635809122_UP1E.jpeg',
       caption:
-        'People walk past the remains of a missile at a bus terminal in Kyiv, Ukraine March 4, 2022. REUTERS/Valentyn Ogirenko',
+        "Spain's Sergio Busquets is shown a yellow card by referee Danny Desmond Makkelie.",
+      altText: 'alt text',
     },
     {
-      src: 'https://via.placeholder.com/1024x768.jpg',
-      altText: 'alt text',
+      src: 'https://graphics.thomsonreuters.com/cdn/django-tools/media/graphics-gallery/galleries/world-cup-2022/spain-germany-11-27/2022-11-27T191015Z_1293757566_UP1.jpeg',
       caption:
-        'People walk past the remains of a missile at a bus terminal. REUTERS/Valentyn Ogirenko',
+        "Spain's Sergio Busquets in action with Germany's Thomas Muller.",
+      altText: 'alt text',
     },
   ];
 
@@ -63,96 +51,58 @@
     { breakpoint: 750, rows: [1, 3] },
   ];
 
+  const archieMLImages = [
+    {
+      src: 'https://graphics.thomsonreuters.com/cdn/django-tools/media/graphics-gallery/galleries/world-cup-2022/spain-germany-11-27/2022-11-27T194630Z_544493697_UP1E.jpeg',
+      caption:
+        "Spain's Sergio Busquets and Aymeric Laporte react before a Germany goal is disallowed following a VAR review.",
+      altText: 'alt text',
+    },
+    {
+      src: 'https://graphics.thomsonreuters.com/cdn/django-tools/media/graphics-gallery/galleries/world-cup-2022/spain-germany-11-27/2022-11-27T194619Z_2007900040_UP1.jpeg',
+      caption:
+        "Spain's Sergio Busquets fouls Germany's Jamal Musiala before being shown yellow card.",
+      altText: 'alt text',
+    },
+    {
+      src: 'https://graphics.thomsonreuters.com/cdn/django-tools/media/graphics-gallery/galleries/world-cup-2022/spain-germany-11-27/2022-11-27T194619Z_635809122_UP1E.jpeg',
+      caption:
+        "Spain's Sergio Busquets is shown a yellow card by referee Danny Desmond Makkelie.",
+      altText: 'alt text',
+    },
+    {
+      src: 'https://graphics.thomsonreuters.com/cdn/django-tools/media/graphics-gallery/galleries/world-cup-2022/spain-germany-11-27/2022-11-27T191015Z_1293757566_UP1.jpeg',
+      caption:
+        "Spain's Sergio Busquets in action with Germany's Thomas Muller.",
+      altText: 'alt text',
+    },
+    {
+      src: 'https://graphics.thomsonreuters.com/cdn/django-tools/media/graphics-gallery/galleries/world-cup-2022/spain-germany-11-27/2022-11-27T203612Z_1399473226_UP1.jpeg',
+      caption: "Spain's Alvaro Morata celebrates scoring their first goal.",
+      altText: 'alt text',
+    },
+  ];
   const archieMLBlock = {
-    type: 'photo-pack',
     id: 'my-photo-pack',
     class: 'mb-2',
     width: 'wide',
     textWidth: 'normal',
-    gap: '15',
-    images: [
-      {
-        src: 'https://via.placeholder.com/1024x768.jpg',
-        altText: 'alt text',
-        caption: 'Lorem ipsum. Reuters/Photog',
-        maxHeight: 600,
-      },
-      {
-        src: 'https://via.placeholder.com/1024x768.jpg',
-        altText: 'alt text',
-        caption: 'Lorem ipsum. Reuters/Photog',
-      },
-      {
-        src: 'https://via.placeholder.com/1024x768.jpg',
-        altText: 'alt text',
-        caption: 'Lorem ipsum. Reuters/Photog',
-      },
-      {
-        src: 'https://via.placeholder.com/1024x768.jpg',
-        altText: 'alt text',
-        caption: 'Lorem ipsum. Reuters/Photog',
-      },
-      {
-        src: 'https://via.placeholder.com/1024x768.jpg',
-        altText: 'alt text',
-        caption: 'Lorem ipsum. Reuters/Photog',
-      },
-    ],
+    gap: Number('15'),
+    images: archieMLImages,
     layouts: [
       { breakpoint: 750, rows: [2, 3] },
       { breakpoint: 450, rows: [1, 2, 2] },
     ],
   };
-
-  const altTextImages = [
-    {
-      src: 'https://via.placeholder.com/1024x768.jpg',
-      altText: 'alt text',
-      caption:
-        'A residential building destroyed by shelling in the settlement of Borodyanka in the Kyiv region, Ukraine March 3, 2022. Picture taken with a drone. REUTERS/Maksim Levin',
-      maxHeight: 400,
-    },
-    {
-      src: 'https://via.placeholder.com/1640x1180.jpg',
-      altText: '',
-      caption:
-        'Surveillance footage shows a missile hitting a residential building in Kyiv, Ukraine, February 26, 2022, in this still image taken from a video obtained by REUTERS',
-    },
-  ];
-  const altTextLayouts = [{ breakpoint: 450, rows: [2] }];
 </script>
 
-<Template >
-  {#snippet children({ ...args })}
-    <PhotoPack {...args} />
-  {/snippet}
-</Template>
-
-
-
 <Story
-  name="Default"
-  args="{{
+  name="Demo"
+  args={{
     width: 'wide',
     textWidth: 'normal',
     images: defaultImages,
     layouts: defaultLayouts,
-  }}"
-/>
-
-<Story
-  name="ArchieML"
-  {...withStoryDocs(archieMLDocs)}
-  args="{archieMLBlock}"
-/>
-
-<Story
-  name="Missing altText"
-  args="{{
-    width: 'wide',
-    textWidth: 'normal',
-    images: altTextImages,
-    layouts: altTextLayouts,
-  }}"
-  {...withStoryDocs(missingAltTextDocs)}
+  }}
 />
+<Story name="ArchieML" args={archieMLBlock} />
diff --git a/src/components/PhotoPack/PhotoPack.svelte b/src/components/PhotoPack/PhotoPack.svelte
index 70b6dade..6d13c172 100644
--- a/src/components/PhotoPack/PhotoPack.svelte
+++ b/src/components/PhotoPack/PhotoPack.svelte
@@ -1,102 +1,91 @@
-<!-- @migration-task Error while migrating Svelte code: Cannot set properties of undefined (setting 'next') -->
 <!-- @component `PhotoPack` [Read the docs.](https://reuters-graphics.github.io/graphics-components/?path=/docs/components-multimedia-photopack--docs) -->
 <script lang="ts">
-  interface Image {
+  import Block from '../Block/Block.svelte';
+  import PaddingReset from '../PaddingReset/PaddingReset.svelte';
+  import Markdown from '../Markdown/Markdown.svelte';
+
+  // Utils
+  import { random4 } from '../../utils';
+  import { groupRows } from './utils';
+
+  // Types
+  export interface Image {
     src: string;
     altText: string;
     caption?: string;
     maxHeight?: number;
   }
-  /**
-   * Array of image objects
-   * @required
-   */
-  export let images: Image[] = [];
 
-  interface Layout {
+  export interface Layout {
     breakpoint: number;
     rows: number[];
   }
-  /**
-   * Array of layout objects
-   * @required
-   */
-  export let layouts: Layout[] = [];
-  /**
-   * Gap between images.
-   * @type {number}
-   */
-  export let gap = 15;
-
-  const random4 = () =>
-    Math.floor((1 + Math.random()) * 0x10000)
-      .toString(16)
-      .substring(1);
-  /**
-   * Add an ID to target with SCSS. Should be unique from all other elements.
-   * @type {string}
-   */
-  export let id: string = 'photopack-' + random4() + random4();
-  /**
-   * Add a class to target with SCSS.
-   * @type {string}
-   */
-  let cls: string = '';
-  export { cls as class };
 
   type ContainerWidth = 'normal' | 'wide' | 'wider' | 'widest' | 'fluid';
 
-  /** Width of the component within the text well. */
-  export let width: ContainerWidth = 'normal';
+  interface Props {
+    /** Array of image objects */
+    images: Image[];
+    /** Array of layout objects */
+    layouts?: Layout[];
+    /** Gap between images. */
+    gap?: number;
+    /** Add an ID to target with SCSS. Should be unique from all other elements. */
+    id?: string;
+    /** Add a class to target with SCSS. */
+    class: string;
+    /** Width of the component within the text well: 'normal' | 'wide' | 'wider' | 'widest' | 'fluid' */
+    width: ContainerWidth;
+    /** Set a different width for captions within the text well. For example, "normal" to keep captions inline with the rest of the text well.
+     *
+     *  Can't ever be wider than `width`: 'normal' | 'wide' | 'wider' | 'widest' | 'fluid' */
+    textWidth: ContainerWidth;
+  }
+
+  let {
+    images,
+    layouts,
+    gap = 15,
+    id = 'photopack-' + random4() + random4(),
+    class: cls = '',
+    width = 'normal',
+    textWidth = 'normal',
+  }: Props = $props();
+
+  let containerWidth = $state(0); // or undefined?
+
   /**
-   * Set a different width for captions within the text well, for example,
-   * "normal" to keep captions inline with the rest of the text well.
-   * Can't ever be wider than `width`.
-   * @type {string}
+   *
+   * Sort layouts by descending breakpoints.
+   *
+   * @NOTE - We can't use `sort` directly on the array because it mutates the original array; we can't update a state inside a derived expression: https://svelte.dev/docs/svelte/runtime-errors#Client-errors-state_unsafe_mutation
+   *
+   * So, we need to use `toSorted` instead.
    */
-  export let textWidth: ContainerWidth = 'normal';
-
-  import Block from '../Block/Block.svelte';
-  import PaddingReset from '../PaddingReset/PaddingReset.svelte';
-  import Markdown from '../Markdown/Markdown.svelte';
-
-  let containerWidth: number;
-
-  const groupRows = (images: Image[], layout?: Layout) => {
-    // Default layout, one img per row
-    if (!layout) return images.map((img) => [img]);
-    // Otherwise, chunk into rows according to layout scheme
-    let i = 0;
-    const rows = [];
-    for (const rowLength of layout.rows) {
-      const row = [];
-      for (const imgI of [...Array(rowLength).keys()]) {
-        row.push(images[imgI + i]);
-      }
-      rows.push(row);
-      i += rowLength;
-    }
-    return rows;
-  };
-  // Sort so breakpoints always descend
-  $: layouts.sort((a, b) => (a.breakpoint < b.breakpoint ? 1 : -1));
-  $: layout = layouts.find(
-    (l) =>
-      // Must have valid rows schema, i.e., adds to the total number of images
-      l.rows.reduce((a, b) => a + b, 0) === images.length &&
-      // Breakpoint is higher than container width
-      (containerWidth || 0) >= l.breakpoint
+  let sortedLayouts = $derived(
+    layouts?.toSorted((a, b) => (a.breakpoint < b.breakpoint ? 1 : -1))
   );
-  $: rows = groupRows(images, layout);
+
+  let layout = $derived(
+    sortedLayouts?.find(
+      (l) =>
+        // Must have valid rows schema, i.e., adds to the total number of images
+        l.rows.reduce((a, b) => a + b, 0) === images.length &&
+        // Breakpoint is higher than container width
+        (containerWidth || 0) >= l.breakpoint
+    )
+  );
+
+  let rows = $derived(groupRows(images, layout));
 </script>
 
 <Block {width} {id} class="photopack fmy-6 {cls}">
-  <div class="photopack-container w-full" bind:clientWidth="{containerWidth}">
+  <div class="photopack-container w-full" bind:clientWidth={containerWidth}>
     {#each rows as row, ri}
       <div
         class="photopack-row flex justify-between"
         style:gap="0 {gap}px"
-        style:margin-bottom="{ri < rows.length - 1 ? gap + 'px' : ''}"
+        style:margin-bottom={ri < rows.length - 1 ? gap + 'px' : ''}
       >
         {#each row as img, i}
           <figure
@@ -105,9 +94,9 @@
           >
             <img
               class="m-0 w-full h-full object-cover"
-              src="{img.src}"
-              alt="{img.altText}"
-              style:max-height="{img.maxHeight ? img.maxHeight + 'px' : ''}"
+              src={img.src}
+              alt={img.altText}
+              style:max-height={img.maxHeight ? img.maxHeight + 'px' : ''}
             />
             {#if !img.altText}
               <div class="alt-warning absolute text-xxs py-1 px-2">altText</div>
@@ -117,14 +106,14 @@
       </div>
     {/each}
   </div>
-  <PaddingReset containerIsFluid="{width === 'fluid'}">
+  <PaddingReset containerIsFluid={width === 'fluid'}>
     <div class="notes contents">
-      <Block width="{textWidth}" class="photopack-captions-container">
+      <Block width={textWidth} class="photopack-captions-container">
         {#each rows as row, ri}
           {#each row as img, i}
             {#if img.caption}
               <div id="{id}-figure-{ri}-{i}" class="caption">
-                <Markdown source="{img.caption}" />
+                <Markdown source={img.caption} />
               </div>
             {/if}
           {/each}
diff --git a/src/components/PhotoPack/stories/docs/archieML.md b/src/components/PhotoPack/stories/docs/archieML.md
deleted file mode 100644
index 130c2c3f..00000000
--- a/src/components/PhotoPack/stories/docs/archieML.md
+++ /dev/null
@@ -1,63 +0,0 @@
-```yaml
-[blocks]
-# ...
-
-type: photo-pack
-id: my-photo-pack
-class: mb-2
-width: wide
-textWidth: normal
-gap: 10
-[.images]
-  src: images/my-img-1.jpg
-  altText: Alt text
-  caption: Lorem ipsum. REUTERS/Photog
-
-  src: images/my-img-2.jpg
-  altText: Alt text
-  caption: Lorem ipsum. REUTERS/Photog
-
-  src: images/my-img-3.jpg
-  altText: Alt text
-  caption: Lorem ipsum. REUTERS/Photog
-
-  src: images/my-img-4.jpg
-  altText: Alt text
-  caption: Lorem ipsum. REUTERS/Photog
-
-  src: images/my-img-5.jpg
-  altText: Alt text
-  caption: Lorem ipsum. REUTERS/Photog
-[]
-
-# ...
-[]
-```
-
-```svelte
-<!-- App.svelte -->
-{#each content.blocks as block}
-  {#if block.type === 'text'}
-  <!-- ... -->
-
-  {:else if block.type === 'photo-pack'}
-    <PhotoPack
-      id={block.id}
-      class={block.class}
-      width={block.width}
-      textWidth={block.textWidth}
-      images={block.images.map((img) => ({
-        src: `${assets}/${img.src}`,
-        altText: img.altText,
-        caption: img.caption,
-      }))}
-      layouts={[
-        { breakpoint: 750, rows: [2, 3] },
-        { breakpoint: 450, rows: [1, 2, 2] },
-      ]}
-    />
-    
-  <!-- ... -->
-  {/if}
-{/each}
-```
diff --git a/src/components/PhotoPack/stories/docs/component.md b/src/components/PhotoPack/stories/docs/component.md
deleted file mode 100644
index 69c32c05..00000000
--- a/src/components/PhotoPack/stories/docs/component.md
+++ /dev/null
@@ -1,45 +0,0 @@
-The `PhotoPack` component makes simple photo grids with custom layouts at whatever breakpoint you need.
-
-```svelte
-<script>
-  import { PhotoPack } from '@reuters-graphics/graphics-components';
-
-  const images = [
-    {
-      src: 'https://...',
-      altText: 'Alt text',
-      caption: 'Lorem ipsum. REUTERS/Photog',
-      // Optional max-height of image across all layouts
-      maxHeight: 800,
-    },
-    // ...
-  ];
-
-  const layouts = [
-    {
-      // Breakpoint above which this layout applies
-      breakpoint: 450,
-      // Number of photos in each row of this layout, adding up to the total number of images
-      rows: [1, 2, 1],
-    },
-    { breakpoint: 750, rows: [1, 3] },
-  ];
-</script>
-
-<PhotoPack images="{images}" layouts="{layouts}" />
-```
-
-`images` are defined with their src, alt text, captions and an optional `maxHeight`, which makes sure the image is no taller than that height in pixels in any layout.
-
-`layouts` describe how those images will be laid out in rows at different breakpoints. The default layout (mobile-first) is each photo on its own row, stacked vertically, but you can group photos into `rows` above a `breakpoint` by specifying the number of photos that should go in that row. For example:
-
-```javascript
-const layouts = [{
-  breakpoint: 450,
-  rows: [1,2,1],
-}];
-```
-
-... tells the component that when the `PhotoPack` container is 450 pixels or wider, it should group the 4 photos in 3 rows, 1 in the first, 2 in the second and 1 in the last.
-
-You can define as many layouts for as many images as you like.
diff --git a/src/components/PhotoPack/stories/docs/missingAltText.md b/src/components/PhotoPack/stories/docs/missingAltText.md
deleted file mode 100644
index 93304de2..00000000
--- a/src/components/PhotoPack/stories/docs/missingAltText.md
+++ /dev/null
@@ -1 +0,0 @@
-If any of your images is missing `altText` a small warning will overlay the photo.
diff --git a/src/components/PhotoPack/utils.ts b/src/components/PhotoPack/utils.ts
new file mode 100644
index 00000000..da466828
--- /dev/null
+++ b/src/components/PhotoPack/utils.ts
@@ -0,0 +1,18 @@
+import type { Image, Layout } from './PhotoPack.svelte';
+
+export const groupRows = (images: Image[], layout?: Layout) => {
+  // Default layout, one img per row
+  if (!layout) return images.map((img) => [img]);
+  // Otherwise, chunk into rows according to layout scheme
+  let i = 0;
+  const rows = [];
+  for (const rowLength of layout.rows) {
+    const row = [];
+    for (const imgI of [...Array(rowLength).keys()]) {
+      row.push(images[imgI + i]);
+    }
+    rows.push(row);
+    i += rowLength;
+  }
+  return rows;
+};
diff --git a/src/components/PymChild/PymChild.mdx b/src/components/PymChild/PymChild.mdx
new file mode 100644
index 00000000..927d6bd3
--- /dev/null
+++ b/src/components/PymChild/PymChild.mdx
@@ -0,0 +1,36 @@
+import { Meta } from '@storybook/blocks';
+
+import * as PymChildStories from './PymChild.stories.svelte';
+
+<Meta of={PymChildStories} />
+
+# PymChild
+
+The `PymChild` component creates a [Pym.js](https://blog.apps.npr.org/pym.js/) child instance for embeddables.
+
+```svelte
+<script>
+  import { PymChild } from '@reuters-graphics/graphics-components';
+</script>
+
+<PymChild polling={500} />
+```
+
+You can access the Pym.js child via `pymChildState` in other components to send custom height updates to parent frames:
+
+```svelte
+<script>
+  import {
+    PymChild,
+    pymChildState,
+  } from '@reuters-graphics/graphics-components';
+
+  const updateHeight = () => {
+    if (pymChildState.pymChild) pymChildState.pymChild.sendHeight();
+  };
+</script>
+
+<PymChild />
+
+<button onclick={updateHeight}>Update height</button>
+```
diff --git a/src/components/PymChild/PymChild.stories.svelte b/src/components/PymChild/PymChild.stories.svelte
index 5119f692..36c1f1f3 100644
--- a/src/components/PymChild/PymChild.stories.svelte
+++ b/src/components/PymChild/PymChild.stories.svelte
@@ -1,27 +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 PymChild from './PymChild.svelte';
 
-  import { withComponentDocs } from '$lib/docs/utils/withParams.js';
-
-  export const meta = {
+  const { Story } = defineMeta({
     title: 'Components/Utilities/PymChild',
     component: PymChild,
-    ...withComponentDocs(componentDocs),
-  };
+  });
 </script>
 
-<script>
-  import { Template, Story } from '@storybook/addon-svelte-csf';
-</script>
-
-<Template >
-  {#snippet children({ args })}
-    <PymChild {...args} />
-    <div>Nothing to see here. 😎</div>
-  {/snippet}
-</Template>
-
-<Story name="Default" />
+<Story name="Demo" tags={['!autodocs', '!dev']} />
diff --git a/src/components/PymChild/PymChild.svelte b/src/components/PymChild/PymChild.svelte
index 38425ea9..f7cb9831 100644
--- a/src/components/PymChild/PymChild.svelte
+++ b/src/components/PymChild/PymChild.svelte
@@ -1,10 +1,9 @@
 <!-- @component `PymChild` [Read the docs.](https://reuters-graphics.github.io/graphics-components/?path=/docs/components-utilities-pymchild--docs) -->
 <script lang="ts">
-  
-
-  import { onMount } from 'svelte';
   import pym from 'pym.js';
-  import { pymChildStore } from './stores.js';
+  import { pymChildState } from './state.svelte.js';
+  import { onMount } from 'svelte';
+
   interface Props {
     /** Pym.js polling interval */
     polling?: number;
@@ -12,10 +11,8 @@
 
   let { polling = 500 }: Props = $props();
 
-  let pymChild;
-
   onMount(() => {
-    pymChild = new pym.Child({ polling });
-    pymChildStore.set(pymChild);
+    let pymChild = new pym.Child({ polling });
+    pymChildState.pymChild = pymChild;
   });
 </script>
diff --git a/src/components/PymChild/state.svelte.ts b/src/components/PymChild/state.svelte.ts
new file mode 100644
index 00000000..3dfee824
--- /dev/null
+++ b/src/components/PymChild/state.svelte.ts
@@ -0,0 +1,5 @@
+import pym from 'pym.js';
+
+type PymChildState = { pymChild: pym.Child | null };
+
+export const pymChildState: PymChildState = $state({ pymChild: null });
diff --git a/src/components/PymChild/stores.js b/src/components/PymChild/stores.js
deleted file mode 100644
index 690e8453..00000000
--- a/src/components/PymChild/stores.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { writable } from 'svelte/store';
-
-export const pymChildStore = writable(null);
diff --git a/src/components/PymChild/stories/docs/component.md b/src/components/PymChild/stories/docs/component.md
deleted file mode 100644
index ac261b84..00000000
--- a/src/components/PymChild/stories/docs/component.md
+++ /dev/null
@@ -1,28 +0,0 @@
-A Pym.js child instance for embeddables.
-
-```svelte
-<script>
-  import { PymChild } from '@reuters-graphics/graphics-components';
-</script>
-
-<PymChild polling="{500}" />
-```
-
-You can access the Pym.js child through its store in other components to send custom height updates to parent frames:
-
-```svelte
-<script>
-  import {
-    PymChild,
-    pymChildStore,
-  } from '@reuters-graphics/graphics-components';
-
-  const updateHeight = () => {
-    if ($pymChildStore) $pymChildStore.sendHeight();
-  };
-</script>
-
-<PymChild />
-
-<button on:click="{updateHeight}">Update height</button>
-```
diff --git a/src/components/ReutersGraphicsLogo/ReutersGraphicsLogo.mdx b/src/components/ReutersGraphicsLogo/ReutersGraphicsLogo.mdx
new file mode 100644
index 00000000..6e7c817b
--- /dev/null
+++ b/src/components/ReutersGraphicsLogo/ReutersGraphicsLogo.mdx
@@ -0,0 +1,21 @@
+import { Meta, Canvas } from '@storybook/blocks';
+
+import * as ReutersGraphicsLogoStories from './ReutersGraphicsLogo.stories.svelte';
+
+<Meta of={ReutersGraphicsLogoStories} />
+
+# ReutersGraphicsLogo
+
+The `ReutersGraphicsLogo` component contains the Reuters Graphics team logo.
+
+> Generally, used only for internal tools. For public pages, use the [ReutersLogo](./?path=/docs/components-logos-reuterslogo--docs) component.
+
+```svelte
+<script>
+  import { ReutersGraphicsLogo } from '@reuters-graphics/graphics-components';
+</script>
+
+<ReutersGraphicsLogo />
+```
+
+<Canvas of={ReutersGraphicsLogoStories.Demo} />
diff --git a/src/components/ReutersGraphicsLogo/ReutersGraphicsLogo.stories.svelte b/src/components/ReutersGraphicsLogo/ReutersGraphicsLogo.stories.svelte
index c5243444..34093134 100644
--- a/src/components/ReutersGraphicsLogo/ReutersGraphicsLogo.stories.svelte
+++ b/src/components/ReutersGraphicsLogo/ReutersGraphicsLogo.stories.svelte
@@ -1,26 +1,14 @@
 <script module lang="ts">
-  // @ts-ignore raw
-  import componentDocs from './stories/docs/component.md?raw';
-
+  import { defineMeta } from '@storybook/addon-svelte-csf';
   import ReutersGraphicsLogo from './ReutersGraphicsLogo.svelte';
-
-  import { withComponentDocs } from '$lib/docs/utils/withParams.js';
-
-  export const meta = {
+  const { Story } = defineMeta({
     title: 'Components/Logos/ReutersGraphicsLogo',
     component: ReutersGraphicsLogo,
-    ...withComponentDocs(componentDocs),
-  };
+    argTypes: {
+      logoColour: { control: 'color' },
+      textColour: { control: 'color' },
+    },
+  });
 </script>
 
-<script>
-  import { Template, Story } from '@storybook/addon-svelte-csf';
-</script>
-
-<Template >
-  {#snippet children({ args })}
-    <ReutersGraphicsLogo {...args} />
-  {/snippet}
-</Template>
-
-<Story name="Default" args="{{}}" />
+<Story name="Demo" />
diff --git a/src/components/ReutersGraphicsLogo/ReutersGraphicsLogo.svelte b/src/components/ReutersGraphicsLogo/ReutersGraphicsLogo.svelte
index 6fe397dc..cb6e31bc 100644
--- a/src/components/ReutersGraphicsLogo/ReutersGraphicsLogo.svelte
+++ b/src/components/ReutersGraphicsLogo/ReutersGraphicsLogo.svelte
@@ -1,8 +1,5 @@
 <!-- @component `ReutersGraphicsLogo` [Read the docs.](https://reuters-graphics.github.io/graphics-components/?path=/docs/components-logos-reutersgraphicslogo--docs) -->
 <script lang="ts">
-  
-  
-  
   interface Props {
     /** "Kinesis" colour */
     logoColour?: string;
@@ -12,7 +9,11 @@
     width?: string;
   }
 
-  let { logoColour = '#D64000', textColour = '#212223', width = '100%' }: Props = $props();
+  let {
+    logoColour = '#D64000',
+    textColour = '#212223',
+    width = '100%',
+  }: Props = $props();
 </script>
 
 <svg
diff --git a/src/components/ReutersGraphicsLogo/stories/docs/component.md b/src/components/ReutersGraphicsLogo/stories/docs/component.md
deleted file mode 100644
index 6980dcaf..00000000
--- a/src/components/ReutersGraphicsLogo/stories/docs/component.md
+++ /dev/null
@@ -1,11 +0,0 @@
-Reuters Graphics team logo.
-
-> Generally, only used for internal tools. For public pages, use the [ReutersLogo](./?path=/docs/components-logos-reuterslogo--docs) component.
-
-```svelte
-<script>
-  import { ReutersGraphicsLogo } from '@reuters-graphics/graphics-components';
-</script>
-
-<ReutersGraphicsLogo />
-```
diff --git a/src/components/ReutersLogo/ReutersLogo.mdx b/src/components/ReutersLogo/ReutersLogo.mdx
new file mode 100644
index 00000000..e4d3b63e
--- /dev/null
+++ b/src/components/ReutersLogo/ReutersLogo.mdx
@@ -0,0 +1,19 @@
+import { Meta, Canvas } from '@storybook/blocks';
+
+import * as ReutersLogoStories from './ReutersLogo.stories.svelte';
+
+<Meta of={ReutersLogoStories} />
+
+# ReutersLogo
+
+The `ReutersLogo` component contains the official Reuters logo.
+
+```svelte
+<script>
+  import { ReutersLogo } from '@reuters-graphics/graphics-components';
+</script>
+
+<ReutersLogo />
+```
+
+<Canvas of={ReutersLogoStories.Demo} />
diff --git a/src/components/ReutersLogo/ReutersLogo.stories.svelte b/src/components/ReutersLogo/ReutersLogo.stories.svelte
index 87499cf6..5ab6725f 100644
--- a/src/components/ReutersLogo/ReutersLogo.stories.svelte
+++ b/src/components/ReutersLogo/ReutersLogo.stories.svelte
@@ -1,30 +1,15 @@
 <script module lang="ts">
-  // @ts-ignore raw
-  import componentDocs from './stories/docs/component.md?raw';
-
+  import { defineMeta } from '@storybook/addon-svelte-csf';
   import ReutersLogo from './ReutersLogo.svelte';
 
-  import { withComponentDocs } from '$lib/docs/utils/withParams.js';
-
-  export const meta = {
+  const { Story } = defineMeta({
     title: 'Components/Logos/ReutersLogo',
     component: ReutersLogo,
-    ...withComponentDocs(componentDocs),
     argTypes: {
       logoColour: { control: 'color' },
       textColour: { control: 'color' },
     },
-  };
+  });
 </script>
 
-<script>
-  import { Template, Story } from '@storybook/addon-svelte-csf';
-</script>
-
-<Template >
-  {#snippet children({ args })}
-    <ReutersLogo {...args} />
-  {/snippet}
-</Template>
-
-<Story name="Default" />
+<Story name="Demo" />
diff --git a/src/components/ReutersLogo/ReutersLogo.svelte b/src/components/ReutersLogo/ReutersLogo.svelte
index 49a4a00f..aadffaee 100644
--- a/src/components/ReutersLogo/ReutersLogo.svelte
+++ b/src/components/ReutersLogo/ReutersLogo.svelte
@@ -1,8 +1,5 @@
 <!-- @component `ReutersLogo` [Read the docs.](https://reuters-graphics.github.io/graphics-components/?path=/docs/components-logos-reuterslogo--docs) -->
 <script lang="ts">
-  
-  
-  
   interface Props {
     /** "Kinesis" colour */
     logoColour?: string;
@@ -12,7 +9,11 @@
     width?: string;
   }
 
-  let { logoColour = '#D64000', textColour = '#212223', width = '100%' }: Props = $props();
+  let {
+    logoColour = '#D64000',
+    textColour = '#212223',
+    width = '100%',
+  }: Props = $props();
 </script>
 
 <svg
@@ -21,22 +22,6 @@
   viewBox="0 0 1760.4 558.7"
   style="width: {width}; --logoColour: {logoColour}; --textColour: {textColour};"
 >
-  <defs>
-    <style>
-      .cls-1 {
-        fill: var(--logoColour);
-      }
-
-      .cls-1,
-      .cls-2 {
-        stroke-width: 0px;
-      }
-
-      .cls-2 {
-        fill: var(--textColour);
-      }
-    </style>
-  </defs>
   <g id="Primary_Logo" data-name="Primary Logo">
     <g>
       <g>
@@ -186,3 +171,18 @@
     </g>
   </g>
 </svg>
+
+<style>
+  .cls-1 {
+    fill: var(--logoColour);
+  }
+
+  .cls-1,
+  .cls-2 {
+    stroke-width: 0px;
+  }
+
+  .cls-2 {
+    fill: var(--textColour);
+  }
+</style>
diff --git a/src/components/ReutersLogo/stories/docs/component.md b/src/components/ReutersLogo/stories/docs/component.md
deleted file mode 100644
index 18cd0d66..00000000
--- a/src/components/ReutersLogo/stories/docs/component.md
+++ /dev/null
@@ -1,9 +0,0 @@
-The official Reuters logo.
-
-```svelte
-<script>
-  import { ReutersLogo } from '@reuters-graphics/graphics-components';
-</script>
-
-<ReutersLogo />
-```
diff --git a/src/components/SEO/SEO.mdx b/src/components/SEO/SEO.mdx
new file mode 100644
index 00000000..1772a3be
--- /dev/null
+++ b/src/components/SEO/SEO.mdx
@@ -0,0 +1,80 @@
+import { Meta, Canvas } from '@storybook/blocks';
+
+import * as SEOStories from './SEO.stories.svelte';
+
+<Meta of={SEOStories} />
+
+# SEO
+
+The `SEO` component adds essential metadata to pages.
+
+```svelte
+<script>
+  import { SEO } from '@reuters-graphics/graphics-components';
+</script>
+
+<SEO
+  baseUrl="https://www.reuters.com/graphics/world-coronavirus-tracker-and-maps"
+  pageUrl={new URL(
+    'https://www.reuters.com/graphics/world-coronavirus-tracker-and-maps/countries/united-kingdom/'
+  )}
+  seoTitle="A title for Google"
+  seoDescription="A description for Google"
+  shareTitle="A title for Twitter/Facebook"
+  shareDescription="A description for Twitter/Facebook"
+  shareImgPath="https://www.reuters.com/graphics/world-coronavirus-tracker-and-maps/assets/images/share.jpg"
+  shareImgAlt="An image showing global COVID infection rates"
+  publishTime="2020-09-15T00:00:00.000Z"
+  updateTime="2021-01-10T12:30:00.000Z"
+  authors={[
+    { name: 'Jane Doe', link: 'https://www.reuters.com/authors/jane-doe/' },
+    { name: 'John Doe', link: 'https://www.reuters.com/authors/john-doe/' },
+  ]}
+/>
+```
+
+## Using with ArchieML docs
+
+With the Graphics Kit, you'll likely get many of your text values from an ArchieML doc...
+
+```yaml
+# ArchieML doc
+slug: ROOT-SLUG/WILD
+seoTitle: Page title for search
+seoDescription: Page description for search
+shareTitle: Page title for social media
+shareDescription: Page description for social media
+shareImgPath: images/reuters-graphics.jpg
+shareImgAlt: Alt text for share image.
+```
+
+... which you'll pass to the `SEO` component.
+
+```svelte
+<script>
+  import { SEO } from '@reuters-graphics/graphics-components';
+  import pkg from '$pkg';
+  import content from '$locales/en/content.json';
+  import { assets } from '$app/paths';
+  import { page } from '$app/stores';
+</script>
+
+<SEO
+  baseUrl={VITE_BASE_URL}
+  pageUrl={$page.url}
+  seoTitle={content.seoTitle}
+  seoDescription={content.seoDescription}
+  shareTitle={content.shareTitle}
+  shareDescription={content.shareDescription}
+  shareImgPath={`${assets}/${content.shareImgPath}`}
+  shareImgAlt={content.shareImgAlt}
+  publishTime={pkg?.reuters?.graphic?.published}
+  updateTime={pkg?.reuters?.graphic?.updated}
+  authors={pkg?.reuters?.graphic?.authors}
+/>
+```
+
+> **Note:** For _reasons_, we can't document the value of `VITE_BASE_URL` below. It's `import` + `.meta.env.BASE_URL` (concatenate all that) in the Graphics Kit and other Vite-based rigs.
+
+<Canvas of={SEOStories.Demo} />
+```
diff --git a/src/components/SEO/SEO.stories.svelte b/src/components/SEO/SEO.stories.svelte
index e09205b5..dc354359 100644
--- a/src/components/SEO/SEO.stories.svelte
+++ b/src/components/SEO/SEO.stories.svelte
@@ -1,49 +1,23 @@
 <script module lang="ts">
-  // @ts-ignore raw
-  import componentDocs from './stories/docs/component.md?raw';
-  // @ts-ignore raw
-  import archieMLDocs from './stories/docs/archieML.md?raw';
-
+  import { defineMeta } from '@storybook/addon-svelte-csf';
   import SEO from './SEO.svelte';
 
-  import {
-    withComponentDocs,
-    withStoryDocs,
-  } from '$lib/docs/utils/withParams.js';
-
-  export const meta = {
+  const { Story } = defineMeta({
     title: 'Components/Ads & analytics/SEO',
     component: SEO,
-    ...withComponentDocs(componentDocs),
-  };
+  });
 </script>
 
-<script>
-  import { Template, Story } from '@storybook/addon-svelte-csf';
-</script>
-
-<Template >
-  {#snippet children({ args })}
-    <SEO {...args} />
-    <div>Nothing to see here. 😎</div>
-  {/snippet}
-</Template>
-
+<div>View page source to see the SEO metadata.</div>
 <Story
-  name="Default"
-  args="{{
-    baseUrl: 'https://graphics.reuters.com',
-    pageUrl: new URL('https://graphics.reuters.com/hello-world/'),
-    publishTime: new Date('2020-09-15').toISOString(),
-  }}"
-/>
-
-<Story
-  name="ArchieML"
-  args="{{
-    baseUrl: 'https://graphics.reuters.com',
-    pageUrl: new URL('https://graphics.reuters.com/hello-world/'),
-    publishTime: new Date('2020-09-15').toISOString(),
-  }}"
-  {...withStoryDocs(archieMLDocs)}
+  name="Demo"
+  args={{
+    baseUrl: 'https://www.reuters.com',
+    seoTitle: 'A title for Google',
+    seoDescription: 'A description for Google',
+    shareTitle: 'A title for Twitter/Facebook',
+    shareDescription: 'A description for Twitter/Facebook',
+    shareImgPath:
+      'https://www.reuters.com/graphics/world-coronavirus-tracker-and-maps/assets/images/share.jpg',
+  }}
 />
diff --git a/src/components/SEO/SEO.svelte b/src/components/SEO/SEO.svelte
index c18ae2b8..dd407342 100644
--- a/src/components/SEO/SEO.svelte
+++ b/src/components/SEO/SEO.svelte
@@ -1,91 +1,60 @@
 <!-- @component `SEO` [Read the docs.](https://reuters-graphics.github.io/graphics-components/?path=/docs/components-ads-analytic-seo--docs) -->
 <script lang="ts">
-  
-  
-
-  
-  
-  
-  
-  
-  
-  
-  
-
   interface GraphicAuthor {
     name: string;
-    url: string;
+    link: string;
   }
 
-  
   interface Props {
     /**
-   * Base url for the page, which in [Vite-based projects](https://vitejs.dev/guide/build.html#public-base-path)
-   * is globally available as `import.meta.env.BASE_URL`.
-   * @requiredx
-   * @type {string}
-   */
-    baseUrl?: string;
+     * Base url for the page, which in [Vite-based projects](https://vitejs.dev/guide/build.html#public-base-path) is globally available as `import.meta.env.BASE_URL`.
+     */
+    baseUrl: string;
     /**
-   * [URL](https://developer.mozilla.org/en-US/docs/Web/API/URL) object for the page.
-   * @required
-   * @type {URL}
-   */
-    pageUrl?: URL | null;
+     * [URL](https://developer.mozilla.org/en-US/docs/Web/API/URL) object for the page.
+     */
+    pageUrl: URL;
     /**
-   * SEO title
-   * @required
-   * @type {string}
-   */
+     * SEO title
+     */
     seoTitle: string;
     /**
-   * SEO description
-   * @required
-   * @type {string}
-   */
+     * SEO description
+     */
     seoDescription: string;
     /**
-   * Share title
-   * @required
-   * @type {string}
-   */
+     * Share title
+     */
     shareTitle: string;
     /**
-   * Share description
-   * @required
-   * @type {string}
-   */
+     * Share description
+     */
     shareDescription: string;
     /**
-   * Share image path. **Must be an absolute path.**
-   * @required
-   * @type {string}
-   */
+     * Share image path. **Must be an absolute path.**
+     */
     shareImgPath: string;
     /**
-   * Share image alt text, up to 420 characters.
-   * @type {string}
-   */
+     * Share image alt text, up to 420 characters.
+     */
     shareImgAlt?: string;
     /**
-   * Publish time as an [ISO string](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toISOString)
-   * @type {string}
-   */
+     * Publish time as an [ISO string](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toISOString)
+     */
     publishTime?: string;
     /**
-   * Updated time as an [ISO string](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toISOString)
-   * @type {string}
-   */
+     * Updated time as an [ISO string](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toISOString)
+     */
     updateTime?: string;
     /**
-   * Array of authors for the piece. Each author object must have `name` and `url` attributes.
-   */
+     * Array of authors for the piece. Each author object must have `name` and `link` attributes.
+     */
     authors?: GraphicAuthor[];
   }
 
   let {
-    baseUrl = '',
-    pageUrl = null,
+    baseUrl,
+    pageUrl,
     seoTitle,
     seoDescription,
     shareTitle,
@@ -94,9 +63,8 @@
     shareImgAlt = '',
     publishTime = '',
     updateTime = '',
-    authors = []
+    authors = [],
   }: Props = $props();
-
   const getOrigin = (baseUrl: string) => {
     try {
       return new URL(baseUrl).origin;
@@ -109,7 +77,9 @@
   };
 
   let origin = $derived(getOrigin(baseUrl));
-  let canonicalUrl = $derived((origin + pageUrl?.pathname).replace(/index\.html\/$/, ''));
+  let canonicalUrl = $derived(
+    (origin + (pageUrl?.pathname || '')).replace(/index\.html\/$/, '')
+  );
 
   const orgLdJson = {
     '@context': 'http://schema.org',
@@ -149,10 +119,10 @@
     dateCreated: publishTime,
     datePublished: publishTime,
     dateModified: updateTime,
-    author: authors.map(({ name, url }) => ({
+    author: authors.map(({ name, link }) => ({
       '@type': 'Person',
       name,
-      url,
+      url: link,
     })),
     creator: authors.map(({ name }) => name),
     articleSection: 'Graphics',
@@ -164,8 +134,8 @@
 <svelte:head>
   {#key canonicalUrl}
     <title>{seoTitle}</title>
-    <meta name="description" content="{seoDescription}" />
-    <link rel="canonical" href="{canonicalUrl}" />
+    <meta name="description" content={seoDescription} />
+    <link rel="canonical" href={canonicalUrl} />
     <link
       rel="shortcut icon"
       type="image/x-icon"
@@ -190,26 +160,26 @@
       sizes="96x96"
     />
 
-    <meta property="og:url" content="{canonicalUrl}" />
+    <meta property="og:url" content={canonicalUrl} />
     <meta property="og:type" content="article" />
-    <meta property="og:title" content="{shareTitle}" itemprop="name" />
+    <meta property="og:title" content={shareTitle} itemprop="name" />
     <meta
       property="og:description"
-      content="{shareDescription}"
+      content={shareDescription}
       itemprop="description"
     />
-    <meta property="og:image" content="{shareImgPath}" itemprop="image" />
+    <meta property="og:image" content={shareImgPath} itemprop="image" />
     <meta property="og:site_name" content="Reuters" />
 
     <meta name="twitter:card" content="summary_large_image" />
     <meta name="twitter:site" content="@ReutersGraphics" />
     <meta name="twitter:creator" content="@ReutersGraphics" />
-    <meta name="twitter:domain" content="{origin}" />
-    <meta name="twitter:title" content="{shareTitle}" />
-    <meta name="twitter:description" content="{shareDescription}" />
-    <meta name="twitter:image" content="{shareImgPath}" />
+    <meta name="twitter:domain" content={origin} />
+    <meta name="twitter:title" content={shareTitle} />
+    <meta name="twitter:description" content={shareDescription} />
+    <meta name="twitter:image" content={shareImgPath} />
     {#if shareImgAlt}
-      <meta name="twitter:image:alt" content="{shareImgAlt}" />
+      <meta name="twitter:image:alt" content={shareImgAlt} />
     {/if}
 
     <meta property="fb:app_id" content="319194411438328" />
diff --git a/src/components/SEO/stories/docs/archieML.md b/src/components/SEO/stories/docs/archieML.md
deleted file mode 100644
index db2ebca9..00000000
--- a/src/components/SEO/stories/docs/archieML.md
+++ /dev/null
@@ -1,36 +0,0 @@
-```yaml
-slug:  ROOT-SLUG/WILD
-seoTitle: Page title for search
-seoDescription: Page description for search
-shareTitle: Page title for social media
-shareDescription: Page description for social media
-shareImgPath: images/reuters-graphics.jpg
-shareImgAlt: Alt text for share image.
-```
-
-```svelte
-<script>
-  import { SEO } from '@reuters-graphics/graphics-components';
-  import pkg from '$pkg';
-  import content from '$locales/en/content.json';
-  import { assets } from '$app/paths';
-  import { page } from '$app/stores';
-</script>
-
-<SEO
-  baseUrl="{VITE_BASE_URL}"
-  pageUrl="{$page.url}"
-  seoTitle="{content.seoTitle}"
-  seoDescription="{content.seoDescription}"
-  shareTitle="{content.shareTitle}"
-  shareDescription="{content.shareDescription}"
-  shareImgPath="{`${assets}/${content.shareImgPath}`}"
-  shareImgAlt="{content.shareImgAlt}"
-  publishTime="{pkg?.reuters?.graphic?.published}"
-  updateTime="{pkg?.reuters?.graphic?.updated}"
-  authors="{pkg?.reuters?.graphic?.authors}"
-/>
-```
-
-> **Note:** For _reasons_, we can't document the value of `VITE_BASE_URL` below. It's `import` + `.meta.env.BASE_URL` (concatenate all that) in the Graphics Kit and other Vite-based rigs.
-
diff --git a/src/components/SEO/stories/docs/component.md b/src/components/SEO/stories/docs/component.md
deleted file mode 100644
index 0b5c0aa2..00000000
--- a/src/components/SEO/stories/docs/component.md
+++ /dev/null
@@ -1,26 +0,0 @@
-The `SEO` component adds essential metadata to published pages.
-
-```svelte
-<script>
-  import { SEO } from '@reuters-graphics/graphics-components';
-</script>
-
-<SEO
-  baseUrl="https://graphics.reuters.com"
-  pageUrl="{new URL(
-    'https://graphics.reuters.com/world-coronavirus-tracker-and-maps/'
-  )}"
-  seoTitle="A title for Google"
-  seoDescription="A description for Google"
-  shareTitle="A title for Twitter/Facebook"
-  shareDecription="A description for Twitter/Facebook"
-  shareImgPath="https://graphics.reuters.com/world-coronavirus-tracker-and-maps/assets/images/share.jpg"
-  shareImgAlt="An image showing global COVID infection rates"
-  publishTime="2020-09-15T00:00:00.000Z"
-  updateTime="2021-01-10T12:30:00.000Z"
-  authors="{[
-    { name: 'Jane Doe', url: 'https://twitter.com/JaneDoe' },
-    { name: 'John Doe', url: 'https://twitter.com/JohnDoe' },
-  ]}"
-/>
-```
diff --git a/src/components/Scroller/Background.svelte b/src/components/Scroller/Background.svelte
index 0f568478..1b60f30d 100644
--- a/src/components/Scroller/Background.svelte
+++ b/src/components/Scroller/Background.svelte
@@ -22,8 +22,8 @@
   {#if preload === 0 || (i >= (stackBackground ? 0 : index - preload) && i <= index + preload)}
     <div
       class="step-background step-{i + 1} w-full absolute"
-      class:visible="{stackBackground ? i <= index : i === index}"
-      class:invisible="{stackBackground ? i > index : i !== index}"
+      class:visible={stackBackground ? i <= index : i === index}
+      class:invisible={stackBackground ? i > index : i !== index}
     >
       <step.background {...step.backgroundProps || {}}></step.background>
     </div>
diff --git a/src/components/Scroller/Embedded/Background.svelte b/src/components/Scroller/Embedded/Background.svelte
index 73150e3c..b7bc244d 100644
--- a/src/components/Scroller/Embedded/Background.svelte
+++ b/src/components/Scroller/Embedded/Background.svelte
@@ -11,7 +11,7 @@
   let { step, backgroundWidth, index }: Props = $props();
 </script>
 
-<Block width="{backgroundWidth}" class="background-container step-{index + 1}">
+<Block width={backgroundWidth} class="background-container step-{index + 1}">
   <div class="embedded-background step-{index + 1}" aria-hidden="true">
     <step.background {...step.backgroundProps || {}}></step.background>
   </div>
diff --git a/src/components/Scroller/Embedded/Foreground.svelte b/src/components/Scroller/Embedded/Foreground.svelte
index c959a658..d3fe2d81 100644
--- a/src/components/Scroller/Embedded/Foreground.svelte
+++ b/src/components/Scroller/Embedded/Foreground.svelte
@@ -17,18 +17,18 @@
 
   {#if typeof step.altText === 'string'}
     <div class="background-alt-text visually-hidden">
-      <Markdown source="{step.altText}" />
+      <Markdown source={step.altText} />
     </div>
   {/if}
 {:else if typeof step.foreground === 'string'}
   <Block class="body-text step-{index + 1}">
     <div class="embedded-foreground step-{index + 1}">
-      <Markdown source="{step.foreground}" />
+      <Markdown source={step.foreground} />
     </div>
 
     {#if typeof step.altText === 'string'}
       <div class="background-alt-text visually-hidden">
-        <Markdown source="{step.altText}" />
+        <Markdown source={step.altText} />
       </div>
     {/if}
   </Block>
diff --git a/src/components/Scroller/Embedded/index.svelte b/src/components/Scroller/Embedded/index.svelte
index 1d95b023..6c1d0380 100644
--- a/src/components/Scroller/Embedded/index.svelte
+++ b/src/components/Scroller/Embedded/index.svelte
@@ -1,10 +1,8 @@
 <script lang="ts">
   import type { ContainerWidth, ScrollerStep } from '../../@types/global';
 
-
   type EmbeddedLayout = 'fb' | 'bf';
 
-
   import Background from './Background.svelte';
   import Foreground from './Foreground.svelte';
   interface Props {
@@ -13,7 +11,11 @@
     backgroundWidth?: ContainerWidth;
   }
 
-  let { steps = [], embeddedLayout = 'fb', backgroundWidth = 'fluid' }: Props = $props();
+  let {
+    steps = [],
+    embeddedLayout = 'fb',
+    backgroundWidth = 'fluid',
+  }: Props = $props();
 </script>
 
 {#each steps as step, index}
diff --git a/src/components/Scroller/Foreground.svelte b/src/components/Scroller/Foreground.svelte
index 58068a49..f5e01ede 100644
--- a/src/components/Scroller/Foreground.svelte
+++ b/src/components/Scroller/Foreground.svelte
@@ -19,20 +19,20 @@
       <div class="empty-step-foreground"></div>
       {#if typeof step.altText === 'string'}
         <div class="background-alt-text visually-hidden">
-          <Markdown source="{step.altText}" />
+          <Markdown source={step.altText} />
         </div>
       {/if}
     {:else}
       <div class="step-foreground w-full">
         {#if typeof step.foreground === 'string'}
-          <Markdown source="{step.foreground}" />
+          <Markdown source={step.foreground} />
         {:else}
           <step.foreground {...step.foregroundProps || {}}></step.foreground>
         {/if}
       </div>
       {#if typeof step.altText === 'string'}
         <div class="background-alt-text visually-hidden">
-          <Markdown source="{step.altText}" />
+          <Markdown source={step.altText} />
         </div>
       {/if}
     {/if}
diff --git a/src/components/Scroller/Scroller.stories.svelte b/src/components/Scroller/Scroller.stories.svelte
index e930a4bb..4b43fae8 100644
--- a/src/components/Scroller/Scroller.stories.svelte
+++ b/src/components/Scroller/Scroller.stories.svelte
@@ -79,7 +79,7 @@
   };
 </script>
 
-<Template >
+<Template>
   {#snippet children({ args })}
     <Scroller {...args} />
   {/snippet}
@@ -87,7 +87,7 @@
 
 <Story
   name="Default"
-  args="{{
+  args={{
     steps: [
       {
         background: BasicStep,
@@ -112,14 +112,14 @@
     backgroundWidth: 'fluid',
     embeddedLayout: 'fb',
     embedded: false,
-  }}"
+  }}
 />
 
-<Story name="ArchieML" args="{docBlock}" {...withStoryDocs(archieMLDocs)} />
+<Story name="ArchieML" args={docBlock} {...withStoryDocs(archieMLDocs)} />
 
 <Story
   name="Foreground components"
-  args="{{
+  args={{
     steps: [
       {
         background: BasicStep,
@@ -142,13 +142,13 @@
     backgroundWidth: 'fluid',
     embeddedLayout: 'fb',
     embedded: false,
-  }}"
+  }}
   {...withStoryDocs(interactiveDocs)}
 />
 
 <Story
   name="Ai2svelte"
-  args="{{
+  args={{
     steps: [
       {
         background: AiMap1,
@@ -175,6 +175,6 @@
     backgroundWidth: 'fluid',
     embeddedLayout: 'fb',
     embedded: false,
-  }}"
+  }}
   {...withStoryDocs(ai2svelteDocs)}
 />
diff --git a/src/components/Scroller/Scroller.svelte b/src/components/Scroller/Scroller.svelte
index 67906ce6..a0b4948d 100644
--- a/src/components/Scroller/Scroller.svelte
+++ b/src/components/Scroller/Scroller.svelte
@@ -123,13 +123,13 @@
       <div
         slot="background"
         class="background min-h-screen relative p-0 flex justify-center"
-        class:right="{foregroundPosition === 'left opposite'}"
-        class:left="{foregroundPosition === 'right opposite'}"
+        class:right={foregroundPosition === 'left opposite'}
+        class:left={foregroundPosition === 'right opposite'}
         aria-hidden="true"
       >
         <div class="scroller-graphic-well w-full">
           <Block
-            width="{backgroundWidth}"
+            width={backgroundWidth}
             class="background-container step-{index +
               1} my-0 min-h-screen flex justify-center items-center relative"
           >
diff --git a/src/components/Scroller/stories/components/ai2svelte/ai-scroller-1.svelte b/src/components/Scroller/stories/components/ai2svelte/ai-scroller-1.svelte
index 37392f3c..d860564d 100644
--- a/src/components/Scroller/stories/components/ai2svelte/ai-scroller-1.svelte
+++ b/src/components/Scroller/stories/components/ai2svelte/ai-scroller-1.svelte
@@ -15,7 +15,7 @@
 
 <!-- Generated by ai2html v0.100.0 - 2021-09-30 14:21 -->
 
-<div id="g-step-1-box" bind:clientWidth="{width}">
+<div id="g-step-1-box" bind:clientWidth={width}>
   <!-- Artboard: XL -->
   {#if width && width >= 1200}
     <div id="g-step-1-xl" class="g-artboard" style="">
diff --git a/src/components/Scroller/stories/components/ai2svelte/ai-scroller-2.svelte b/src/components/Scroller/stories/components/ai2svelte/ai-scroller-2.svelte
index a56006a2..021c14ec 100644
--- a/src/components/Scroller/stories/components/ai2svelte/ai-scroller-2.svelte
+++ b/src/components/Scroller/stories/components/ai2svelte/ai-scroller-2.svelte
@@ -15,7 +15,7 @@
 
 <!-- Generated by ai2html v0.100.0 - 2021-09-30 14:20 -->
 
-<div id="g-step-2-box" bind:clientWidth="{width}">
+<div id="g-step-2-box" bind:clientWidth={width}>
   <!-- Artboard: XL -->
   {#if width && width >= 1200}
     <div id="g-step-2-xl" class="g-artboard" style="">
diff --git a/src/components/Scroller/stories/components/ai2svelte/ai-scroller-3.svelte b/src/components/Scroller/stories/components/ai2svelte/ai-scroller-3.svelte
index 75c3b217..bab2159e 100644
--- a/src/components/Scroller/stories/components/ai2svelte/ai-scroller-3.svelte
+++ b/src/components/Scroller/stories/components/ai2svelte/ai-scroller-3.svelte
@@ -15,7 +15,7 @@
 
 <!-- Generated by ai2html v0.100.0 - 2021-09-30 14:28 -->
 
-<div id="g-step-3-box" bind:clientWidth="{width}">
+<div id="g-step-3-box" bind:clientWidth={width}>
   <!-- Artboard: XL -->
   {#if width && width >= 1200}
     <div id="g-step-3-xl" class="g-artboard" style="">
diff --git a/src/components/Scroller/stories/components/basic/Step.svelte b/src/components/Scroller/stories/components/basic/Step.svelte
index 05b95243..d914ec8a 100644
--- a/src/components/Scroller/stories/components/basic/Step.svelte
+++ b/src/components/Scroller/stories/components/basic/Step.svelte
@@ -6,7 +6,7 @@
   let { colour = 'lightblue' }: Props = $props();
 </script>
 
-<div class="step" style="{`background: ${colour};`}"></div>
+<div class="step" style={`background: ${colour};`}></div>
 
 <style lang="scss">
   .step {
diff --git a/src/components/SearchInput/SearchInput.stories.svelte b/src/components/SearchInput/SearchInput.stories.svelte
index 55fbdf5a..e0399fd5 100644
--- a/src/components/SearchInput/SearchInput.stories.svelte
+++ b/src/components/SearchInput/SearchInput.stories.svelte
@@ -17,10 +17,10 @@
   import { Template, Story } from '@storybook/addon-svelte-csf';
 </script>
 
-<Template >
+<Template>
   {#snippet children({ args })}
     <SearchInput {...args} />
   {/snippet}
 </Template>
 
-<Story name="Default" args="{{}}" />
+<Story name="Default" args={{}} />
diff --git a/src/components/SearchInput/SearchInput.svelte b/src/components/SearchInput/SearchInput.svelte
index ad908bb3..5e0e49ca 100644
--- a/src/components/SearchInput/SearchInput.svelte
+++ b/src/components/SearchInput/SearchInput.svelte
@@ -4,12 +4,11 @@
   import MagnifyingGlass from './MagnifyingGlass.svelte';
   import X from './X.svelte';
 
-  
   interface Props {
     /**
-   * The placeholder text that appears in the search box.
-   * @type {string}
-   */
+     * The placeholder text that appears in the search box.
+     * @type {string}
+     */
     searchPlaceholder?: string;
   }
 
@@ -39,7 +38,7 @@
     id="search--input"
     class="search--input body-caption pl-8"
     type="text"
-    placeholder="{searchPlaceholder}"
+    placeholder={searchPlaceholder}
     oninput={input}
     bind:value
   />
@@ -47,7 +46,7 @@
     class="search--x absolute"
     role="button"
     tabindex="0"
-    class:invisible="{!active}"
+    class:invisible={!active}
     onclick={clear}
     onkeyup={clear}
   >
diff --git a/src/components/SimpleTimeline/SimpleTimeline.mdx b/src/components/SimpleTimeline/SimpleTimeline.mdx
new file mode 100644
index 00000000..205bf945
--- /dev/null
+++ b/src/components/SimpleTimeline/SimpleTimeline.mdx
@@ -0,0 +1,119 @@
+import { Meta, Canvas } from '@storybook/blocks';
+
+import * as SimpleTimelineStories from './SimpleTimeline.stories.svelte';
+
+<Meta of={SimpleTimelineStories} />
+
+# SimpleTimeline
+
+The `SimpleTimeline` component creates a basic timeline with dates, titles and descriptions of events.
+
+```svelte
+<script>
+  import { SimpleTimeline } from '@reuters-graphics/graphics-components';
+
+  const dates = [
+    {
+      date: 'May 18',
+      events: [
+        {
+          title: 'A title for the event',
+          titleLink: 'https://...', // optional
+          context: 'Lorem ipsum...', // optional
+        },
+        // More events...
+      ],
+    },
+    // More dates...
+  ];
+</script>
+
+<SimpleTimeline {dates} />
+```
+
+<Canvas of={SimpleTimelineStories.Demo} />
+
+## Using with ArchieML docs
+
+With the graphics kit, you'll likely get your text value from an ArchieML doc.
+
+```yaml
+# Archie ML doc
+
+[timeline]
+
+# date object with events
+date: May 18
+[.events]
+title: Mariupol defenders surrender to Russia but their fate is uncertain
+context:  More than 250 Ukrainian fighters surrendered to Russian forces at the Azovstal steelworks in Mariupol after weeks of desperate resistance, bringing an end to the most devastating siege of Russia's war in Ukraine and allowing President Vladimir Putin to claim a rare victory in his faltering campaign.
+titleLink: https://www.reuters.com/world/europe/ukrainian-troops-evacuate-mariupol-ceding-control-russia-2022-05-17/
+
+# More events...
+[]
+
+date: May 10
+[.events]
+title: U.S. House passes $40 bln bill to bolster Ukraine against Russian invasion
+context:  The U.S. House of Representatives approved more than $40 billion more aid for Ukraine on Tuesday, as Congress races to keep military aid flowing and boost the government in Kyiv as it grapples with the Russian invasion.
+titleLink: https://www.reuters.com/world/us-house-vote-40-billion-ukraine-aid-package-tuesday-pelosi-2022-05-10/
+[]
+
+# More dates and events...
+[]
+```
+
+... which you'll pass to the `SimpleTimeline` component.
+
+```svelte
+<!-- Graphics Kit -->
+<script>
+  import { SimpleTimeline } from '@reuters-graphics/graphics-components';
+  import content from '$locales/en/content.json';
+</script>
+
+<EndNotes SimpleTimeline={content.timeline} />
+```
+
+<Canvas of={SimpleTimelineStories.Demo} />
+
+# Multiple events
+
+You can add multiple events to a single date by adding objects to the `events` array.
+
+```svelte
+<script>
+  import { SimpleTimeline } from '@reuters-graphics/graphics-components';
+
+  const dates = [
+    {
+      date: 'Feb. 25',
+      // Multiple events for this date
+      events: [
+        {
+          title: 'NATO deploys more troops',
+          context:
+            'NATO leaders said on Friday they were deploying more troops to eastern Europe after Russia invaded Ukraine, saying that Moscow had lied about its intentions.',
+        },
+        {
+          title: 'Invasion continues',
+          context:
+            'Missiles pounded the Ukrainian capital as Russian forces pressed their advance and Ukrainian President Volodymyr Zelenskiy pleaded with the international community to do more, saying sanctions announced so far were not enough.\n\nRussian forces battered Ukrainian cities with artillery and cruise missiles but a defiant Zelenskiy said the capital Kyiv remained in Ukrainian hands.',
+        },
+      ],
+    },
+    {
+      date: 'Feb. 24',
+      events: [
+        {
+          title: 'Russia invades Ukraine',
+        },
+      ],
+    },
+  ];
+</script>
+
+<SimpleTimeline {dates} />
+```
+
+<Canvas of={SimpleTimelineStories.MultipleEvents} />
diff --git a/src/components/SimpleTimeline/SimpleTimeline.stories.svelte b/src/components/SimpleTimeline/SimpleTimeline.stories.svelte
index 94510714..bcf8d850 100644
--- a/src/components/SimpleTimeline/SimpleTimeline.stories.svelte
+++ b/src/components/SimpleTimeline/SimpleTimeline.stories.svelte
@@ -1,25 +1,18 @@
 <script module lang="ts">
-  // @ts-ignore raw
-  import componentDocs from './stories/docs/component.md?raw';
-
+  import { defineMeta } from '@storybook/addon-svelte-csf';
   import SimpleTimeline from './SimpleTimeline.svelte';
 
-  import { withComponentDocs } from '$lib/docs/utils/withParams.js';
-
-  export const meta = {
+  const { Story } = defineMeta({
     title: 'Components/Text elements/SimpleTimeline',
     component: SimpleTimeline,
-    ...withComponentDocs(componentDocs),
     argTypes: {
       symbolColour: { control: 'color' },
       dateColour: { control: 'color' },
     },
-  };
+  });
 </script>
 
-<script>
-  import { Template, Story } from '@storybook/addon-svelte-csf';
-
+<script lang="ts">
   const dates = [
     {
       date: 'May 18',
@@ -56,20 +49,9 @@
         },
       ],
     },
-    {
-      date: 'Feb. 27',
-      events: [
-        {
-          title: 'Russians push into Kharkiv',
-          titleLink:
-            'https://www.reuters.com/world/europe/western-allies-expel-key-russian-banks-global-system-ukraine-fights-2022-02-27/',
-        },
-        {
-          title:
-            'Human rights groups and Ukrainian ambassador accuse Russia of using cluster and vacuum bombs',
-        },
-      ],
-    },
+  ];
+
+  const datesMultipleEvents = [
     {
       date: 'Feb. 25',
       events: [
@@ -96,15 +78,18 @@
   ];
 </script>
 
-<Template >
-  {#snippet children({ args })}
-    <SimpleTimeline {...args} />
-  {/snippet}
-</Template>
+<Story
+  name="Demo"
+  args={{
+    dates,
+  }}
+/>
 
 <Story
-  name="Default"
-  args="{{
-    dates,
-  }}"
+  name="Multiple events"
+  exportName="MultipleEvents"
+  tags={['!autodocs', '!dev']}
+  args={{
+    dates: datesMultipleEvents,
+  }}
 />
diff --git a/src/components/SimpleTimeline/SimpleTimeline.svelte b/src/components/SimpleTimeline/SimpleTimeline.svelte
index beed4001..852eb2f9 100644
--- a/src/components/SimpleTimeline/SimpleTimeline.svelte
+++ b/src/components/SimpleTimeline/SimpleTimeline.svelte
@@ -1,6 +1,10 @@
-<!-- @migration-task Error while migrating Svelte code: Cannot set properties of undefined (setting 'next') -->
 <!-- @component `SimpleTimeline` [Read the docs.](https://reuters-graphics.github.io/graphics-components/?path=/docs/components-text-elements-simpletimeline--docs) -->
 <script lang="ts">
+  import Fa from 'svelte-fa/src/fa.svelte';
+  import { faLink } from '@fortawesome/free-solid-svg-icons';
+  import Block from '../Block/Block.svelte';
+  import Markdown from '../Markdown/Markdown.svelte';
+
   interface Event {
     title: string;
     titleLink?: string;
@@ -10,37 +14,37 @@
     date: string;
     events: Event[];
   }
-  /**
-   * An array of dates with events.
-   * @required
-   */
-  export let dates: EventDate[];
-  /**
-   * Set a colour for the timeline bullet symbols and line.
-   * @type {string}
-   */
-  export let symbolColour: string = 'var(--theme-colour-brand-rules)';
-  /**
-   * Set a colour for the date headings in the timeline.
-   * @type {string}
-   */
-  export let dateColour: string = 'var(--theme-colour-accent, red)';
-  /**
-   * Set a class to target with SCSS.
-   * @type {string}
-   */
-  let cls: string = '';
-  export { cls as class };
-  /**
-   * Set an ID to target with SCSS.
-   * @type {string}
-   */
-  export let id: string = '';
 
-  import Block from '../Block/Block.svelte';
-  import Fa from 'svelte-fa/src/fa.svelte';
-  import { faLink } from '@fortawesome/free-solid-svg-icons';
-  import Markdown from '../Markdown/Markdown.svelte';
+  interface Props {
+    /**
+     * An array of dates with events.
+     */
+    dates: EventDate[];
+    /**
+     * Set a colour for the timeline bullet symbols and line.
+     */
+    symbolColour?: string;
+    /**
+     * Set a colour for the date headings in the timeline.
+     */
+    dateColour?: string;
+    /**
+     * Set a class to target with SCSS.
+     */
+    class?: string;
+    /**
+     * Set an ID to target with SCSS.
+     */
+    id?: string;
+  }
+
+  let {
+    dates,
+    symbolColour = 'var(--theme-colour-brand-rules)',
+    dateColour = 'var(--theme-colour-accent, red)',
+    class: cls = '',
+    id = '',
+  }: Props = $props();
 </script>
 
 <Block width="normal" {id} class="simple-timeline-container fmy-6 {cls}">
@@ -52,24 +56,24 @@
             cx="10"
             cy="12"
             r="5"
-            stroke="{symbolColour}"
+            stroke={symbolColour}
             stroke-width="2"
             fill="transparent"
           ></circle>
         </svg>
         <div
           class="timeline-date font-note text-xs uppercase font-black tracking-wide fmb-0"
-          style:color="{dateColour}"
+          style:color={dateColour}
         >
           {date.date}
         </div>
         {#each date.events as event}
           <div class="event pb-2">
             {#if event.titleLink}
-              <a href="{event.titleLink}" target="_blank">
+              <a href={event.titleLink} target="_blank">
                 <div class="title h3">
                   {event.title}
-                  <span class="text-sm"><Fa fw icon="{faLink}" /></span>
+                  <span class="text-sm"><Fa fw icon={faLink} /></span>
                 </div>
               </a>
             {:else}
@@ -78,7 +82,7 @@
               </div>
             {/if}
             {#if event.context}
-              <Markdown source="{event.context}" />
+              <Markdown source={event.context} />
             {/if}
           </div>
         {/each}
@@ -88,13 +92,13 @@
 </Block>
 
 <style lang="scss">
-  @use '../../scss/mixins' as *;
+  @use '../../scss/mixins' as mixins;
   .timeline {
     .date {
       border-left: 1px solid var(--symbol-colour);
       &:last-child {
-        border-left: 1px solid $theme-colour-background;
-        @include fpb-0;
+        border-left: 1px solid mixins.$theme-colour-background;
+        @include mixins.fpb-0;
       }
     }
     svg {
@@ -102,9 +106,9 @@
       left: -10px;
     }
     div.title {
-      @include fmt-2;
-      @include fmb-1;
-      @include font-medium;
+      @include mixins.fmt-2;
+      @include mixins.fmb-1;
+      @include mixins.font-medium;
     }
 
     div.event {
@@ -123,8 +127,8 @@
         }
       }
       :global(p) {
-        @include body-note;
-        @include font-light;
+        @include mixins.body-note;
+        @include mixins.font-light;
       }
     }
   }
diff --git a/src/components/SimpleTimeline/stories/docs/component.md b/src/components/SimpleTimeline/stories/docs/component.md
deleted file mode 100644
index 74a12385..00000000
--- a/src/components/SimpleTimeline/stories/docs/component.md
+++ /dev/null
@@ -1,24 +0,0 @@
-A simple, clean text timeline.
-
-```svelte
-<script>
-  import { SimpleTimeline } from '@reuters-graphics/graphics-components';
-
-  const dates = [
-    {
-      date: 'May 18',
-      events: [
-        {
-          title: 'A title for the event',
-          titleLink: 'https://...', // optional
-          context: 'Lorem ipsum...', // optional
-        },
-        // More events...
-      ],
-    },
-    // More dates...
-  ];
-</script>
-
-<SimpleTimeline dates="{dates}" />
-```
diff --git a/src/components/SiteFooter/CompanyLinks.svelte b/src/components/SiteFooter/CompanyLinks.svelte
index cd706764..239a704d 100644
--- a/src/components/SiteFooter/CompanyLinks.svelte
+++ b/src/components/SiteFooter/CompanyLinks.svelte
@@ -31,7 +31,7 @@
             {#each links.social_links as link}
               {@const SvelteComponent = symbols[link.type]}
               <li class="social-links symbol">
-                <a href="{normalizeUrl(link.url)}">
+                <a href={normalizeUrl(link.url)}>
                   <div class="button">
                     <div class="social">
                       <SvelteComponent />
diff --git a/src/components/SiteFooter/LegalLinks.svelte b/src/components/SiteFooter/LegalLinks.svelte
index e563ed1a..4e1f5a26 100644
--- a/src/components/SiteFooter/LegalLinks.svelte
+++ b/src/components/SiteFooter/LegalLinks.svelte
@@ -11,7 +11,7 @@
         <ul class="link-group">
           {#each links.ad_links as link}
             <li>
-              <a href="{normalizeUrl(link.url)}">
+              <a href={normalizeUrl(link.url)}>
                 {link.text}
               </a>
             </li>
@@ -20,7 +20,7 @@
       </section>
       <p class="disclaimer">
         All quotes delayed a minimum of 15 minutes. <a
-          href="{normalizeUrl(links.disclaimer_link)}"
+          href={normalizeUrl(links.disclaimer_link)}
           >See here for a complete list of exchanges and delays</a
         >.
       </p>
@@ -28,7 +28,7 @@
         <ul class="link-group">
           {#each links.misc_links.filter((d) => !d.self) as link}
             <li>
-              <a href="{normalizeUrl(link.url)}">
+              <a href={normalizeUrl(link.url)}>
                 {link.text}
               </a>
             </li>
@@ -37,7 +37,7 @@
       </section>
       <p class="copyright">
         © {links.copyright_year} Reuters.
-        <a href="{normalizeUrl(links.copyright_link)}">All rights reserved</a>
+        <a href={normalizeUrl(links.copyright_link)}>All rights reserved</a>
       </p>
     </div>
   </section>
diff --git a/src/components/SiteFooter/QuickLinks.svelte b/src/components/SiteFooter/QuickLinks.svelte
index a28f00d1..fbb07608 100644
--- a/src/components/SiteFooter/QuickLinks.svelte
+++ b/src/components/SiteFooter/QuickLinks.svelte
@@ -17,7 +17,7 @@
   const mobileBreakpoint = 745;
 </script>
 
-<svelte:window bind:innerWidth="{windowWidth}" />
+<svelte:window bind:innerWidth={windowWidth} />
 
 {#if links.latest_links}
   <section class="quick-links">
@@ -30,7 +30,7 @@
             <ul>
               {#each links.latest_links as link}
                 <li>
-                  <a href="{normalizeUrl(link.url)}">{link.text}</a>
+                  <a href={normalizeUrl(link.url)}>{link.text}</a>
                 </li>
               {/each}
             </ul>
@@ -44,7 +44,7 @@
                   <div class="symbol">
                     <SvelteComponent />
                   </div>
-                  <a href="{normalizeUrl(link.url)}">
+                  <a href={normalizeUrl(link.url)}>
                     {link.text}
                   </a>
                 </li>
@@ -58,7 +58,7 @@
           <ul>
             {#each links.latest_links as link}
               <li>
-                <a href="{normalizeUrl(link.url)}">{link.text}</a>
+                <a href={normalizeUrl(link.url)}>{link.text}</a>
               </li>
             {/each}
           </ul>
@@ -70,7 +70,7 @@
         <ul>
           {#each links.browse_links as link}
             <li>
-              <a href="{normalizeUrl(link.url)}">{link.text}</a>
+              <a href={normalizeUrl(link.url)}>{link.text}</a>
             </li>
           {/each}
         </ul>
@@ -85,7 +85,7 @@
                 <div class="symbol">
                   <SvelteComponent_1 />
                 </div>
-                <a href="{normalizeUrl(link.url)}">
+                <a href={normalizeUrl(link.url)}>
                   {link.text}
                 </a>
               </li>
@@ -99,7 +99,7 @@
           <ul>
             {#each links.about_links as link}
               <li>
-                <a href="{normalizeUrl(link.url)}">{link.text}</a>
+                <a href={normalizeUrl(link.url)}>{link.text}</a>
               </li>
             {/each}
           </ul>
@@ -109,7 +109,7 @@
           <ul>
             {#each links.stay_informed_links as link}
               <li>
-                <a href="{normalizeUrl(link.url)}">{link.text}</a>
+                <a href={normalizeUrl(link.url)}>{link.text}</a>
               </li>
             {/each}
           </ul>
diff --git a/src/components/SiteFooter/SiteFooter.stories.svelte b/src/components/SiteFooter/SiteFooter.stories.svelte
index c3c0dd63..a4be2141 100644
--- a/src/components/SiteFooter/SiteFooter.stories.svelte
+++ b/src/components/SiteFooter/SiteFooter.stories.svelte
@@ -26,7 +26,7 @@
   import Theme from '../Theme/Theme.svelte';
 </script>
 
-<Template >
+<Template>
   {#snippet children({ args })}
     <div>
       <SiteFooter {...args} />
@@ -46,7 +46,7 @@
 
 <Story
   name="Remove referrals"
-  args="{{ includeReferrals: false }}"
+  args={{ includeReferrals: false }}
   {...withStoryDocs(removeReferralsDocs)}
 />
 
diff --git a/src/components/SiteFooter/SiteFooter.svelte b/src/components/SiteFooter/SiteFooter.svelte
index 941411df..80f6a2de 100644
--- a/src/components/SiteFooter/SiteFooter.svelte
+++ b/src/components/SiteFooter/SiteFooter.svelte
@@ -9,11 +9,10 @@
   import starterData from './data.json';
   import { onMount } from 'svelte';
 
-  
   interface Props {
     /**
-   * Set to `false` to remove graphics referrals
-   */
+     * Set to `false` to remove graphics referrals
+     */
     includeReferrals?: boolean;
   }
 
@@ -45,12 +44,12 @@
 
 <footer
   class="my-0"
-  style="{`
+  style={`
     --nav-background: var(--theme-colour-background, #fff);
     --nav-primary: var(--theme-colour-text-primary, #404040);
     --nav-rules: var(--theme-colour-brand-rules, #d0d0d0);
     --theme-font-family-sans-serif: Knowledge, sans-serif;
-  `}"
+  `}
 >
   <div>
     {#if includeReferrals}
@@ -62,9 +61,9 @@
         />
       </PaddingReset>
     {/if}
-    <QuickLinks links="{data[0]}" />
-    <CompanyLinks links="{data[0]}" />
-    <LegalLinks links="{data[0]}" />
+    <QuickLinks links={data[0]} />
+    <CompanyLinks links={data[0]} />
+    <LegalLinks links={data[0]} />
   </div>
 </footer>
 
diff --git a/src/components/SiteHeader/MobileMenu/index.svelte b/src/components/SiteHeader/MobileMenu/index.svelte
index 10441272..9c6a340e 100644
--- a/src/components/SiteHeader/MobileMenu/index.svelte
+++ b/src/components/SiteHeader/MobileMenu/index.svelte
@@ -9,20 +9,24 @@
     releaseMobileMenu?: any;
   }
 
-  let { data = [], isMobileMenuOpen = false, releaseMobileMenu = () => {} }: Props = $props();
+  let {
+    data = [],
+    isMobileMenuOpen = false,
+    releaseMobileMenu = () => {},
+  }: Props = $props();
 </script>
 
 {#if isMobileMenuOpen}
   <div
     class="overlay"
     aria-modal="true"
-    style="{`
+    style={`
       --nav-background: var(--theme-colour-background, #fff);
       --nav-primary: var(--theme-colour-text-primary, #404040);
       --nav-rules: var(--theme-colour-brand-rules, #d0d0d0);
       --nav-accent: var(--theme-colour-brand-logo, #fa6400);
       --nav-shadow: 0 1px 4px 2px var(--theme-colour-brand-shadow, rgba(64,64,64,.08));
-    `}"
+    `}
   >
     <header class="header">
       <div class="logo">
@@ -39,14 +43,14 @@
     </header>
     {#each data.sections as section}
       <section class="section">
-        <a class="section-link" href="{normalizeUrl(section.url)}"
+        <a class="section-link" href={normalizeUrl(section.url)}
           >{section.name}</a
         >
         {#if section.children}
           <ul class="subsections">
             {#each section.children as sub}
               <li>
-                <a class="subsection-link" href="{normalizeUrl(sub.url)}">
+                <a class="subsection-link" href={normalizeUrl(sub.url)}>
                   {sub.name}
                 </a>
               </li>
diff --git a/src/components/SiteHeader/NavBar/DownArrow.svelte b/src/components/SiteHeader/NavBar/DownArrow.svelte
index 4258f0de..6f30dc51 100644
--- a/src/components/SiteHeader/NavBar/DownArrow.svelte
+++ b/src/components/SiteHeader/NavBar/DownArrow.svelte
@@ -8,7 +8,7 @@
 
 <svg
   class="arrow"
-  class:rotated="{rotate}"
+  class:rotated={rotate}
   focusable="false"
   aria-hidden="true"
   xmlns="http://www.w3.org/2000/svg"
diff --git a/src/components/SiteHeader/NavBar/NavDropdown/MoreDropdown.svelte b/src/components/SiteHeader/NavBar/NavDropdown/MoreDropdown.svelte
index 50fd90f8..b7c3ceca 100644
--- a/src/components/SiteHeader/NavBar/NavDropdown/MoreDropdown.svelte
+++ b/src/components/SiteHeader/NavBar/NavDropdown/MoreDropdown.svelte
@@ -11,16 +11,16 @@
       {#each sections as section}
         <section
           class="more-section-group"
-          class:has-children="{section.children}"
+          class:has-children={section.children}
         >
-          <a href="{normalizeUrl(section.url)}" class="section-link">
+          <a href={normalizeUrl(section.url)} class="section-link">
             {section.name}
           </a>
           {#if section.children}
             <ul class="subsections">
               {#each section.children as sub}
                 <li>
-                  <a class="subsection-link" href="{normalizeUrl(sub.url)}"
+                  <a class="subsection-link" href={normalizeUrl(sub.url)}
                     >{sub.name}</a
                   >
                 </li>
diff --git a/src/components/SiteHeader/NavBar/NavDropdown/SectionDropdown.svelte b/src/components/SiteHeader/NavBar/NavDropdown/SectionDropdown.svelte
index 803ddb46..079233d4 100644
--- a/src/components/SiteHeader/NavBar/NavDropdown/SectionDropdown.svelte
+++ b/src/components/SiteHeader/NavBar/NavDropdown/SectionDropdown.svelte
@@ -5,14 +5,15 @@
 
   let { section = {}, headingText } = $props();
 
-  let splitCount =
-    $derived(section.children && section.children.length > 7 ?
+  let splitCount = $derived(
+    section.children && section.children.length > 7 ?
       Math.ceil(section.children.length / 2)
-    : 0);
+    : 0
+  );
 </script>
 
 <NavDropdown {headingText}>
-  <a href="{normalizeUrl(section.url)}">
+  <a href={normalizeUrl(section.url)}>
     <span class="heading">
       Browse {section.name}
     </span>
@@ -22,7 +23,7 @@
       <ul class="sections-group">
         {#each section.children.slice(0, splitCount) as sub}
           <li>
-            <a class="subsection-link" href="{normalizeUrl(sub.url)}">
+            <a class="subsection-link" href={normalizeUrl(sub.url)}>
               {sub.name}
             </a>
           </li>
@@ -32,7 +33,7 @@
     <ul class="sections-group">
       {#each section.children.slice(splitCount) as sub}
         <li>
-          <a class="subsection-link" href="{normalizeUrl(sub.url)}">
+          <a class="subsection-link" href={normalizeUrl(sub.url)}>
             {sub.name}
           </a>
         </li>
diff --git a/src/components/SiteHeader/NavBar/NavDropdown/StoryCard/index.svelte b/src/components/SiteHeader/NavBar/NavDropdown/StoryCard/index.svelte
index 839b5a4b..7c0d8e3e 100644
--- a/src/components/SiteHeader/NavBar/NavDropdown/StoryCard/index.svelte
+++ b/src/components/SiteHeader/NavBar/NavDropdown/StoryCard/index.svelte
@@ -8,16 +8,16 @@
 </script>
 
 <div class="story-card">
-  <a href="{normalizeUrl(story.canonical_url)}">
-    <div class="story-text" class:has-thumbnail="{thumbnail}">
+  <a href={normalizeUrl(story.canonical_url)}>
+    <div class="story-text" class:has-thumbnail={thumbnail}>
       <span>{story.title}</span>
-      <time datetime="{story.display_time}">{getTime(story.display_time)}</time>
+      <time datetime={story.display_time}>{getTime(story.display_time)}</time>
     </div>
     {#if thumbnail}
       <div class="thumbnail">
         <img
-          src="{thumbnail.renditions.square['120w']}"
-          alt="{thumbnail.alt_text}"
+          src={thumbnail.renditions.square['120w']}
+          alt={thumbnail.alt_text}
         />
       </div>
     {/if}
diff --git a/src/components/SiteHeader/NavBar/index.svelte b/src/components/SiteHeader/NavBar/index.svelte
index a5df1353..7dff8f02 100644
--- a/src/components/SiteHeader/NavBar/index.svelte
+++ b/src/components/SiteHeader/NavBar/index.svelte
@@ -24,7 +24,7 @@
   let hiddenSections = $derived(sections.slice(displayCount));
 </script>
 
-<svelte:window bind:innerWidth="{windowWidth}" />
+<svelte:window bind:innerWidth={windowWidth} />
 
 <div class="nav-bar">
   <nav aria-label="Main navigation">
@@ -59,26 +59,26 @@
           >
             <div
               class="nav-button link"
-              class:open="{section.id === $activeSection}"
+              class:open={section.id === $activeSection}
             >
-              <a href="{normalizeUrl(section.url)}">
+              <a href={normalizeUrl(section.url)}>
                 {section.name}
               </a>
               <button class="button">
-                <DownArrow rotate="{section.id === $activeSection}" />
+                <DownArrow rotate={section.id === $activeSection} />
               </button>
             </div>
             {#if $activeSection === section.id}
               <SectionDropdown
                 {section}
-                headingText="{`Latest in ${section.name}`}"
+                headingText={`Latest in ${section.name}`}
               />
             {/if}
           </li>
         {:else}
           <li class="nav-item category link">
             <div class="nav-button link">
-              <a href="{normalizeUrl(section.url)}">
+              <a href={normalizeUrl(section.url)}>
                 {section.name}
               </a>
             </div>
@@ -109,14 +109,14 @@
       >
         <div
           class="nav-button more link"
-          class:open="{$activeSection === 'more'}"
+          class:open={$activeSection === 'more'}
         >
           <button class="button">
-            <span>More <DownArrow rotate="{$activeSection === 'more'}" /></span>
+            <span>More <DownArrow rotate={$activeSection === 'more'} /></span>
           </button>
         </div>
         {#if $activeSection === 'more'}
-          <MoreDropdown sections="{hiddenSections}" />
+          <MoreDropdown sections={hiddenSections} />
         {/if}
       </li>
     </ul>
diff --git a/src/components/SiteHeader/SiteHeader.stories.svelte b/src/components/SiteHeader/SiteHeader.stories.svelte
index 44560247..979f5ab5 100644
--- a/src/components/SiteHeader/SiteHeader.stories.svelte
+++ b/src/components/SiteHeader/SiteHeader.stories.svelte
@@ -27,7 +27,7 @@
   import Theme from '../Theme/Theme.svelte';
 </script>
 
-<Template >
+<Template>
   {#snippet children({ args })}
     <div>
       <SiteHeader {...args} />
diff --git a/src/components/SiteHeader/SiteHeader.svelte b/src/components/SiteHeader/SiteHeader.svelte
index e00e973f..5a0072a8 100644
--- a/src/components/SiteHeader/SiteHeader.svelte
+++ b/src/components/SiteHeader/SiteHeader.svelte
@@ -40,14 +40,14 @@
 </script>
 
 <header
-  style="{`
+  style={`
     --nav-background: var(--theme-colour-background, #fff);
     --nav-primary: var(--theme-colour-text-primary, #404040);
     --nav-rules: var(--theme-colour-brand-rules, #d0d0d0);
     --nav-accent: var(--theme-colour-brand-logo, #fa6400);
     --nav-shadow: 0 1px 4px 2px var(--theme-colour-brand-shadow, rgb(255 255 255 / 10%));
     --theme-font-family-sans-serif: Knowledge, sans-serif;
-  `}"
+  `}
 >
   <a href="#main-content" class="skip-link"> Skip to main content </a>
   <div class="nav-container show-nav">
@@ -76,7 +76,7 @@
                 class="menu-button"
                 aria-label="Menu"
                 aria-haspopup="true"
-                aria-expanded="{isMobileMenuOpen}"
+                aria-expanded={isMobileMenuOpen}
                 onclick={() => {
                   isMobileMenuOpen = !isMobileMenuOpen;
                 }}
@@ -95,10 +95,10 @@
 
 <MobileMenu
   {isMobileMenuOpen}
-  releaseMobileMenu="{() => {
+  releaseMobileMenu={() => {
     isMobileMenuOpen = false;
-  }}"
-  data="{data[0]}"
+  }}
+  data={data[0]}
 />
 
 <style lang="scss">
diff --git a/src/components/SiteHeadline/SiteHeadline.stories.svelte b/src/components/SiteHeadline/SiteHeadline.stories.svelte
index 6a4faf92..42921188 100644
--- a/src/components/SiteHeadline/SiteHeadline.stories.svelte
+++ b/src/components/SiteHeadline/SiteHeadline.stories.svelte
@@ -35,7 +35,7 @@
   };
 </script>
 
-<Template >
+<Template>
   {#snippet children({ args })}
     <SiteHeadline {...args} />
   {/snippet}
@@ -43,7 +43,7 @@
 
 <Story
   name="Default"
-  args="{{
+  args={{
     section: 'Graphics',
     sectionUrl: 'https://graphics.reuters.com',
     hed: 'Ukraine makes surprising gains in counteroffensive',
@@ -55,15 +55,15 @@
     ],
     publishTime: new Date('2021-09-12').toISOString(),
     updateTime: new Date('2021-09-12T13:57:00').toISOString(),
-  }}"
+  }}
 />
 
 <Story name="ArchieML" {...withStoryDocs(archieML)}>
   <SiteHeadline
-    hed="{content.Hed}"
-    section="{content.Section}"
-    sectionUrl="{content.SectionUrl}"
-    authors="{content.Authors.split(',')}"
-    publishTime="{content.Published}"
+    hed={content.Hed}
+    section={content.Section}
+    sectionUrl={content.SectionUrl}
+    authors={content.Authors.split(',')}
+    publishTime={content.Published}
   />
 </Story>
diff --git a/src/components/SiteHeadline/SiteHeadline.svelte b/src/components/SiteHeadline/SiteHeadline.svelte
index b1b647a8..81937824 100644
--- a/src/components/SiteHeadline/SiteHeadline.svelte
+++ b/src/components/SiteHeadline/SiteHeadline.svelte
@@ -80,7 +80,7 @@
           class="section-title mb-0 font-subhed text-xs text-secondary font-bold uppercase whitespace-nowrap tracking-wider"
         >
           {#if sectionUrl}
-            <a class="no-underline !text-secondary" href="{sectionUrl}"
+            <a class="no-underline !text-secondary" href={sectionUrl}
               >{section}</a
             >
           {:else}
diff --git a/src/components/Spinner/Spinner.stories.svelte b/src/components/Spinner/Spinner.stories.svelte
index 81b280a8..f92b2a5f 100644
--- a/src/components/Spinner/Spinner.stories.svelte
+++ b/src/components/Spinner/Spinner.stories.svelte
@@ -26,7 +26,7 @@
   import { Template, Story } from '@storybook/addon-svelte-csf';
 </script>
 
-<Template >
+<Template>
   {#snippet children({ args })}
     <Spinner {...args} />
   {/snippet}
diff --git a/src/components/Spinner/Spinner.svelte b/src/components/Spinner/Spinner.svelte
index 54db7079..be6dd41b 100644
--- a/src/components/Spinner/Spinner.svelte
+++ b/src/components/Spinner/Spinner.svelte
@@ -32,7 +32,7 @@
 
 <div
   style:width="100%"
-  style:height="{`${width + containerPadding * 2}px`}"
+  style:height={`${width + containerPadding * 2}px`}
   class="component-container flex items-center justify-center"
 >
   <div
diff --git a/src/components/Table/Pagination.svelte b/src/components/Table/Pagination.svelte
index 115e8467..cabd3c99 100644
--- a/src/components/Table/Pagination.svelte
+++ b/src/components/Table/Pagination.svelte
@@ -3,33 +3,26 @@
   import LeftArrow from './LeftArrow.svelte';
   import RightArrow from './RightArrow.svelte';
 
-  
-
-  
-
-  
-
-  
   interface Props {
     /**
-   * The current page number.
-   * @type {number}
-   */
+     * The current page number.
+     * @type {number}
+     */
     pageNumber?: number;
     /**
-   * The default page size.
-   * @type {number}
-   */
+     * The default page size.
+     * @type {number}
+     */
     pageSize?: number;
     /**
-   * The number of records in the current page.
-   * @type {number}
-   */
+     * The number of records in the current page.
+     * @type {number}
+     */
     pageLength?: number;
     /**
-   * The total number of records in the data set.
-   * @type {number}
-   */
+     * The total number of records in the data set.
+     * @type {number}
+     */
     n?: number;
   }
 
@@ -37,7 +30,7 @@
     pageNumber = $bindable(1),
     pageSize = 25,
     pageLength = null,
-    n = null
+    n = null,
   }: Props = $props();
 
   let minRow = $derived(pageNumber * pageSize - pageSize + 1);
@@ -58,7 +51,7 @@
 </script>
 
 <nav aria-label="pagination" class="pagination fmt-4">
-  <button onclick={goToPreviousPage} disabled="{pageNumber === 1}"
+  <button onclick={goToPreviousPage} disabled={pageNumber === 1}
     ><div class="icon-wrapper">
       <LeftArrow />
       <span class="visually-hidden">Previous page</span>
@@ -71,7 +64,7 @@
   </div>
   <button
     onclick={goToNextPage}
-    disabled="{pageNumber === Math.ceil(n / pageSize)}"
+    disabled={pageNumber === Math.ceil(n / pageSize)}
     ><div class="icon-wrapper">
       <RightArrow />
       <span class="visually-hidden">Next page</span>
diff --git a/src/components/Table/Select.svelte b/src/components/Table/Select.svelte
index 9415be48..43251d41 100644
--- a/src/components/Table/Select.svelte
+++ b/src/components/Table/Select.svelte
@@ -2,19 +2,16 @@
   import { createEventDispatcher } from 'svelte';
   import type { Option } from '../@types/global';
 
-  
-
-  
   interface Props {
     /**
-   * The label that appears above the select input.
-   * @type {string}
-   */
+     * The label that appears above the select input.
+     * @type {string}
+     */
     label?: string;
     /**
-   * The label that appears above the select input.
-   * @type {Array}
-   */
+     * The label that appears above the select input.
+     * @type {Array}
+     */
     options?: Option[];
   }
 
@@ -39,7 +36,7 @@
     oninput={input}
   >
     {#each options as obj}
-      <option value="{obj.value}">{obj.text}</option>
+      <option value={obj.value}>{obj.text}</option>
     {/each}
   </select>
 </div>
diff --git a/src/components/Table/SortArrow.svelte b/src/components/Table/SortArrow.svelte
index cd34c411..7eb22c7d 100644
--- a/src/components/Table/SortArrow.svelte
+++ b/src/components/Table/SortArrow.svelte
@@ -5,13 +5,12 @@
    */
   type SortDirection = 'ascending' | 'descending';
 
-  
   interface Props {
     sortDirection?: SortDirection;
     /**
-   * Whether or not this arrow is currently sorting. It is false by default.
-   * @type {boolean}
-   */
+     * Whether or not this arrow is currently sorting. It is false by default.
+     * @type {boolean}
+     */
     active?: boolean;
   }
 
@@ -27,11 +26,11 @@
   class="avoid-clicks"
 >
   <path
-    class:active="{sortDirection === 'descending' && active}"
+    class:active={sortDirection === 'descending' && active}
     d="M6.76474 20.2244L0.236082 13.4649C-0.0786943 13.139 -0.0786943 12.6104 0.236082 12.2845C0.550521 11.959 1.19794 11.96 1.51305 12.2845L7.33483 12.2845L13 12.2845C13.43 11.8545 14.1195 11.9593 14.4339 12.2849C14.7487 12.6107 14.7487 13.1394 14.4339 13.4653L7.90492 20.2244C7.59015 20.5503 7.07952 20.5503 6.76474 20.2244Z"
   ></path>
   <path
-    class:active="{sortDirection === 'ascending' && active}"
+    class:active={sortDirection === 'ascending' && active}
     d="M7.90518 0.244414L14.4338 7.00385C14.7486 7.32973 14.7486 7.85838 14.4338 8.18427C14.1194 8.50981 13.472 8.50876 13.1569 8.18427L7.33509 8.18427L1.66992 8.18427C1.23992 8.61427 0.550443 8.50946 0.236003 8.18392C-0.0787725 7.85803 -0.0787725 7.32938 0.236003 7.0035L6.765 0.244414C7.07978 -0.0814713 7.5904 -0.0814713 7.90518 0.244414Z"
   ></path>
 </svg>
diff --git a/src/components/Table/Table.stories.svelte b/src/components/Table/Table.stories.svelte
index d7777f23..d27f6859 100644
--- a/src/components/Table/Table.stories.svelte
+++ b/src/components/Table/Table.stories.svelte
@@ -47,7 +47,7 @@
   const currencyFormat = (v: number) => '$' + v.toFixed(1);
 </script>
 
-<Template >
+<Template>
   {#snippet children({ args })}
     <Table {...args} />
   {/snippet}
@@ -55,74 +55,74 @@
 
 <Story
   name="Default"
-  args="{{
+  args={{
     width: 'normal',
     data: homeRuns,
-  }}"
+  }}
 />
 
 <Story
   name="Metadata"
   {...withStoryDocs(metadataDocs)}
-  args="{{
+  args={{
     width: 'normal',
     data: homeRuns,
     title: 'Career home run leaders',
     dek: 'In baseball, a home run (also known as a "dinger" or "tater") occurs when a batter hits the ball over the outfield fence. When a home run is hit, the batter and any runners on base are able to score.',
     notes: 'Note: As of Opening Day 2023',
     source: 'Source: Baseball Reference',
-  }}"
+  }}
 />
 
 <Story
   name="Truncate"
   {...withStoryDocs(truncateDocs)}
-  args="{{
+  args={{
     data: homeRuns,
     truncated: true,
     source: 'Source: Baseball Reference',
-  }}"
+  }}
 />
 
 <Story
   name="Paginate"
   {...withStoryDocs(paginateDocs)}
-  args="{{
+  args={{
     data: pressFreedom,
     title: 'Press Freedom Index',
     paginated: true,
     source: 'Source: Reporters Without Borders',
-  }}"
+  }}
 />
 
 <Story
   name="Search"
   {...withStoryDocs(searchDocs)}
-  args="{{
+  args={{
     data: pressFreedom,
     searchable: true,
     paginated: true,
     title: 'Press Freedom Index',
     source: 'Source: Reporters Without Borders',
-  }}"
+  }}
 />
 
 <Story
   name="Filter"
   {...withStoryDocs(filterDocs)}
-  args="{{
+  args={{
     data: pressFreedom,
     paginated: true,
     filterField: 'Region',
     title: 'Press Freedom Index',
     notes: 'Source: Reporters Without Borders',
-  }}"
+  }}
 />
 
 <Story
   name="Search and filter"
   {...withStoryDocs(bothDocs)}
-  args="{{
+  args={{
     data: pressFreedom,
     searchable: true,
     filterField: 'Region',
@@ -130,13 +130,13 @@
     title: 'Press Freedom Index',
     dek: 'Reporters Without Borders ranks countries based on their level of press freedom using criteria such as the degree of media pluralism and violence against journalists.',
     source: 'Source: Reporters Without Borders',
-  }}"
+  }}
 />
 
 <Story
   name="Sort"
   {...withStoryDocs(sortDocs)}
-  args="{{
+  args={{
     data: pressFreedom,
     sortable: true,
     sortField: 'Score',
@@ -145,13 +145,13 @@
     title: 'Press Freedom Index',
     notes: 'Note: data as of 2018',
     source: 'Source: Reporters Without Borders',
-  }}"
+  }}
 />
 
 <Story
   name="Format"
   {...withStoryDocs(formatDocs)}
-  args="{{
+  args={{
     data: richestWomen,
     title: 'The Richest Women in the World',
     source: 'Source: Forbes',
@@ -159,16 +159,16 @@
     sortField: 'Net worth (in billions)',
     sortDirection: 'descending',
     fieldFormatters: { 'Net worth (in billions)': currencyFormat },
-  }}"
+  }}
 />
 
 <Story
   name="Style"
   {...withStoryDocs(styleDocs)}
-  args="{{
+  args={{
     id: 'custom-table',
     data: richestWomen,
     title: 'The Richest Women in the World',
     source: 'Source: Forbes',
-  }}"
+  }}
 />
diff --git a/src/components/Table/Table.svelte b/src/components/Table/Table.svelte
index efb621e1..1482fde9 100644
--- a/src/components/Table/Table.svelte
+++ b/src/components/Table/Table.svelte
@@ -230,9 +230,9 @@
             {#if filterList}
               <div class="table--header--filter">
                 <Select
-                  label="{filterLabel || filterField}"
-                  options="{filterList}"
-                  on:select="{handleFilterInput}"
+                  label={filterLabel || filterField}
+                  options={filterList}
+                  on:select={handleFilterInput}
                 />
               </div>
             {/if}
@@ -240,7 +240,7 @@
               <div class="table--header--search">
                 <SearchInput
                   bind:searchPlaceholder
-                  on:search="{handleSearchInput}"
+                  on:search={handleSearchInput}
                 />
               </div>
             {/if}
@@ -252,9 +252,7 @@
       <table
         class="w-full"
         class:paginated
-        class:truncated="{truncated &&
-          !showAll &&
-          data.length > truncateLength}"
+        class:truncated={truncated && !showAll && data.length > truncateLength}
       >
         <thead class="table--thead">
           <tr>
@@ -262,22 +260,22 @@
               <th
                 scope="col"
                 class="table--thead--th h4 pl-0 py-2 pr-2"
-                class:sortable="{sortable && sortableFields.includes(field)}"
-                class:sort-ascending="{sortable &&
+                class:sortable={sortable && sortableFields.includes(field)}
+                class:sort-ascending={sortable &&
                   sortField === field &&
-                  sortDirection === 'ascending'}"
-                class:sort-descending="{sortable &&
+                  sortDirection === 'ascending'}
+                class:sort-descending={sortable &&
                   sortField === field &&
-                  sortDirection === 'descending'}"
-                data-field="{field}"
-                on:click="{handleSort}"
+                  sortDirection === 'descending'}
+                data-field={field}
+                on:click={handleSort}
               >
                 {field}
                 {#if sortable && sortableFields.includes(field)}
                   <div class="table--thead--sortarrow fml-1 avoid-clicks">
                     <SortArrow
                       bind:sortDirection
-                      active="{sortField === field}"
+                      active={sortField === field}
                     />
                   </div>
                 {/if}
@@ -287,13 +285,13 @@
         </thead>
         <tbody class="table--tbody">
           {#each currentPageData as item, idx}
-            <tr data-row-index="{idx}">
+            <tr data-row-index={idx}>
               {#each includedFields as field}
                 <td
                   class="body-note pl-0 py-2 pr-2"
-                  data-row-index="{idx}"
-                  data-field="{field}"
-                  data-value="{item[field]}"
+                  data-row-index={idx}
+                  data-field={field}
+                  data-value={item[field]}
                 >
                   {@html formatValue(item, field)}
                 </td>
@@ -302,7 +300,7 @@
           {/each}
           {#if searchable && searchText && currentPageData.length === 0}
             <tr>
-              <td class="no-results" colspan="{includedFields.length}">
+              <td class="no-results" colspan={includedFields.length}>
                 No results found for "{searchText}"
               </td>
             </tr>
@@ -312,7 +310,7 @@
           <tfoot class="table--tfoot">
             {#if notes}
               <tr>
-                <td class="" colspan="{includedFields.length}">
+                <td class="" colspan={includedFields.length}>
                   <div class="fmt-2">
                     {@html notes}
                   </div>
@@ -321,7 +319,7 @@
             {/if}
             {#if source}
               <tr>
-                <td class="" colspan="{includedFields.length}">
+                <td class="" colspan={includedFields.length}>
                   <div class="fmt-1">
                     {@html source}
                   </div>
@@ -337,7 +335,7 @@
         aria-label="Show all button"
         class="show-all flex items-center justify-center fmt-2"
       >
-        <button class="body-caption" on:click="{toggleTruncate}"
+        <button class="body-caption" on:click={toggleTruncate}
           >{#if showAll}Show fewer rows{:else}Show {data.length -
               truncateLength} more rows{/if}</button
         >
@@ -347,8 +345,8 @@
       <Pagination
         bind:pageNumber
         bind:pageSize
-        bind:pageLength="{currentPageData.length}"
-        bind:n="{sortedData.length}"
+        bind:pageLength={currentPageData.length}
+        bind:n={sortedData.length}
       />{/if}
   </article>
 </Block>
diff --git a/src/components/TestForSvelte5/TestForSvelte5.stories.svelte b/src/components/TestForSvelte5/TestForSvelte5.stories.svelte
index 11829e60..c127c6af 100644
--- a/src/components/TestForSvelte5/TestForSvelte5.stories.svelte
+++ b/src/components/TestForSvelte5/TestForSvelte5.stories.svelte
@@ -28,7 +28,7 @@
   import SharkImg from './stories/shark.jpg';
 </script>
 
-<Template >
+<Template>
   {#snippet children({ ...args })}
     <TestForSvelte5 {...args} />
   {/snippet}
@@ -36,9 +36,9 @@
 
 <Story
   name="Default"
-  args="{{
+  args={{
     width: 'normal',
     src: SharkImg,
     altText: "Duh dum! It's a shark!!",
-  }}"
+  }}
 />
diff --git a/src/components/TestForSvelte5/TestForSvelte5.svelte b/src/components/TestForSvelte5/TestForSvelte5.svelte
index 92ed190d..2b73f664 100644
--- a/src/components/TestForSvelte5/TestForSvelte5.svelte
+++ b/src/components/TestForSvelte5/TestForSvelte5.svelte
@@ -36,8 +36,8 @@
 
 <Block {width} {id} class="photo {cls}">
   <div
-    style:background-image="{`url(${src})`}"
-    style:height="{`${height}px`}"
+    style:background-image={`url(${src})`}
+    style:height={`${height}px`}
   ></div>
   <p class="visually-hidden">{altText}</p>
 </Block>
diff --git a/src/components/Theme/Theme.stories.svelte b/src/components/Theme/Theme.stories.svelte
index f1084fcc..987086af 100644
--- a/src/components/Theme/Theme.stories.svelte
+++ b/src/components/Theme/Theme.stories.svelte
@@ -40,7 +40,7 @@
   import Headline from './../Headline/Headline.svelte';
 </script>
 
-<Template >
+<Template>
   {#snippet children({ args })}
     <div class="reset-article">
       <Theme {...args}>
@@ -52,19 +52,19 @@
 
 <Story
   name="Default"
-  args="{{
+  args={{
     theme: themes.light,
     base: 'light',
-  }}"
+  }}
 />
 
 <Story name="Custom theme" {...withStoryDocs(customiseDocs)}>
   <Theme
     base="dark"
-    theme="{{
+    theme={{
       colour: { accent: 'var(--tr-light-orange)' },
       font: { family: { hed: 'FreightText, serif' } },
-    }}"
+    }}
   >
     <ThemedPage />
   </Theme>
@@ -73,15 +73,15 @@
 <Story name="Custom Google font" {...withStoryDocs(customiseFontDocs)}>
   <Theme
     base="light"
-    theme="{{
+    theme={{
       font: { family: { hed: 'Bebas Neue, sans-serif' } },
-    }}"
+    }}
   >
     <div class="gfont">
       <Headline
-        hed="{'Reuters Graphics Interactive'}"
-        dek="{'The beginning of a beautiful page'}"
-        section="{'Global news'}"
+        hed={'Reuters Graphics Interactive'}
+        dek={'The beginning of a beautiful page'}
+        section={'Global news'}
       />
     </div>
   </Theme>
@@ -91,9 +91,9 @@
   <div id="pattern-bg">
     <Theme
       base="dark"
-      theme="{{
+      theme={{
         colour: { background: 'transparent' },
-      }}"
+      }}
     >
       <SiteHeader />
       <ThemedPage />
@@ -102,22 +102,22 @@
 </Story>
 
 <Story name="Inheritance" {...withStoryDocs(inheritanceDocs)}>
-  <Theme theme="{themes.light}">
+  <Theme theme={themes.light}>
     <div class="themed">
       <p>Theme</p>
-      <Theme theme="{themes.dark}">
+      <Theme theme={themes.dark}>
         <div class="themed">
           <p>Sub-theme</p>
-          <Theme theme="{themes.light}">
+          <Theme theme={themes.light}>
             <div class="themed">
               <p>Sub-sub</p>
             </div>
           </Theme>
           <Theme
-            theme="{{
+            theme={{
               colour: { background: 'steelblue', 'text-primary': '#fff' },
               font: { family: { note: 'FreightText, serif' } },
-            }}"
+            }}
             base="dark"
           >
             <div class="themed">
diff --git a/src/components/Theme/Theme.svelte b/src/components/Theme/Theme.svelte
index bf3915e6..f46b9669 100644
--- a/src/components/Theme/Theme.svelte
+++ b/src/components/Theme/Theme.svelte
@@ -11,23 +11,21 @@
 
 <script lang="ts">
   import type { CustomTheme } from './@types/component';
-  
 
   type Base = 'light' | 'dark';
-  
 
   import flatten from './utils/flatten';
   import mergeThemes from './utils/merge';
   interface Props {
     /** Custom theme object. Can be a partial theme with just
-   * what you want to change.
-   */
+     * what you want to change.
+     */
     theme?: CustomTheme;
     /**
-   * Base theme is one of `light` or `dark` and will be merged
-   * with your custom theme to fill in any values you don't
-   * explicitly set.
-   */
+     * Base theme is one of `light` or `dark` and will be merged
+     * with your custom theme to fill in any values you don't
+     * explicitly set.
+     */
     base?: Base;
     children?: import('svelte').Snippet;
   }
@@ -35,14 +33,18 @@
   let { theme = {}, base = 'light', children }: Props = $props();
 
   /** @type {Theme} */
-  let mergedTheme = $derived(mergeThemes({}, themes[base] || themes.light, theme));
+  let mergedTheme = $derived(
+    mergeThemes({}, themes[base] || themes.light, theme)
+  );
 
-  let cssVariables = $derived(Object.entries(flatten({ theme: mergedTheme }))
-    .map(([key, value]) => `--${key}: ${value};`)
-    .join(' '));
+  let cssVariables = $derived(
+    Object.entries(flatten({ theme: mergedTheme }))
+      .map(([key, value]) => `--${key}: ${value};`)
+      .join(' ')
+  );
 </script>
 
-<div class="theme" style="{cssVariables}" style:display="contents">
+<div class="theme" style={cssVariables} style:display="contents">
   <!-- Clients can override the theme above by attaching custom properties to this element. -->
   <div class="theme-client-override" style="display: contents;">
     <!-- Themed content -->
diff --git a/src/components/Theme/stories/ThemedPage.svelte b/src/components/Theme/stories/ThemedPage.svelte
index 82ea7051..98221f38 100644
--- a/src/components/Theme/stories/ThemedPage.svelte
+++ b/src/components/Theme/stories/ThemedPage.svelte
@@ -7,21 +7,21 @@
 
 <Article>
   <Headline
-    hed="{'Reuters Graphics Interactive'}"
-    dek="{'The beginning of a beautiful page'}"
-    section="{'Global news'}"
-    authors="{['Jon McClure', 'Prasanta Kumar Dutta']}"
-    publishTime="{new Date('2021-09-12').toISOString()}"
+    hed={'Reuters Graphics Interactive'}
+    dek={'The beginning of a beautiful page'}
+    section={'Global news'}
+    authors={['Jon McClure', 'Prasanta Kumar Dutta']}
+    publishTime={new Date('2021-09-12').toISOString()}
   />
   <BodyText
-    text="{`Bacon ipsum dolor amet cupim porchetta chuck buffalo sirloin beef. Biltong ham brisket tenderloin hamburger doner.
+    text={`Bacon ipsum dolor amet cupim porchetta chuck buffalo sirloin beef. Biltong ham brisket tenderloin hamburger doner.
 
 Prosciutto kevin brisket sirloin pork loin shoulder cupim sausage chicken jowl strip steak rump pork ball tip ham hock. Swine pork belly fatback alcatra jowl.
 
 ## Brisket sirloin
 
 Shank strip steak turkey shoulder shankle leberkas pork chop, t-bone picanha buffalo ground round burgdoggen ribeye.   
-  `}"
+  `}
   />
   <GraphicBlock
     title="Steak tar-tar"
@@ -31,7 +31,7 @@ Shank strip steak turkey shoulder shankle leberkas pork chop, t-bone picanha buf
     <div class="fake-graphic"></div>
   </GraphicBlock>
   <BodyText
-    text="{'Bacon ipsum dolor amet cupim porchetta chuck buffalo sirloin beef. Biltong ham brisket tenderloin hamburger doner.'}"
+    text={'Bacon ipsum dolor amet cupim porchetta chuck buffalo sirloin beef. Biltong ham brisket tenderloin hamburger doner.'}
   />
 </Article>
 
diff --git a/src/components/ToolsHeader/ToolsHeader.stories.svelte b/src/components/ToolsHeader/ToolsHeader.stories.svelte
index 5116fbcc..0264b0a5 100644
--- a/src/components/ToolsHeader/ToolsHeader.stories.svelte
+++ b/src/components/ToolsHeader/ToolsHeader.stories.svelte
@@ -17,7 +17,7 @@
   import { Template, Story } from '@storybook/addon-svelte-csf';
 </script>
 
-<Template >
+<Template>
   {#snippet children({ args })}
     <div>
       <ToolsHeader {...args} />
@@ -25,7 +25,7 @@
   {/snippet}
 </Template>
 
-<Story name="Default" args="{{}}" />
+<Story name="Default" args={{}} />
 
 <style>
   div {
diff --git a/src/components/ToolsHeader/ToolsHeader.svelte b/src/components/ToolsHeader/ToolsHeader.svelte
index 100dcba8..9decb43c 100644
--- a/src/components/ToolsHeader/ToolsHeader.svelte
+++ b/src/components/ToolsHeader/ToolsHeader.svelte
@@ -41,13 +41,13 @@
 
 <header
   {id}
-  class="{cls}"
+  class={cls}
   class:sticky
   style:background
-  style:border-bottom="{borderBottom}"
+  style:border-bottom={borderBottom}
 >
   <div class="logo-container">
-    <a href="{homeLink}">
+    <a href={homeLink}>
       <ReutersGraphicsLogo {...{ ...logoProps, ...{ width: '100%' } }} />
     </a>
   </div>
diff --git a/src/components/Video/Controls.svelte b/src/components/Video/Controls.svelte
index 6229f6ca..401d1408 100644
--- a/src/components/Video/Controls.svelte
+++ b/src/components/Video/Controls.svelte
@@ -15,7 +15,7 @@
     controlsBorderOffset,
     resetCondition,
     separateReplayIcon,
-    controlsColour
+    controlsColour,
   } = $props();
 
   function forwardBtnClick() {
@@ -50,18 +50,18 @@
   {#if resetCondition}
     <i class="play-pause-icon replay">
       {#if separateReplayIcon}
-        <Fa icon="{faReply}" size="2x" color="{controlsColour}" />
+        <Fa icon={faReply} size="2x" color={controlsColour} />
       {:else}
-        <Fa icon="{faPlay}" size="2x" color="{controlsColour}" />
+        <Fa icon={faPlay} size="2x" color={controlsColour} />
       {/if}
     </i>
   {:else if paused === false}
     <i class="play-pause-icon pause">
-      <Fa icon="{faPause}" size="2x" color="{controlsColour}" />
+      <Fa icon={faPause} size="2x" color={controlsColour} />
     </i>
   {:else if paused === true}
     <i class="play-pause-icon play">
-      <Fa icon="{faPlay}" size="2x" color="{controlsColour}" />
+      <Fa icon={faPlay} size="2x" color={controlsColour} />
     </i>
   {:else}
     error
diff --git a/src/components/Video/Video.stories.svelte b/src/components/Video/Video.stories.svelte
index 6d84c0f0..71a87ef5 100644
--- a/src/components/Video/Video.stories.svelte
+++ b/src/components/Video/Video.stories.svelte
@@ -31,7 +31,7 @@
   import SoundVideo from './stories/videos/sound-video.mp4';
 </script>
 
-<Template >
+<Template>
   {#snippet children({ args })}
     <Video {...args} />
   {/snippet}
@@ -39,17 +39,17 @@
 
 <Story
   name="Default"
-  args="{{
+  args={{
     ariaDescription: 'Compulsory description of your video for screen readers.',
     src: SilentVideo,
     width: 'wide',
     notes: 'Optional caption for your video.',
-  }}"
+  }}
 />
 
 <Story
   name="Playing and looping"
-  args="{{
+  args={{
     ariaDescription: 'Compulsory description of your video for screen readers.',
     src: SilentVideo,
     width: 'normal',
@@ -57,13 +57,13 @@
     notes:
       "World's longest glass bridge opens to public in Vietnam. (c) 2022 Thomson Reuters",
     playVideoThreshold: 0.9,
-  }}"
+  }}
   {...withStoryDocs(playAndLoopDocs)}
 />
 
 <Story
   name="Controls"
-  args="{{
+  args={{
     ariaDescription: 'Compulsory description of your video for screen readers.',
     src: SilentVideo,
     width: 'normal',
@@ -76,13 +76,13 @@
     separateReplayIcon: true,
     loopVideo: false,
     hoverToSeeControls: true,
-  }}"
+  }}
   {...withStoryDocs(controlsDocs)}
 />
 
 <Story
   name="Videos with sound"
-  args="{{
+  args={{
     ariaDescription: 'Compulsory description of your video for screen readers.',
     src: SoundVideo,
     width: 'normal',
@@ -94,6 +94,6 @@
     muteVideo: false,
     playVideoWhenInView: true,
     allowSoundToAutoplay: true,
-  }}"
+  }}
   {...withStoryDocs(controlsDocs)}
 />
diff --git a/src/components/Video/Video.svelte b/src/components/Video/Video.svelte
index 1cc90a43..24bbbd1a 100644
--- a/src/components/Video/Video.svelte
+++ b/src/components/Video/Video.svelte
@@ -165,8 +165,8 @@
 </script>
 
 <svelte:window
-  on:click="{setInteractedWithDom}"
-  on:touchstart="{setInteractedWithDom}"
+  on:click={setInteractedWithDom}
+  on:touchstart={setInteractedWithDom}
 />
 
 <GraphicBlock
@@ -179,18 +179,18 @@
 >
   <div
     role="figure"
-    on:mouseover="{() => {
+    on:mouseover={() => {
       interactiveControlsOpacity = controlsOpacity;
-    }}"
-    on:focus="{() => {
+    }}
+    on:focus={() => {
       interactiveControlsOpacity = controlsOpacity;
-    }}"
-    on:mouseout="{() => {
+    }}
+    on:mouseout={() => {
       interactiveControlsOpacity = 0;
-    }}"
-    on:blur="{() => {
+    }}
+    on:blur={() => {
       interactiveControlsOpacity = 0;
-    }}"
+    }}
   >
     {#if (hidden && ariaDescription) || !hidden}
       {#if ariaDescription}
@@ -202,25 +202,25 @@
         <IntersectionObserver
           {element}
           bind:intersecting
-          threshold="{playVideoThreshold}"
-          once="{false}"
+          threshold={playVideoThreshold}
+          once={false}
         >
           <div
-            bind:this="{element}"
+            bind:this={element}
             class="video-wrapper relative block"
-            aria-hidden="{hidden}"
-            bind:clientWidth="{widthVideoContainer}"
-            bind:clientHeight="{heightVideoContainer}"
+            aria-hidden={hidden}
+            bind:clientWidth={widthVideoContainer}
+            bind:clientHeight={heightVideoContainer}
           >
             {#if possibleToPlayPause}
               {#if showControls}
                 <Controls
-                  on:pausePlayEvent="{pausePlayEvent}"
+                  on:pausePlayEvent={pausePlayEvent}
                   {paused}
                   {clickedOnPauseBtn}
-                  controlsOpacity="{hoverToSeeControls ?
+                  controlsOpacity={hoverToSeeControls ?
                     interactiveControlsOpacity
-                  : controlsOpacity}"
+                  : controlsOpacity}
                   {controlsPosition}
                   {widthVideoContainer}
                   {heightVideoContainer}
@@ -232,32 +232,32 @@
               {:else}
                 <button
                   class="border-0 m-0 p-0 bg-transparent absolute"
-                  on:click="{() => {
+                  on:click={() => {
                     if (paused === true) {
                       paused = false;
                     } else {
                       paused = true;
                     }
-                  }}"
+                  }}
                   style="top: 0; left: 0; width: {widthVideoContainer}px; height: {heightVideoContainer}px;"
                 ></button>
               {/if}
             {/if}
             <video
-              bind:this="{videoElement}"
+              bind:this={videoElement}
               {src}
               {poster}
               class="pointer-events-none relative"
               width="100%"
-              muted="{muteVideo}"
+              muted={muteVideo}
               playsinline
-              preload="{preloadVideo}"
-              loop="{loopVideo}"
-              bind:currentTime="{time}"
+              preload={preloadVideo}
+              loop={loopVideo}
+              bind:currentTime={time}
               bind:duration
               bind:paused
-              bind:clientWidth="{widthVideo}"
-              bind:clientHeight="{heightVideo}"
+              bind:clientWidth={widthVideo}
+              bind:clientHeight={heightVideo}
             >
               <track kind="captions" />
             </video>
@@ -267,14 +267,14 @@
         <!-- Video element without Intersection observer -->
         <div
           class="video-wrapper relative"
-          aria-hidden="{hidden}"
-          bind:clientWidth="{widthVideoContainer}"
-          bind:clientHeight="{heightVideoContainer}"
+          aria-hidden={hidden}
+          bind:clientWidth={widthVideoContainer}
+          bind:clientHeight={heightVideoContainer}
         >
           {#if possibleToPlayPause}
             {#if showControls}
               <Controls
-                on:pausePlayEvent="{pausePlayEvent}"
+                on:pausePlayEvent={pausePlayEvent}
                 {paused}
                 {clickedOnPauseBtn}
                 {controlsOpacity}
@@ -289,33 +289,33 @@
             {:else}
               <button
                 class="border-0 m-0 p-0 bg-transparent absolute"
-                on:click="{() => {
+                on:click={() => {
                   if (paused === true) {
                     paused = false;
                   } else {
                     paused = true;
                   }
-                }}"
+                }}
                 style="top: 0; left: 0; width: {widthVideoContainer}px; height: {heightVideoContainer}px;"
               ></button>
             {/if}
           {/if}
           <video
-            bind:this="{videoElement}"
+            bind:this={videoElement}
             {src}
             {poster}
             class="pointer-events-none relative"
             width="100%"
-            muted="{muteVideo}"
+            muted={muteVideo}
             playsinline
-            preload="{preloadVideo}"
-            loop="{loopVideo}"
-            bind:currentTime="{time}"
+            preload={preloadVideo}
+            loop={loopVideo}
+            bind:currentTime={time}
             bind:duration
             bind:paused
             autoplay
-            bind:clientWidth="{widthVideo}"
-            bind:clientHeight="{heightVideo}"
+            bind:clientWidth={widthVideo}
+            bind:clientHeight={heightVideo}
           >
             <track kind="captions" />
           </video>
diff --git a/src/components/Visible/Visible.stories.svelte b/src/components/Visible/Visible.stories.svelte
index 481555ec..38068151 100644
--- a/src/components/Visible/Visible.stories.svelte
+++ b/src/components/Visible/Visible.stories.svelte
@@ -19,16 +19,16 @@
   import { Template, Story } from '@storybook/addon-svelte-csf';
 </script>
 
-<Template >
+<Template>
   {#snippet children({ args })}
-    <Visible {...args} >
+    <Visible {...args}>
       {#snippet children({ visible })}
         {#if visible}
           <p>Visible!</p>
         {:else}
           <p>Not yet visible.</p>
         {/if}
-            {/snippet}
+      {/snippet}
     </Visible>
   {/snippet}
 </Template>
diff --git a/src/components/Visible/Visible.svelte b/src/components/Visible/Visible.svelte
index 3871c32e..4584c12e 100644
--- a/src/components/Visible/Visible.svelte
+++ b/src/components/Visible/Visible.svelte
@@ -1,18 +1,13 @@
 <!-- @component `Visible` [Read the docs.](https://reuters-graphics.github.io/graphics-components/?path=/docs/components-utilities-visible--docs) -->
 <script lang="ts">
   import { onMount } from 'svelte';
-  
-  
-  
-  
-  
-  
+
   interface Props {
     /**
-   * Whether to change visibility just once.
-   *
-   * Useful for loading expensive images or other media and then keeping them around once they're first loaded.
-   */
+     * Whether to change visibility just once.
+     *
+     * Useful for loading expensive images or other media and then keeping them around once they're first loaded.
+     */
     once?: boolean;
     /** Set Intersection Observer [rootMargin](https://developer.mozilla.org/en-US/docs/Web/API/Intersection_Observer_API#rootmargin) `top`. */
     top?: number;
@@ -34,7 +29,7 @@
     left = 0,
     right = 0,
     threshold = 0,
-    children
+    children,
   }: Props = $props();
 
   let visible = $state(false);
@@ -74,7 +69,7 @@
   });
 </script>
 
-<div bind:this="{container}">
+<div bind:this={container}>
   <!-- An element or component -->
-  {@render children?.({ visible, })}
+  {@render children?.({ visible })}
 </div>
diff --git a/src/components/Visible/stories/snippets/default.svelte b/src/components/Visible/stories/snippets/default.svelte
index 06bb740d..e84555a3 100644
--- a/src/components/Visible/stories/snippets/default.svelte
+++ b/src/components/Visible/stories/snippets/default.svelte
@@ -2,7 +2,7 @@
   import { Visible } from '@reuters-graphics/graphics-components';
 </script>
 
-<Visible >
+<Visible>
   {#snippet children({ visible })}
     {#if visible}
       <p>Visible!</p>
diff --git a/src/docs/contributing/story-recipes/basic-story.mdx b/src/docs/contributing/story-recipes/basic-story.mdx
index ef182677..4dab01bb 100644
--- a/src/docs/contributing/story-recipes/basic-story.mdx
+++ b/src/docs/contributing/story-recipes/basic-story.mdx
@@ -20,7 +20,7 @@ Once you've setup the `Meta` and `Template` components as below, you can write a
   import YourComponent from './YourComponent.svelte';
 </script>
 
-<Meta title="Components/YourComponent" component="{YourComponent}" />
+<Meta title="Components/YourComponent" component={YourComponent} />
 
 <Template let:args>
   <YourComponent {...args} />
@@ -28,9 +28,9 @@ Once you've setup the `Meta` and `Template` components as below, you can write a
 
 <Story
   name="Default"
-  args="{{
+  args={{
     width: 'normal',
-  }}"
+  }}
 />
 ```
 
@@ -47,16 +47,16 @@ You can define additional stories with _different_ args to show how your compone
 
 <Story
   name="Default"
-  args="{{
+  args={{
     width: 'normal',
-  }}"
+  }}
 />
 
 <Story
   name="Extra wide"
-  args="{{
+  args={{
     width: 'wider',
-  }}"
+  }}
 />
 ```
 
@@ -66,10 +66,10 @@ If you want even more control, you can skip the `args` and pass your component d
 <Story name="Super custom">
   <YourComponent
     width="fluid"
-    data="{[
+    data={[
       { id: 'UK', value: 65 },
       { id: 'USA', value: 265 },
-    ]}"
+    ]}
   />
 </Story>
 ```
diff --git a/src/docs/contributing/story-recipes/story-with-custom-controls.mdx b/src/docs/contributing/story-recipes/story-with-custom-controls.mdx
index 7afe748e..e279dc16 100644
--- a/src/docs/contributing/story-recipes/story-with-custom-controls.mdx
+++ b/src/docs/contributing/story-recipes/story-with-custom-controls.mdx
@@ -34,7 +34,7 @@ You can customise the controls in Storybook's built-in [controls panel](https://
   };
 </script>
 
-<Meta title="Components/YourComponent" component="{YourComponent}" {...meta} />
+<Meta title="Components/YourComponent" component={YourComponent} {...meta} />
 
 <template let:args>
   <YourComponent {...args} />
diff --git a/src/docs/contributing/story-recipes/story-with-custom-docs.mdx b/src/docs/contributing/story-recipes/story-with-custom-docs.mdx
index 048b0e67..24a3b1f1 100644
--- a/src/docs/contributing/story-recipes/story-with-custom-docs.mdx
+++ b/src/docs/contributing/story-recipes/story-with-custom-docs.mdx
@@ -47,19 +47,19 @@ Now, import your markdown file in your story page component and attach it to eit
   };
 </script>
 
-<Meta title="Components/YourComponent" component="{YourComponent}" {...meta} />
+<Meta title="Components/YourComponent" component={YourComponent} {...meta} />
 
 <template let:args>
   <YourComponent {...args} />
 </template>
 
 <!-- The first story will use the component docs in Meta... -->
-<Story name="Basic" args="{{ width: 'normal' }}" />
+<Story name="Basic" args={{ width: 'normal' }} />
 
 <!-- Additional stories can use other docs now. -->
 <Story
   name="Another story"
-  args="{{ width: 'normal' }}"
+  args={{ width: 'normal' }}
   {...withStoryDocs(someStoryDocs)}
 />
 ```
@@ -110,7 +110,7 @@ Now, import your snippet file in your story page component and attach it to any
 <!-- Pass source in inside an object keyed by your snippet's language, e.g., svelte, scss, etc. -->
 <Story
   name="Basic"
-  args="{{ width: 'normal' }}"
+  args={{ width: 'normal' }}
   {...withSource({ svelte: defaultSnippet })}
 />
 ```
@@ -124,7 +124,7 @@ If you're adding source code AND custom docs to a story, you can chain `withSour
 
 <Story
   name="Extra wide"
-  args="{{ width: 'wider' }}"
+  args={{ width: 'wider' }}
   {...withComponentDocs(componentDocs, withSource({ svelte: defaultSnippet }))}
 />
 ```
diff --git a/src/docs/contributing/story-recipes/story-with-media.mdx b/src/docs/contributing/story-recipes/story-with-media.mdx
index e7eb5b4e..1ac08b86 100644
--- a/src/docs/contributing/story-recipes/story-with-media.mdx
+++ b/src/docs/contributing/story-recipes/story-with-media.mdx
@@ -34,7 +34,7 @@ Now, import your media file directly in your code, which will resolve to the URL
   import myImageSrc from './stories/imgs/myImage.jpg';
 </script>
 
-<Meta title="Components/YourComponent" component="{YourComponent}" />
+<Meta title="Components/YourComponent" component={YourComponent} />
 
 <template let:args>
   <YourComponent {...args} />
@@ -42,9 +42,9 @@ Now, import your media file directly in your code, which will resolve to the URL
 
 <Story
   name="Basic"
-  args="{{
+  args={{
     src: myImageSrc,
     altText: 'My image in the component',
-  }}"
+  }}
 />
 ```
diff --git a/src/docs/guides/archieml.mdx b/src/docs/guides/archieml.mdx
index c99a2b56..91b88c46 100644
--- a/src/docs/guides/archieml.mdx
+++ b/src/docs/guides/archieml.mdx
@@ -21,11 +21,11 @@ Let's look at a basic component, a `ProfileCard`, with a demo that looks like th
 
 <ProfileCard
   name="Kitty"
-  age="{2}"
+  age={2}
   img="https://cats.com/cat1.jpg"
-  birthday="{new Date('2020-09-25')}"
+  birthday={new Date('2020-09-25')}
   bio="Some notes.\n\nWith multiple paragraphs."
-  isGood="{true}"
+  isGood={true}
 />
 ```
 
@@ -100,12 +100,12 @@ Notice all the values in the data are **strings**. More on that soon.
     <!-- ... -->
   {:else if block.type === 'profile-card'}
     <ProfileCard
-      name="{block.name}"
-      age="{parseInt(block.age)}"
-      img="{`${assets}/${block.picture}`}"
-      birthday="{new Date(block.birthday)}"
-      bio="{block.bio}"
-      isGood="{block.isGood === 'true'}"
+      name={block.name}
+      age={parseInt(block.age)}
+      img={`${assets}/${block.picture}`}
+      birthday={new Date(block.birthday)}
+      bio={block.bio}
+      isGood={block.isGood === 'true'}
     />
     <!-- ... -->
   {/if}
@@ -136,12 +136,12 @@ Once we've identified we have the right block for our component, we need to conv
 
 ```svelte
 <ProfileCard
-  name="{block.name}"
-  age="{parseInt(block.age)}"
-  img="{`${assets}/${block.picture}`}"
-  birthday="{new Date(block.birthday)}"
-  bio="{block.bio}"
-  isGood="{block.isGood === 'true'}"
+  name={block.name}
+  age={parseInt(block.age)}
+  img={`${assets}/${block.picture}`}
+  birthday={new Date(block.birthday)}
+  bio={block.bio}
+  isGood={block.isGood === 'true'}
 />
 ```
 
@@ -191,7 +191,7 @@ Let's look at another example component:
 ```svelte
 <Timeline
   title="A brief history of BitCoin"
-  dates="{[
+  dates={[
     {
       date: new Date('1992-01-01'),
       subhed:
@@ -208,7 +208,7 @@ Let's look at another example component:
       subhed: 'The Winklevoss twins buy in',
       img: `${assets}/images/winkle-boys.jpeg`,
     },
-  ]}"
+  ]}
 />
 ```
 
diff --git a/src/docs/guides/graphics-kit.mdx b/src/docs/guides/graphics-kit.mdx
index 5528ed55..93d4ceec 100644
--- a/src/docs/guides/graphics-kit.mdx
+++ b/src/docs/guides/graphics-kit.mdx
@@ -30,5 +30,5 @@ In the Graphics Kit, that means you'll need to prefix relative paths with the sp
 </script>
 
 <!-- Use the assets module to prefix the path to your image. -->
-<FeautrePhoto src="{`${assets}/imgs/myImage.jpg`}" />
+<FeautrePhoto src={`${assets}/imgs/myImage.jpg`} />
 ```
diff --git a/src/docs/guides/svelte-components.mdx b/src/docs/guides/svelte-components.mdx
index e472ccab..5afd7783 100644
--- a/src/docs/guides/svelte-components.mdx
+++ b/src/docs/guides/svelte-components.mdx
@@ -26,7 +26,7 @@ A component is usually composed of several parts: JavaScript for managing data,
 
 <!-- HTML -->
 <figure>
-  <img src="{imgSrc}" alt="{altText}" />
+  <img src={imgSrc} alt={altText} />
   <figcaption>{caption}</figcaption>
 </figure>
 
diff --git a/src/docs/intro.mdx b/src/docs/intro.mdx
index 94a73ff6..7ecbe52a 100644
--- a/src/docs/intro.mdx
+++ b/src/docs/intro.mdx
@@ -32,5 +32,5 @@ pnpm i @reuters-graphics/graphics-components
   import { BodyText } from '@reuters-graphics/graphics-components';
 </script>
 
-<BodyText text="{'Hello world!'}" />
+<BodyText text={'Hello world!'} />
 ```
diff --git a/src/docs/theming/css-variables.mdx b/src/docs/theming/css-variables.mdx
index be71cb74..d6894f4e 100644
--- a/src/docs/theming/css-variables.mdx
+++ b/src/docs/theming/css-variables.mdx
@@ -37,12 +37,12 @@ You can redefine any of the above CSS variables in the `<Theme>` component. Read
 ```svelte
 <Theme
   base="light"
-  theme="{{
+  theme={{
     colour: {
       // This replaces the default text-secondary colour '#666666' for light theme
       'text-secondary': '#213310',
     },
-  }}"
+  }}
 >
   <!-- page stuff -->
 </Theme>
@@ -57,11 +57,11 @@ For example, let's say you want to define a border radius for some card elements
 ```svelte
 <Theme
   base="light"
-  theme="{{
+  theme={{
     style: {
       'border-radius': '22px',
     },
-  }}"
+  }}
 >
   <!-- page stuff -->
 </Theme>
@@ -90,15 +90,15 @@ You can also change a variable's value based on some condition. For example, to
   let windowWidth;
 </script>
 
-<svelte:window bind:innerWidth="{windowWidth}" />
+<svelte:window bind:innerWidth={windowWidth} />
 
 <Theme
   base="light"
-  theme="{{
+  theme={{
     style: {
       'border-radius': windowWidth > 475 ? '22px' : '11px',
     },
-  }}"
+  }}
 >
   <!-- page stuff -->
 </Theme>
diff --git a/src/index.js b/src/index.js
index 71b8410c..c647a932 100644
--- a/src/index.js
+++ b/src/index.js
@@ -31,7 +31,7 @@ export { default as PhotoCarousel } from './components/PhotoCarousel/PhotoCarous
 export { default as PhotoPack } from './components/PhotoPack/PhotoPack.svelte';
 export { default as PymChild } from './components/PymChild/PymChild.svelte';
 export { pymChildStore } from './components/PymChild/stores.js';
-export { staticMarkdown } from './components/Markdown/stores.js';
+export { staticMarkdown } from './components/Markdown/state.svelte.js';
 export { default as ReferralBlock } from './components/ReferralBlock/ReferralBlock.svelte';
 export { default as ReutersGraphicsLogo } from './components/ReutersGraphicsLogo/ReutersGraphicsLogo.svelte';
 export { default as ReutersLogo } from './components/ReutersLogo/ReutersLogo.svelte';
diff --git a/src/utils/index.ts b/src/utils/index.ts
new file mode 100644
index 00000000..7110e4f1
--- /dev/null
+++ b/src/utils/index.ts
@@ -0,0 +1,15 @@
+import slugify from 'slugify';
+
+/** Helper function to generate a random 4-character string */
+export const random4 = () =>
+  Math.floor((1 + Math.random()) * 0x10000)
+    .toString(16)
+    .substring(1);
+
+/**
+ * Custom function that returns an author page URL.
+ */
+export const getAuthorPageUrl = (author: string): string => {
+  const authorSlug = slugify(author.trim(), { lower: true });
+  return `https://www.reuters.com/authors/${authorSlug}/`;
+};
\ No newline at end of file