diff --git a/apps/site/src/content/design-system/components/autocomplete/design/where-is-this-available/content.mdoc b/apps/site/src/content/design-system/components/autocomplete/design/where-is-this-available/content.mdoc
index e0675fba7..f20bfde16 100644
--- a/apps/site/src/content/design-system/components/autocomplete/design/where-is-this-available/content.mdoc
+++ b/apps/site/src/content/design-system/components/autocomplete/design/where-is-this-available/content.mdoc
@@ -1,8 +1,8 @@
 {% shortCode name="where-is-this-available" /%}
 
 {% availabilityContent
-  availableGel="available"
-  availableMesh="in-progress"
-  availableLegacyWdp="older-version-available"
-  alternativeMesh="Typeahead"
-  alternativeLegacyWdp="Typeahead" /%}
+   availableGel="available"
+   availableMesh="older-version-available"
+   availableLegacyWdp="older-version-available"
+   alternativeMesh="Typeahead"
+   alternativeLegacyWdp="Typeahead" /%}
diff --git a/apps/site/src/content/design-system/components/badge/design/where-is-this-available/content.mdoc b/apps/site/src/content/design-system/components/badge/design/where-is-this-available/content.mdoc
index 903536d1f..ffdea3491 100644
--- a/apps/site/src/content/design-system/components/badge/design/where-is-this-available/content.mdoc
+++ b/apps/site/src/content/design-system/components/badge/design/where-is-this-available/content.mdoc
@@ -1,6 +1,6 @@
 {% shortCode name="where-is-this-available" /%}
 
 {% availabilityContent
-  availableGel="available"
-  availableMesh="in-progress"
-  availableLegacyWdp="older-version-available" /%}
+   availableGel="available"
+   availableMesh="older-version-available"
+   availableLegacyWdp="older-version-available" /%}
diff --git a/apps/site/src/content/design-system/components/bottom-sheet/design/where-is-this-available/content.mdoc b/apps/site/src/content/design-system/components/bottom-sheet/design/where-is-this-available/content.mdoc
index de3d593a9..db6184d95 100644
--- a/apps/site/src/content/design-system/components/bottom-sheet/design/where-is-this-available/content.mdoc
+++ b/apps/site/src/content/design-system/components/bottom-sheet/design/where-is-this-available/content.mdoc
@@ -2,5 +2,5 @@
 
 {% availabilityContent
    availableGel="available"
-   availableMesh="in-progress"
-   availableLegacyWdp="older-version-available" /%}
+   availableMesh="unavailable"
+   availableLegacyWdp="unavailable" /%}
diff --git a/apps/site/src/content/design-system/components/compacta/design/where-is-this-available/content.mdoc b/apps/site/src/content/design-system/components/compacta/design/where-is-this-available/content.mdoc
index de3d593a9..ffdea3491 100644
--- a/apps/site/src/content/design-system/components/compacta/design/where-is-this-available/content.mdoc
+++ b/apps/site/src/content/design-system/components/compacta/design/where-is-this-available/content.mdoc
@@ -2,5 +2,5 @@
 
 {% availabilityContent
    availableGel="available"
-   availableMesh="in-progress"
+   availableMesh="older-version-available"
    availableLegacyWdp="older-version-available" /%}
diff --git a/apps/site/src/content/design-system/components/flexi-cell/design/where-is-this-available/content.mdoc b/apps/site/src/content/design-system/components/flexi-cell/design/where-is-this-available/content.mdoc
index de3d593a9..db6184d95 100644
--- a/apps/site/src/content/design-system/components/flexi-cell/design/where-is-this-available/content.mdoc
+++ b/apps/site/src/content/design-system/components/flexi-cell/design/where-is-this-available/content.mdoc
@@ -2,5 +2,5 @@
 
 {% availabilityContent
    availableGel="available"
-   availableMesh="in-progress"
-   availableLegacyWdp="older-version-available" /%}
+   availableMesh="unavailable"
+   availableLegacyWdp="unavailable" /%}
diff --git a/apps/site/src/content/design-system/components/input-group/design/where-is-this-available/content.mdoc b/apps/site/src/content/design-system/components/input-group/design/where-is-this-available/content.mdoc
index de3d593a9..ffdea3491 100644
--- a/apps/site/src/content/design-system/components/input-group/design/where-is-this-available/content.mdoc
+++ b/apps/site/src/content/design-system/components/input-group/design/where-is-this-available/content.mdoc
@@ -2,5 +2,5 @@
 
 {% availabilityContent
    availableGel="available"
-   availableMesh="in-progress"
+   availableMesh="older-version-available"
    availableLegacyWdp="older-version-available" /%}
diff --git a/apps/site/src/content/design-system/components/modal/design/where-is-this-available/content.mdoc b/apps/site/src/content/design-system/components/modal/design/where-is-this-available/content.mdoc
index de3d593a9..ffdea3491 100644
--- a/apps/site/src/content/design-system/components/modal/design/where-is-this-available/content.mdoc
+++ b/apps/site/src/content/design-system/components/modal/design/where-is-this-available/content.mdoc
@@ -2,5 +2,5 @@
 
 {% availabilityContent
    availableGel="available"
-   availableMesh="in-progress"
+   availableMesh="older-version-available"
    availableLegacyWdp="older-version-available" /%}
diff --git a/apps/site/src/content/design-system/components/repeater/design/where-is-this-available/content.mdoc b/apps/site/src/content/design-system/components/repeater/design/where-is-this-available/content.mdoc
index de3d593a9..ffdea3491 100644
--- a/apps/site/src/content/design-system/components/repeater/design/where-is-this-available/content.mdoc
+++ b/apps/site/src/content/design-system/components/repeater/design/where-is-this-available/content.mdoc
@@ -2,5 +2,5 @@
 
 {% availabilityContent
    availableGel="available"
-   availableMesh="in-progress"
+   availableMesh="older-version-available"
    availableLegacyWdp="older-version-available" /%}
diff --git a/apps/site/src/content/design-system/content/guidelines/headings-subheading/design/headings-subheadings/content.mdoc b/apps/site/src/content/design-system/content/guidelines/headings-subheading/design/headings-subheadings/content.mdoc
index b49a151f9..95e841a32 100644
--- a/apps/site/src/content/design-system/content/guidelines/headings-subheading/design/headings-subheadings/content.mdoc
+++ b/apps/site/src/content/design-system/content/guidelines/headings-subheading/design/headings-subheadings/content.mdoc
@@ -1,19 +1,21 @@
 No full stops at the end of any headings but fine to use a full stop or comma to break up a headline.
 
-For example:
-
-> OUR DREAM RATE JUST GOT DREAMIER
-> 
-> LIFE IS EVENTFUL. THAT’S WHY WE HELP
-> 
-> MEET RED, YOUR VIRTUAL ASSISTANT
-
----
+```jsx
+<div>
+<h4 className="typography-body-10 text-muted mb-3">For example:</h4>
+<p className="typography-body-10 mb-2 ml-4">OUR DREAM RATE JUST GOT DREAMIER</p>
+<p className="typography-body-10 mb-2 ml-4">LIFE IS EVENTFUL. THAT’S WHY WE HELP</p>
+<p className="typography-body-10 mb-2 ml-4">MEET RED, YOUR VIRTUAL ASSISTANT</p>
+</div>
+```
 
 Question marks and exclamation marks can help keep headings short and engaging.
 
-For example:
-
-> WANT $3K CASHBACK?
-
-*Note: Only use exclamation marks when appropriate, e.g. Now that’s a great rate!*
+```jsx
+<div>
+<h4 className="typography-body-10 text-muted mb-3">For example:</h4>
+<p className="typography-body-10 mb-2 ml-4">WANT $3K CASHBACK?</p>
+<p className="typography-body-10 mb-6 ml-4">LIFE IS EVENTFUL. THAT’S WHY WE HELP</p>
+<p className="typography-body-10 text-muted italic">Note: Only use exclamation marks when appropriate, e.g. Now that’s a great rate!</p>
+</div>
+```
diff --git a/apps/site/src/content/design-system/content/guidelines/people-diversity/design/people-diversity/content.mdoc b/apps/site/src/content/design-system/content/guidelines/people-diversity/design/people-diversity/content.mdoc
index 862c4c2df..ff048ca56 100644
--- a/apps/site/src/content/design-system/content/guidelines/people-diversity/design/people-diversity/content.mdoc
+++ b/apps/site/src/content/design-system/content/guidelines/people-diversity/design/people-diversity/content.mdoc
@@ -41,8 +41,6 @@ Avoid defining people by their disability and aim for positive language.
 
 Try to keep holidays agnostic where possible.
 
-For example:
-
 ```jsx
 <div>
 <h4 className="typography-body-10 text-muted mb-3">For example:</h4>
diff --git a/apps/site/src/content/design-system/content/guidelines/punctuation-symbol/design/full-stops/content.mdoc b/apps/site/src/content/design-system/content/guidelines/punctuation-symbol/design/full-stops/content.mdoc
index 5796f96a6..87a09d8f3 100644
--- a/apps/site/src/content/design-system/content/guidelines/punctuation-symbol/design/full-stops/content.mdoc
+++ b/apps/site/src/content/design-system/content/guidelines/punctuation-symbol/design/full-stops/content.mdoc
@@ -12,8 +12,6 @@ Use full stops for sub-copy and body copy.
 
 *Note: You can use a full stop to break up a headline, but no full stop on the end.*
 
-For example:
-
 ```jsx
 <div>
 <h4 className="typography-body-10 text-muted mb-3">For example:</h4>
diff --git a/apps/site/src/content/design-system/foundation/text-styling/design/visual-design/content.mdoc b/apps/site/src/content/design-system/design-tokens/accessibilityDemo.mdoc
similarity index 100%
rename from apps/site/src/content/design-system/foundation/text-styling/design/visual-design/content.mdoc
rename to apps/site/src/content/design-system/design-tokens/accessibilityDemo.mdoc
diff --git a/apps/site/src/content/design-system/design-tokens/index.yaml b/apps/site/src/content/design-system/design-tokens/index.yaml
index f65c2f60e..e9b58be15 100644
--- a/apps/site/src/content/design-system/design-tokens/index.yaml
+++ b/apps/site/src/content/design-system/design-tokens/index.yaml
@@ -1,9 +1,16 @@
 name: Design tokens
-description: Design tokens support us to share basic brand styling at the simplest level with any interface on any platform across the Bank.
+description: >-
+  Design tokens support us to share basic brand styling at the simplest level
+  with any interface on any platform across the Bank.
+namedExport:
+  discriminant: false
+excludeFromNavbar: true
 design:
   - title:
       name: Main
       slug: main
     noTitle: true
+    noDemo: false
 accessibility: []
 relatedComponents: []
+code: []
diff --git a/apps/site/src/content/design-system/design-tokens/relatedArticles.mdoc b/apps/site/src/content/design-system/design-tokens/relatedArticles.mdoc
new file mode 100644
index 000000000..e69de29bb
diff --git a/apps/site/src/content/design-system/foundation/font/index.yaml b/apps/site/src/content/design-system/foundation/font/index.yaml
index 600c39e1a..a55957aad 100644
--- a/apps/site/src/content/design-system/foundation/font/index.yaml
+++ b/apps/site/src/content/design-system/foundation/font/index.yaml
@@ -15,17 +15,17 @@ design:
       name: Body font
       slug: body-font
     noTitle: false
-    noDemo: false
+    noDemo: true
   - title:
       name: Typographic scale
       slug: typographic-scale
     noTitle: false
-    noDemo: false
+    noDemo: true
   - title:
       name: Font weights
       slug: font-weights
     noTitle: false
-    noDemo: false
+    noDemo: true
   - title:
       name: Using fonts
       slug: using-fonts
diff --git a/apps/site/src/content/design-system/foundation/icon/design/where-is-this-available/content.mdoc b/apps/site/src/content/design-system/foundation/icon/design/where-is-this-available/content.mdoc
index f70746aed..ffdea3491 100644
--- a/apps/site/src/content/design-system/foundation/icon/design/where-is-this-available/content.mdoc
+++ b/apps/site/src/content/design-system/foundation/icon/design/where-is-this-available/content.mdoc
@@ -2,5 +2,5 @@
 
 {% availabilityContent
    availableGel="available"
-   availableMesh="available"
-   availableLegacyWdp="available" /%}
+   availableMesh="older-version-available"
+   availableLegacyWdp="older-version-available" /%}
diff --git a/apps/site/src/content/design-system/foundation/icon/index.yaml b/apps/site/src/content/design-system/foundation/icon/index.yaml
index 1313329cd..07d074cb9 100644
--- a/apps/site/src/content/design-system/foundation/icon/index.yaml
+++ b/apps/site/src/content/design-system/foundation/icon/index.yaml
@@ -16,12 +16,12 @@ design:
       name: Icon sizing
       slug: icon-sizing
     noTitle: false
-    noDemo: false
+    noDemo: true
   - title:
       name: Icon colours
       slug: icon-colours
     noTitle: false
-    noDemo: false
+    noDemo: true
   - title:
       name: User experience
       slug: user-experience
diff --git a/apps/site/src/content/design-system/foundation/layout/breakpoints/index.yaml b/apps/site/src/content/design-system/foundation/layout/breakpoints/index.yaml
index 8468fa32f..504bf86c0 100644
--- a/apps/site/src/content/design-system/foundation/layout/breakpoints/index.yaml
+++ b/apps/site/src/content/design-system/foundation/layout/breakpoints/index.yaml
@@ -10,7 +10,7 @@ design:
       name: Breakpoint tokens
       slug: breakpoint-tokens
     noTitle: false
-    noDemo: false
+    noDemo: true
 accessibility:
   - title:
       name: Accessibility features
diff --git a/apps/site/src/content/design-system/foundation/text-styling/index.yaml b/apps/site/src/content/design-system/foundation/text-styling/index.yaml
index 44dcb5add..77c3dd2ad 100644
--- a/apps/site/src/content/design-system/foundation/text-styling/index.yaml
+++ b/apps/site/src/content/design-system/foundation/text-styling/index.yaml
@@ -10,22 +10,17 @@ design:
       name: Editorial text styles
       slug: editorial-text-styles
     noTitle: false
-    noDemo: false
+    noDemo: true
   - title:
       name: Headings
       slug: headings
     noTitle: false
-    noDemo: false
+    noDemo: true
   - title:
       name: User experience
       slug: user-experience
     noTitle: false
     noDemo: false
-  - title:
-      name: Visual design
-      slug: visual-design
-    noTitle: false
-    noDemo: false
   - title:
       name: Where is this available?
       slug: where-is-this-available
diff --git a/apps/site/src/content/design-system/guides/help-text/index.yaml b/apps/site/src/content/design-system/guides/help-text/index.yaml
index facb5a31c..82da49a2a 100644
--- a/apps/site/src/content/design-system/guides/help-text/index.yaml
+++ b/apps/site/src/content/design-system/guides/help-text/index.yaml
@@ -15,12 +15,12 @@ design:
       name: Help text in forms
       slug: help-text-in-forms
     noTitle: false
-    noDemo: false
+    noDemo: true
   - title:
       name: Using icons for help
       slug: using-icons-for-help
     noTitle: false
-    noDemo: false
+    noDemo: true
   - title:
       name: Why use help text
       slug: why-use-help-text