diff --git a/.github/workflows/components.yml b/.github/workflows/components.yml
index 3c02114155..61af9c74fb 100644
--- a/.github/workflows/components.yml
+++ b/.github/workflows/components.yml
@@ -12,11 +12,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Install pnpm
-        uses: pnpm/action-setup@v2
+        uses: pnpm/action-setup@v3
         with:
           version: 9.0.6
       - name: Install Dependencies
@@ -37,16 +37,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install pnpm
-        uses: pnpm/action-setup@v2
+        uses: pnpm/action-setup@v3
         env:
           PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
         with:
           version: 9.0.6
           run_install: true
       - name: Install Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 20
           cache: 'pnpm'
@@ -60,16 +60,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install pnpm
-        uses: pnpm/action-setup@v2
+        uses: pnpm/action-setup@v3
         env:
           PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
         with:
           version: 9.0.6
           run_install: true
       - name: Install Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 20
           cache: 'pnpm'
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 11920abb38..32ab756a2e 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -11,14 +11,14 @@ jobs:
   Docs:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install pnpm
-        uses: pnpm/action-setup@v2
+        uses: pnpm/action-setup@v3
         with:
           version: 9.0.6
           run_install: false
       - name: Install Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 20
           cache: 'pnpm'
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3675ee9a50..e006f5096a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -4,14 +4,14 @@ jobs:
   Test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install pnpm
-        uses: pnpm/action-setup@v2
+        uses: pnpm/action-setup@v3
         with:
           version: 9.0.6
           run_install: false
       - name: Install Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 20
           cache: 'pnpm'
diff --git a/.github/workflows/nuxt.yml b/.github/workflows/nuxt.yml
index ff14bf681b..69428ce77f 100644
--- a/.github/workflows/nuxt.yml
+++ b/.github/workflows/nuxt.yml
@@ -11,14 +11,14 @@ jobs:
   TestNuxt:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install pnpm
-        uses: pnpm/action-setup@v2
+        uses: pnpm/action-setup@v3
         with:
           version: 9.0.6
           run_install: false
       - name: Install Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 20
           cache: 'pnpm'
@@ -45,10 +45,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v2
+        uses: pnpm/action-setup@v3
         with:
           version: 9.0.6
 
diff --git a/.github/workflows/publish-canary.yml b/.github/workflows/publish-canary.yml
index 78d7a87863..c943684eef 100644
--- a/.github/workflows/publish-canary.yml
+++ b/.github/workflows/publish-canary.yml
@@ -2,8 +2,7 @@ name: Publish Canary
 on:
   push:
     branches:
-      - develop
-      - release/alpha-**
+      - release/*
 jobs:
   Canary:
     runs-on: ubuntu-latest
@@ -11,17 +10,17 @@ jobs:
       packages: write
       contents: read
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
       - name: Install pnpm
-        uses: pnpm/action-setup@v2
+        uses: pnpm/action-setup@v3
         with:
           version: 9.0.6
           run_install: false
       - name: Install Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           registry-url: 'https://npm.pkg.github.com/'
           node-version: 20
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 0d070a48c5..165faaed6a 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -10,14 +10,14 @@ jobs:
       packages: write
       contents: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install pnpm
-        uses: pnpm/action-setup@v2
+        uses: pnpm/action-setup@v3
         with:
           version: 9.0.6
           run_install: false
       - name: Install Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           registry-url: 'https://npm.pkg.github.com/'
           node-version: 20
diff --git a/.github/workflows/studio.yml b/.github/workflows/studio.yml
index 841369eaca..9df644ed6b 100644
--- a/.github/workflows/studio.yml
+++ b/.github/workflows/studio.yml
@@ -51,7 +51,7 @@ jobs:
         with:
           version: 9.0.6
 
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           version: ${{ matrix.node }}
           cache: ${{ steps.pkgman.outputs.cache }}
diff --git a/.github/workflows/vue.yml b/.github/workflows/vue.yml
index 5da53ea05b..7cd8d2f0e8 100644
--- a/.github/workflows/vue.yml
+++ b/.github/workflows/vue.yml
@@ -11,16 +11,16 @@ jobs:
   Examples:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v2
+        uses: pnpm/action-setup@v3
         with:
           version: 9.0.6
           run_install: false
 
       - name: Install Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 20
           cache: 'pnpm'
diff --git a/.github/workflows/webcomponents.yml b/.github/workflows/webcomponents.yml
index 34a72a3a78..81164c941b 100644
--- a/.github/workflows/webcomponents.yml
+++ b/.github/workflows/webcomponents.yml
@@ -11,16 +11,16 @@ jobs:
   Examples:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v2
+        uses: pnpm/action-setup@v3
         with:
           version: 9.0.6
           run_install: false
 
       - name: Install Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 20
           cache: 'pnpm'
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ee9463f420..68ca680bb9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,158 @@
 # Changelog
 
+## v2.14.0
+
+[compare changes](https://github.com/dpc-sdp/ripple-framework/compare/v2.13.1...v2.14.0)
+
+
+### 🚀 Enhancements
+
+  - **@dpc-sdp/ripple-ui-core:** ✨  feature flag for long menu titles ([b67cab766](https://github.com/dpc-sdp/ripple-framework/commit/b67cab766))
+  - **@dpc-sdp/ripple-ui-maps:** Add clustering distance optional prop, default as current ([ed81faa17](https://github.com/dpc-sdp/ripple-framework/commit/ed81faa17))
+  - **@dpc-sdp/ripple-ui-maps:** Add map stories to demonstrate clustering distance (nearer/disabled) ([ad297e4e2](https://github.com/dpc-sdp/ripple-framework/commit/ad297e4e2))
+
+### 🩹 Fixes
+
+  - **@dpc-sdp/ripple-tide-api:** 🐛  fixed getTaxonomy only getting first 50 items ([70cea0223](https://github.com/dpc-sdp/ripple-framework/commit/70cea0223))
+  - **@dpc-sdp/ripple-tide-api:** 👽️  cheerio default export has been removed ([0b832893b](https://github.com/dpc-sdp/ripple-framework/commit/0b832893b))
+
+### 🏡 Chore
+
+  - **docs:** Update modules and links ([7bf5bd6c8](https://github.com/dpc-sdp/ripple-framework/commit/7bf5bd6c8))
+  - **docs:** Update NPM reference ([19ed68981](https://github.com/dpc-sdp/ripple-framework/commit/19ed68981))
+
+### ✅ Tests
+
+  - ✅  long menu title feature flag ([9b6a42fed](https://github.com/dpc-sdp/ripple-framework/commit/9b6a42fed))
+
+### ❤️  Contributors
+
+- Jason Smith <jason.smith@dpc.vic.gov.au>
+- Bryce Gilhome <bryce.gilhome@nowdigital.com.au>
+- Jeffrey Dowdle <jeffrey.dowdle@dpc.vic.gov.au>
+- David Featherston <david.featherstone@dpc.vic.gov.au>
+
+## v2.13.1
+
+[compare changes](https://github.com/dpc-sdp/ripple-framework/compare/v2.13.0...v2.13.1)
+
+
+### 🩹 Fixes
+
+  - **@dpc-sdp/ripple-tide-api:** 🐛  fixed getTaxonomy only getting first 50 items ([f46ed87fb](https://github.com/dpc-sdp/ripple-framework/commit/f46ed87fb))
+
+### ❤️  Contributors
+
+- Jeffrey Dowdle <jeffrey.dowdle@dpc.vic.gov.au>
+
+## v2.13.0
+
+[compare changes](https://github.com/dpc-sdp/ripple-framework/compare/v2.12.0...v2.13.0)
+
+
+### 🚀 Enhancements
+
+  - **@dpc-sdp/nuxt-ripple:** Add custom content rating text ([bdce60ca3](https://github.com/dpc-sdp/ripple-framework/commit/bdce60ca3))
+  - **@dpc-sdp/ripple-ui-core:** Make sure all table content is rtl ([7cc2831e4](https://github.com/dpc-sdp/ripple-framework/commit/7cc2831e4))
+  - **@dpc-sdp/nuxt-ripple:** Add fallback for legacy tide versions ([28d0cdce5](https://github.com/dpc-sdp/ripple-framework/commit/28d0cdce5))
+  - **@dpc-sdp/ripple-ui-core:** Support cell alignment ([63766f5cd](https://github.com/dpc-sdp/ripple-framework/commit/63766f5cd))
+  - ✨  create sdp-core content type pkg ([bb0a519a9](https://github.com/dpc-sdp/ripple-framework/commit/bb0a519a9))
+  - **@dpc-sdp/ripple-tide-search:** Add siteSearchContentTypes featureFlag ([1d2ab6f79](https://github.com/dpc-sdp/ripple-framework/commit/1d2ab6f79))
+  - **@dpc-sdp/ripple-tide-search:** Allow individual content types to be toggled on or off ([4cb50a565](https://github.com/dpc-sdp/ripple-framework/commit/4cb50a565))
+  - **@dpc-sdp/ripple-tide-search:** Allow address search function to be customised via JSON ([695b18cd1](https://github.com/dpc-sdp/ripple-framework/commit/695b18cd1))
+
+### 🩹 Fixes
+
+  - **@dpc-sdp/ripple-tide-search:** Add field_redirect_website check ([e6418d1c2](https://github.com/dpc-sdp/ripple-framework/commit/e6418d1c2))
+  - **@dpc-sdp/nuxt-ripple-analytics:** Add fallback origin in dataLayer for relative URLs ([76ee3d1de](https://github.com/dpc-sdp/ripple-framework/commit/76ee3d1de))
+  - **@dpc-sdp/ripple-tide-search:** Clear geolocation button errors on search or reset ([15e916abf](https://github.com/dpc-sdp/ripple-framework/commit/15e916abf))
+
+### 🏡 Chore
+
+  - **@dpc-sdp/ripple-ui-core:** Cleanup some console/linting warnings ([eb9311e4c](https://github.com/dpc-sdp/ripple-framework/commit/eb9311e4c))
+  - Update canary action to publish on release branches ([5aa2fec52](https://github.com/dpc-sdp/ripple-framework/commit/5aa2fec52))
+  - Remove develop branch from canary publish ([5542fe498](https://github.com/dpc-sdp/ripple-framework/commit/5542fe498))
+
+### ✅ Tests
+
+  - **nuxt-app:** Adding tests for analytics events ([33a499424](https://github.com/dpc-sdp/ripple-framework/commit/33a499424))
+  - **nuxt-app:** Adding test for field_redirect_website support ([badd972b2](https://github.com/dpc-sdp/ripple-framework/commit/badd972b2))
+
+### ❤️  Contributors
+
+- Jeffrey Dowdle <jeffrey.dowdle@dpc.vic.gov.au>
+- Dylankelly <dylan.kelly@dpc.vic.gov.au>
+- David Featherston <david.featherstone@dpc.vic.gov.au>
+- Jason Smith <jason.smith@dpc.vic.gov.au>
+
+## v2.12.0
+
+[compare changes](https://github.com/dpc-sdp/ripple-framework/compare/v2.11.1...v2.12.0)
+
+
+### 🚀 Enhancements
+
+  - **@dpc-sdp/ripple-tide-search:** Adds address search and refactors search suggestions ([46609e3a0](https://github.com/dpc-sdp/ripple-framework/commit/46609e3a0))
+  - ✨  extend formkit input library ([f93e47d7e](https://github.com/dpc-sdp/ripple-framework/commit/f93e47d7e))
+  - **@dpc-sdp/nuxt-ripple-cli:** Update action versions, respect GitHubs prerelease checkbox ([7c91a1dfd](https://github.com/dpc-sdp/ripple-framework/commit/7c91a1dfd))
+  - **@dpc-sdp/ripple-ui-maps:** Default map pin color to primary site color instead of red ([6c21be8a1](https://github.com/dpc-sdp/ripple-framework/commit/6c21be8a1))
+  - **@dpc-sdp/ripple-tide-search:** Added helper components for laying out result tables ([87a470be6](https://github.com/dpc-sdp/ripple-framework/commit/87a470be6))
+  - **@dpc-sdp/ripple-ui-core:** Use classes for list types, remove circle ([3627fb8b1](https://github.com/dpc-sdp/ripple-framework/commit/3627fb8b1))
+  - **@dpc-sdp/ripple-ui-core:** Update component tests ([07829674c](https://github.com/dpc-sdp/ripple-framework/commit/07829674c))
+  - **@dpc-sdp/ripple-tide-api:** Update list plugin ([e86005d53](https://github.com/dpc-sdp/ripple-framework/commit/e86005d53))
+  - **@dpc-sdp/ripple-ui-core:** Add file example to search results ([4a069a7fe](https://github.com/dpc-sdp/ripple-framework/commit/4a069a7fe))
+  - **@dpc-sdp/ripple-tide-api:** Use relative URLs for media files ([48199d668](https://github.com/dpc-sdp/ripple-framework/commit/48199d668))
+  - **@dpc-sdp/ripple-tide-search:** Allow specifying the url text key ([fed98ed31](https://github.com/dpc-sdp/ripple-framework/commit/fed98ed31))
+
+### 🩹 Fixes
+
+  - **@dpc-sdp/ripple-ui-core:** Fixed description list missing types ([db90aaceb](https://github.com/dpc-sdp/ripple-framework/commit/db90aaceb))
+  - **@dpc-sdp/ripple-tide-search:** Pass map deadspace to map results hook ([ed11a1468](https://github.com/dpc-sdp/ripple-framework/commit/ed11a1468))
+  - **@dpc-sdp/ripple-ui-maps:** Fixed centreMap util when it's given a custom zoom level ([ef6a21741](https://github.com/dpc-sdp/ripple-framework/commit/ef6a21741))
+  - **@dpc-sdp/nuxt-ripple:** Fallback to value if no URL exists ([b653e76c3](https://github.com/dpc-sdp/ripple-framework/commit/b653e76c3))
+  - **@dpc-sdp/ripple-tide-search:** Add variant prop to locationQueryConfig component ([717ca9985](https://github.com/dpc-sdp/ripple-framework/commit/717ca9985))
+
+### 💅 Refactors
+
+  - ♻️  move layer to nuxt-app ([fbffa9ac9](https://github.com/dpc-sdp/ripple-framework/commit/fbffa9ac9))
+
+### 📦 Build
+
+  - 👷  update actions to node 20 ([b51d24e9c](https://github.com/dpc-sdp/ripple-framework/commit/b51d24e9c))
+  - 👷  update actions to node 20 ([54b46e710](https://github.com/dpc-sdp/ripple-framework/commit/54b46e710))
+
+### 🏡 Chore
+
+  - **@dpc-sdp/ripple-tide-search:** Depricate old suggestions props ([9131e3a63](https://github.com/dpc-sdp/ripple-framework/commit/9131e3a63))
+  - **ripple-ui-forms-ext:** ⚗️  example layer for custom input ([03f5c3c60](https://github.com/dpc-sdp/ripple-framework/commit/03f5c3c60))
+  - Remove unneeded import ([dbc71a6fd](https://github.com/dpc-sdp/ripple-framework/commit/dbc71a6fd))
+  - **@dpc-sdp/nuxt-ripple:** Update label ([5d9dd42c6](https://github.com/dpc-sdp/ripple-framework/commit/5d9dd42c6))
+
+### ✅ Tests
+
+  - **@dpc-sdp/ripple-tide-search:** Added tests for location suggestions ([b6f1be8a4](https://github.com/dpc-sdp/ripple-framework/commit/b6f1be8a4))
+  - **@dpc-sdp/ripple-tide-webform:** ✅  fix unit test ([349ac75c4](https://github.com/dpc-sdp/ripple-framework/commit/349ac75c4))
+  - ✅  add cypress tests for form input extend ([4bdb5a5c4](https://github.com/dpc-sdp/ripple-framework/commit/4bdb5a5c4))
+
+### ❤️  Contributors
+
+- David Featherston <david.featherstone@dpc.vic.gov.au>
+- Jeffrey Dowdle <jeffrey.dowdle@dpc.vic.gov.au>
+- Jason Smith <jason.smith@dpc.vic.gov.au>
+
+## v2.11.1
+
+[compare changes](https://github.com/dpc-sdp/ripple-framework/compare/v2.11.0...v2.11.1)
+
+
+### 🩹 Fixes
+
+  - **@dpc-sdp/ripple-tide-news:** 🐛  added flag option to remove published time ([50c04d3e1](https://github.com/dpc-sdp/ripple-framework/commit/50c04d3e1))
+
+### ❤️  Contributors
+
+- Dylan Kelly <dylan.kelly@dpc.vic.gov.au>
+
 ## v2.11.0
 
 [compare changes](https://github.com/dpc-sdp/ripple-framework/compare/v2.10.3...v2.11.0)
diff --git a/docs/content/framework/4.core-modules.md b/docs/content/framework/4.core-modules.md
index 292a9c1411..dbcccdbf8e 100644
--- a/docs/content/framework/4.core-modules.md
+++ b/docs/content/framework/4.core-modules.md
@@ -4,37 +4,48 @@ description: A listing of all current core Ripple layers and packages
 layout: page
 ---
 
-View each package on NPM for their individual READMEs.
+View each package on GitHub package registry for their individual READMEs.
 
 ## Core UI Libraries
 
-- [`ripple-ui-core`](https://www.npmjs.com/package/@dpc-sdp/ripple-ui-core)
-- [`ripple-ui-forms`](https://www.npmjs.com/package/@dpc-sdp/ripple-ui-forms)
+- [`ripple-ui-core`](https://github.com/dpc-sdp/ripple-framework/pkgs/npm/ripple-ui-core)
+- [`ripple-ui-forms`](https://github.com/dpc-sdp/ripple-framework/pkgs/npm/ripple-ui-forms)
+- [`ripple-ui-maps`](https://github.com/dpc-sdp/ripple-framework/pkgs/npm/ripple-ui-maps)
 
 ## Tide API
 
-- [`ripple-tide-api`](https://www.npmjs.com/package/@dpc-sdp/ripple-tide-api)
+- [`ripple-tide-api`](https://github.com/dpc-sdp/ripple-framework/pkgs/npm/ripple-tide-api)
 
 ## Nuxt-ripple base layer
 
-- [`nuxt-ripple`](https://www.npmjs.com/package/@dpc-sdp/nuxt-ripple)
+- [`nuxt-ripple`](https://github.com/dpc-sdp/ripple-framework/pkgs/npm/nuxt-ripple)
 
 ## Core content types
 
-- [`ripple-tide-landing-page`](https://www.npmjs.com/package/@dpc-sdp/ripple-tide-landing-page)
-- [`ripple-tide-event`](https://www.npmjs.com/package/@dpc-sdp/ripple-tide-event)
-- [`ripple-tide-grant`](https://www.npmjs.com/package/@dpc-sdp/ripple-tide-grant)
-- [`ripple-tide-media`](https://www.npmjs.com/package/@dpc-sdp/ripple-tide-media)
-- [`ripple-tide-news`](https://www.npmjs.com/package/@dpc-sdp/ripple-tide-news)
-- [`ripple-tide-publication`](https://www.npmjs.com/package/@dpc-sdp/ripple-tide-publication)
+All core content types (and content related packages) are added through the `ripple-sdp-core` package
+
+- [`ripple-sdp-core`](https://github.com/dpc-sdp/ripple-framework/pkgs/npm/ripple-sdp-core)
+
+Below are the individual content type packages that are included in `ripple-sdp-core`:
+
+- [`ripple-tide-search`](https://github.com/dpc-sdp/ripple-framework/pkgs/npm/ripple-tide-search)
+- [`ripple-tide-webform`](https://github.com/dpc-sdp/ripple-framework/pkgs/npm/ripple-tide-webform)
+- [`ripple-tide-topic`](https://github.com/dpc-sdp/ripple-framework/pkgs/npm/ripple-tide-topic)
+- [`ripple-tide-landing-page`](https://github.com/dpc-sdp/ripple-framework/pkgs/npm/ripple-tide-landing-page)
+- [`ripple-tide-event`](https://github.com/dpc-sdp/ripple-framework/pkgs/npm/ripple-tide-event)
+- [`ripple-tide-grant`](https://github.com/dpc-sdp/ripple-framework/pkgs/npm/ripple-tide-grant)
+- [`ripple-tide-media`](https://github.com/dpc-sdp/ripple-framework/pkgs/npm/ripple-tide-media)
+- [`ripple-tide-news`](https://github.com/dpc-sdp/ripple-framework/pkgs/npm/ripple-tide-news)
+- [`ripple-tide-publication`](https://github.com/dpc-sdp/ripple-framework/pkgs/npm/ripple-tide-publication)
 
 ## Other core modules
 
-- [`ripple-tide-search`](https://www.npmjs.com/package/@dpc-sdp/ripple-tide-search)
-- [`nuxt-ripple-analytics`](https://www.npmjs.com/package/@dpc-sdp/nuxt-ripple-analytics)
-- [`nuxt-ripple-preview`](https://www.npmjs.com/package/@dpc-sdp/nuxt-ripple-preview)
+- [`nuxt-ripple-analytics`](https://github.com/dpc-sdp/ripple-framework/pkgs/npm/nuxt-ripple-analytics)
+- [`nuxt-ripple-preview`](https://github.com/dpc-sdp/ripple-framework/pkgs/npm/nuxt-ripple-preview)
 
 ## Scaffolding, testing and supporting packages
 
-- [`nuxt-ripple-cli`](https://www.npmjs.com/package/@dpc-sdp/nuxt-ripple-cli)
-- [`ripple-test-utils`](https://www.npmjs.com/package/@dpc-sdp/ripple-test-utils)
+- [`nuxt-ripple-cli`](https://github.com/dpc-sdp/ripple-framework/pkgs/npm/nuxt-ripple-cli)
+- [`ripple-test-utils`](https://github.com/dpc-sdp/ripple-framework/pkgs/npm/ripple-test-utils)
+- [`eslint-config-ripple`](https://github.com/dpc-sdp/ripple-framework/pkgs/npm/eslint-config-ripple)
+- [`stylelint-config-ripple`](https://github.com/dpc-sdp/ripple-framework/pkgs/npm/stylelint-config-ripple)
diff --git a/examples/nuxt-app/app.config.ts b/examples/nuxt-app/app.config.ts
index 5057aacc17..e5344eb6a0 100644
--- a/examples/nuxt-app/app.config.ts
+++ b/examples/nuxt-app/app.config.ts
@@ -35,6 +35,27 @@ export default defineAppConfig({
         // `dynamicValue` is used in a cypress test to ensure fallbackValues function are called
         dynamicValue: () => ['blue']
       },
+      suggestionsFunctions: {
+        exampleSuggestionsFn: async (query, args) => {
+          return [
+            {
+              id: '1',
+              name: `Test location - ${args.testArg} - 1`,
+              center: [144.9631, -37.8136]
+            },
+            {
+              id: '2',
+              name: `Test location - ${args.testArg} - 2`,
+              center: [-33.8688, 151.2093]
+            },
+            {
+              id: '2',
+              name: `With magic key`,
+              arcGISMagicKey: 'fake1234'
+            }
+          ]
+        }
+      },
       filterFunctions: {
         // `dummyFunctionFilter` is used in a cypress test to check that the correct parameters are passed to custom filter functions
         dummyFunctionFilter: (filterConfig, values) => {
diff --git a/examples/nuxt-app/cypress.config.mjs b/examples/nuxt-app/cypress.config.mjs
index 27edbe8967..96355fdc5e 100644
--- a/examples/nuxt-app/cypress.config.mjs
+++ b/examples/nuxt-app/cypress.config.mjs
@@ -12,7 +12,6 @@ export default defineConfig({
     baseUrl: 'http://localhost:3000',
     specPattern: '**/*.{feature,feature.ts}',
     supportFile: false,
-    supportFolder: './test',
     downloadsFolder: './test/downloads',
     fixturesFolder: './test/fixtures',
     videosFolder: './test/videos',
diff --git a/examples/nuxt-app/layers/ripple-ui-forms-ext/__test__/fixtures/webform.json b/examples/nuxt-app/layers/ripple-ui-forms-ext/__test__/fixtures/webform.json
new file mode 100644
index 0000000000..8218186cf1
--- /dev/null
+++ b/examples/nuxt-app/layers/ripple-ui-forms-ext/__test__/fixtures/webform.json
@@ -0,0 +1,155 @@
+{
+  "title": "Webform",
+  "changed": "2024-06-07T17:15:09+10:00",
+  "created": "2024-05-02T14:42:13+10:00",
+  "type": "landing_page",
+  "nid": "45fa8751-74af-43ee-9cb9-8a8fdee7e593",
+  "_sectionId": "8888",
+  "sidebar": {
+    "contacts": [],
+    "relatedLinks": [],
+    "whatsNext": [],
+    "socialShareNetworks": ["Facebook", "X", "LinkedIn"],
+    "siteSectionNav": null
+  },
+  "status": "published",
+  "topicTags": [
+    {
+      "text": "Demo Topic",
+      "url": "/topic/demo-topic"
+    }
+  ],
+  "siteSection": {
+    "id": 8888,
+    "name": "Demo Site",
+    "siteOverrides": {
+      "showQuickExit": null,
+      "theme": {},
+      "featureFlags": {}
+    }
+  },
+  "meta": {
+    "url": "/webform",
+    "langcode": "en",
+    "description": "Testing the landing page webform mapping",
+    "additional": [
+      {
+        "tag": "meta",
+        "attributes": {
+          "name": "title",
+          "content": "Webform | Single Digital Presence Content Management System"
+        }
+      },
+      {
+        "tag": "link",
+        "attributes": {
+          "rel": "canonical",
+          "href": "http://content-sdp.docker.internal/webform"
+        }
+      },
+      {
+        "tag": "meta",
+        "attributes": {
+          "property": "og:locale",
+          "content": "en-AU"
+        }
+      }
+    ],
+    "keywords": "",
+    "image": null
+  },
+  "showContentRating": true,
+  "summary": "Testing the landing page webform mapping",
+  "showHeroAcknowledgement": false,
+  "showInPageNav": false,
+  "showHeroImageCaption": false,
+  "showTopicTags": true,
+  "inPageNavHeadingLevel": "h2",
+  "background": "default",
+  "header": {
+    "title": "Webform",
+    "summary": "",
+    "links": {
+      "title": "",
+      "items": [],
+      "more": null
+    },
+    "backgroundImageCaption": "",
+    "theme": "default",
+    "logoImage": null,
+    "backgroundImage": null,
+    "cornerTop": null,
+    "cornerBottom": null,
+    "primaryAction": null,
+    "secondaryAction": null,
+    "secondaryActionLabel": ""
+  },
+  "primaryCampaign": null,
+  "secondaryCampaign": null,
+  "headerComponents": [],
+  "bodyComponents": [
+    {
+      "uuid": "986aca36-9a3a-408c-9455-c00396dcfb39",
+      "component": "TideLandingPageWebForm",
+      "id": 1795,
+      "title": "Input support",
+      "props": {
+        "title": "Input support",
+        "formId": "test_of_fields",
+        "hideFormOnSubmit": false,
+        "successMessageTitle": "Form submitted",
+        "successMessageHTML": "Thank you! Your response has been submitted.",
+        "errorMessageTitle": "Form not submitted",
+        "errorMessageHTML": "We are experiencing a server error. Please try again, otherwise contact us.",
+        "schema": [
+          {
+            "$formkit": "RplFormText",
+            "key": "name",
+            "name": "name",
+            "label": "Supported",
+            "id": "test_of_fields_name",
+            "validation": [["length", 0, 255]],
+            "validationMessages": {
+              "required": "Name is required",
+              "accepted": "Name is required",
+              "length": "You can enter a maximum of 255 characters"
+            }
+          },
+          {
+            "$formkit": "RplFormItem",
+            "key": "test",
+            "name": "test",
+            "label": "Extended",
+            "id": "test_of_fields_test",
+            "validation": [["length", 0, 255]],
+            "validationMessages": {
+              "required": "Item is required!",
+              "accepted": "Item is required",
+              "length": "You can enter a maximum of 255 characters"
+            }
+          },
+          {
+            "$el": "div",
+            "attrs": {
+              "class": "rpl-form__outer rpl-form__input--unsupported"
+            },
+            "children": ["\"signature\" is not yet supported"]
+          },
+          {
+            "$formkit": "RplFormActions",
+            "key": "actions",
+            "name": "submit",
+            "variant": "filled",
+            "id": "test_of_fields_actions",
+            "displayResetButton": false,
+            "validation": [],
+            "validationMessages": {
+              "required": "Submit is required",
+              "accepted": "Submit is required"
+            }
+          }
+        ]
+      }
+    }
+  ]
+}
diff --git a/examples/nuxt-app/layers/ripple-ui-forms-ext/__test__/forms-ext.feature b/examples/nuxt-app/layers/ripple-ui-forms-ext/__test__/forms-ext.feature
new file mode 100644
index 0000000000..810148551e
--- /dev/null
+++ b/examples/nuxt-app/layers/ripple-ui-forms-ext/__test__/forms-ext.feature
@@ -0,0 +1,20 @@
+Feature: Forms, extended
+
+  As a developer, I can add custom form inputs that are not provided in the core offering
+
+  Background:
+    Given the mock server has started
+    And the page endpoint for path "/webform" returns fixture "../../layers/ripple-ui-forms-ext/__test__/fixtures/webform" with status 200
+    And the site endpoint returns fixture "/site/reference" with status 200
+
+  @mockserver
+  Scenario: Custom input
+    Given I visit the page "/webform"
+    Then the landing page component "TideLandingPageWebForm" should exist
+    And a field labelled "Extended" should exist with the CSS class ".rpl-form__input--type-item"
+
+  @mockserver
+  Scenario: Unsupported input
+    Given I visit the page "/webform"
+    Then the landing page component "TideLandingPageWebForm" should exist
+    And an input of type "signature" is not yet supported
diff --git a/examples/nuxt-app/layers/ripple-ui-forms-ext/app.config.ts b/examples/nuxt-app/layers/ripple-ui-forms-ext/app.config.ts
new file mode 100644
index 0000000000..a596cbeb1f
--- /dev/null
+++ b/examples/nuxt-app/layers/ripple-ui-forms-ext/app.config.ts
@@ -0,0 +1,20 @@
+import { defineAppConfig } from '#imports'
+import itemMapping from './mapping/item'
+
+export default defineAppConfig({
+  ripple: {
+    customInputs: {
+      item: {
+        id: 'RplFormItem',
+        type: 'item',
+        formkitDefProps: {
+          type: 'input',
+          family: 'text',
+          props: ['placeholder', 'validationMeta', 'columnClasses', 'pii'],
+          forceTypeProp: 'text'
+        },
+        mapping: itemMapping
+      }
+    }
+  }
+})
diff --git a/examples/nuxt-app/layers/ripple-ui-forms-ext/components/global/RplFormItem.vue b/examples/nuxt-app/layers/ripple-ui-forms-ext/components/global/RplFormItem.vue
new file mode 100644
index 0000000000..3872e99a25
--- /dev/null
+++ b/examples/nuxt-app/layers/ripple-ui-forms-ext/components/global/RplFormItem.vue
@@ -0,0 +1,165 @@
+<script lang="ts">
+export default {
+  inheritAttrs: false
+}
+</script>
+
+<script setup lang="ts">
+import { computed, inject } from 'vue'
+import { useDebounceFn } from '@vueuse/core'
+// @ts-expect-error ts2305 local monorepo import
+import { useRippleEvent, type rplEventPayload } from '@dpc-sdp/ripple-ui-core'
+import { RplIcon } from '@dpc-sdp/ripple-ui-core/vue'
+import { sanitisePIIField } from '@dpc-sdp/ripple-ui-forms'
+
+interface Props {
+  id: string
+  disabled?: boolean
+  className?: string
+  value?: string
+  type?: string
+  name: string
+  label?: string
+  prefixIcon?: string
+  suffixIcon?: string
+  min?: number
+  max?: number
+  minlength?: number
+  maxlength?: number
+  variant?: 'default' | 'reverse'
+  invalid?: boolean
+  required?: boolean
+  centeredText?: boolean
+  globalEvents?: boolean
+  throttle?: number
+  pii?: boolean
+  onInput?: (payload: Event) => void
+  onBlur?: (payload: Event) => void
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  type: 'item',
+  className: 'rpl-form__input',
+  value: undefined,
+  label: undefined,
+  prefixIcon: undefined,
+  suffixIcon: undefined,
+  min: undefined,
+  max: undefined,
+  minlength: undefined,
+  maxlength: undefined,
+  disabled: false,
+  required: false,
+  invalid: false,
+  variant: 'default',
+  centeredText: false,
+  globalEvents: true,
+  throttle: 500,
+  pii: true,
+  onInput: () => null,
+  onBlur: () => null
+})
+
+const emit = defineEmits<{
+  (e: 'update', payload: rplEventPayload & { action: 'update' }): void
+}>()
+
+const { emitRplEvent } = useRippleEvent('rpl-form-input', emit)
+
+const form: { id: string; name: string } | undefined = inject('form')
+
+const classes = computed(() => {
+  return {
+    [`${props.className}`]: props.className,
+    [`${props.className}--${props.variant}`]: true,
+    [`${props.className}--type-${props.type}`]: props.type,
+    [`${props.className}--disabled`]: props.disabled,
+    [`${props.className}--centered`]: props.centeredText,
+    [`${props.className}--with-prefix-icon`]: props.prefixIcon,
+    [`${props.className}--with-suffix-icon`]: props.suffixIcon,
+    [`${props.className}--invalid`]: props.invalid
+  }
+})
+
+const handleChange = useDebounceFn(() => {
+  emitRplEvent(
+    'update',
+    {
+      action: 'update',
+      id: props.id,
+      type: props.type,
+      label: props?.label,
+      contextId: form?.id,
+      contextName: form?.name,
+      value: sanitisePIIField(props.pii, props?.value)
+    },
+    { global: props.globalEvents }
+  )
+}, props.throttle)
+</script>
+
+<template>
+  <div :class="classes">
+    <div class="rpl-form__input-wrap">
+      <RplIcon
+        v-if="prefixIcon"
+        :name="prefixIcon"
+        :class="`${props.className}-icon ${props.className}-icon__prefix`"
+        size="s"
+      >
+      </RplIcon>
+      <input
+        :id="id"
+        type="text"
+        class="rpl-u-focusable-outline"
+        :disabled="disabled"
+        :required="required"
+        :aria-required="required"
+        :aria-invalid="invalid"
+        v-bind="$attrs"
+        :name="name"
+        :value="value"
+        :min="min"
+        :max="max"
+        :minlength="minlength"
+        :maxlength="maxlength"
+        @blur="onBlur"
+        @input="onInput"
+        @change="handleChange"
+      />
+      <RplIcon
+        v-if="suffixIcon"
+        :name="suffixIcon"
+        :class="`${props.className}-icon ${props.className}-icon__suffix`"
+        size="s"
+      >
+      </RplIcon>
+      <span class="rpl-form__input--type-item-label">custom input</span>
+    </div>
+  </div>
+</template>
+
+<style>
+/* @import '@dpc-sdp/ripple-ui-forms/style'; */
+
+.rpl-form__input--type-item {
+  background: rgb(250 125 63);
+  padding: 1px;
+  border-radius: 5px;
+  border: 1px solid rgb(0 0 0 / 0.1);
+  color: rgb(0 0 0 / 0.1);
+}
+
+.rpl-form__input--type-item-label {
+  letter-spacing: -1px;
+  line-height: 0.7;
+  padding: 3px 0;
+  text-align: center;
+  align-self: center;
+  font-weight: bold;
+  margin: 0 5px;
+  border-top: 3px solid rgb(0 0 0 / 0.1);
+  border-bottom: 3px solid rgb(0 0 0 / 0.1);
+  font-size: var(--rpl-type-size-3);
+}
+</style>
diff --git a/examples/nuxt-app/layers/ripple-ui-forms-ext/mapping/item.ts b/examples/nuxt-app/layers/ripple-ui-forms-ext/mapping/item.ts
new file mode 100644
index 0000000000..9ac2320fb4
--- /dev/null
+++ b/examples/nuxt-app/layers/ripple-ui-forms-ext/mapping/item.ts
@@ -0,0 +1,30 @@
+import type { TideWebformElement } from '@dpc-sdp/ripple-tide-webform/types'
+import {
+  getValidationAndConditionals,
+  getInputIcons
+} from '@dpc-sdp/ripple-tide-webform/mapping/utils'
+
+const logger = {
+  warn: (message: string, props: { label: string }) => {
+    console.warn(props.label, message)
+  }
+}
+
+// Tide API mapping function
+export default (
+  fieldID: string,
+  field: TideWebformElement,
+  fieldKey: string
+) => ({
+  $formkit: 'RplFormItem',
+  key: fieldKey,
+  name: fieldKey,
+  label: field['#title'],
+  disabled: field['#disabled'],
+  placeholder: field['#placeholder'],
+  id: fieldID,
+  help: field['#description'] || field['#help_title'],
+  value: field['#default_value'],
+  ...getValidationAndConditionals(field, logger),
+  ...getInputIcons(field)
+})
diff --git a/examples/nuxt-app/layers/ripple-ui-forms-ext/nuxt.config.ts b/examples/nuxt-app/layers/ripple-ui-forms-ext/nuxt.config.ts
new file mode 100644
index 0000000000..3a774af39d
--- /dev/null
+++ b/examples/nuxt-app/layers/ripple-ui-forms-ext/nuxt.config.ts
@@ -0,0 +1,9 @@
+import { defineNuxtConfig } from 'nuxt/config'
+
+export default defineNuxtConfig({
+  hooks: {
+    'build:done': async () => {
+      console.info('Added ripple-ui-forms-ext components')
+    }
+  }
+})
diff --git a/examples/nuxt-app/layers/ripple-ui-forms-ext/package.json b/examples/nuxt-app/layers/ripple-ui-forms-ext/package.json
new file mode 100644
index 0000000000..66243bea10
--- /dev/null
+++ b/examples/nuxt-app/layers/ripple-ui-forms-ext/package.json
@@ -0,0 +1,16 @@
+{
+  "name": "@dpc-sdp/ripple-ui-forms-ext",
+  "description": "Custom form inputs",
+  "version": "2.10.1",
+  "license": "Apache-2.0",
+  "repository": "https://github.com/dpc-sdp/ripple-framework",
+  "main": "./nuxt.config.ts",
+  "type": "module",
+  "exports": {
+    ".": "./nuxt.config.ts"
+  },
+  "dependencies": {
+    "@dpc-sdp/ripple-tide-webform": "workspace:*",
+    "@dpc-sdp/ripple-ui-forms": "workspace:*"
+  }
+}
diff --git a/examples/nuxt-app/layers/ripple-ui-forms-ext/pages/_test/webform.vue b/examples/nuxt-app/layers/ripple-ui-forms-ext/pages/_test/webform.vue
new file mode 100644
index 0000000000..f50c50471d
--- /dev/null
+++ b/examples/nuxt-app/layers/ripple-ui-forms-ext/pages/_test/webform.vue
@@ -0,0 +1,12 @@
+<template>
+  <TideLandingPage :site="site as any" :page="page as any">
+    <template #sidebar> </template>
+  </TideLandingPage>
+</template>
+
+<script setup lang="ts">
+import page from '../../__test__/fixtures/webform.json'
+import { useTideSite } from '#imports'
+
+const site = await useTideSite()
+</script>
diff --git a/examples/nuxt-app/layers/ripple-ui-forms-ext/tsconfig.json b/examples/nuxt-app/layers/ripple-ui-forms-ext/tsconfig.json
new file mode 100644
index 0000000000..99fbedd0b0
--- /dev/null
+++ b/examples/nuxt-app/layers/ripple-ui-forms-ext/tsconfig.json
@@ -0,0 +1,3 @@
+{
+  "extends": "./../../.nuxt/tsconfig.json"
+}
diff --git a/examples/nuxt-app/nuxt.config.ts b/examples/nuxt-app/nuxt.config.ts
index 16c703c7e2..1e31a21e82 100644
--- a/examples/nuxt-app/nuxt.config.ts
+++ b/examples/nuxt-app/nuxt.config.ts
@@ -19,15 +19,8 @@ export default defineNuxtConfig({
     '@dpc-sdp/nuxt-ripple',
     '@dpc-sdp/nuxt-ripple-analytics',
     '@dpc-sdp/nuxt-ripple-preview',
-    '@dpc-sdp/ripple-tide-event',
-    '@dpc-sdp/ripple-tide-topic',
-    '@dpc-sdp/ripple-tide-landing-page',
-    '@dpc-sdp/ripple-tide-grant',
-    '@dpc-sdp/ripple-tide-publication',
-    '@dpc-sdp/ripple-tide-media',
-    '@dpc-sdp/ripple-tide-news',
-    '@dpc-sdp/ripple-tide-search',
-    '@dpc-sdp/ripple-tide-webform'
+    '@dpc-sdp/ripple-sdp-core',
+    './layers/ripple-ui-forms-ext'
   ],
   // Nuxt devtools
   sourcemap: true,
diff --git a/examples/nuxt-app/package.json b/examples/nuxt-app/package.json
index e82065a2ba..81a1ec4fd1 100644
--- a/examples/nuxt-app/package.json
+++ b/examples/nuxt-app/package.json
@@ -25,15 +25,7 @@
     "@dpc-sdp/nuxt-ripple-analytics": "workspace:*",
     "@dpc-sdp/nuxt-ripple-cli": "workspace:*",
     "@dpc-sdp/nuxt-ripple-preview": "workspace:*",
-    "@dpc-sdp/ripple-tide-event": "workspace:*",
-    "@dpc-sdp/ripple-tide-grant": "workspace:*",
-    "@dpc-sdp/ripple-tide-landing-page": "workspace:*",
-    "@dpc-sdp/ripple-tide-media": "workspace:*",
-    "@dpc-sdp/ripple-tide-news": "workspace:*",
-    "@dpc-sdp/ripple-tide-publication": "workspace:*",
-    "@dpc-sdp/ripple-tide-search": "workspace:*",
-    "@dpc-sdp/ripple-tide-topic": "workspace:*",
-    "@dpc-sdp/ripple-tide-webform": "workspace:*",
+    "@dpc-sdp/ripple-sdp-core": "workspace:*",
     "@dpc-sdp/ripple-ui-maps": "workspace:*"
   },
   "devDependencies": {
diff --git a/examples/nuxt-app/test/features/landingpage/page-components.feature b/examples/nuxt-app/test/features/landingpage/page-components.feature
index 355ffaa933..6001bcc557 100644
--- a/examples/nuxt-app/test/features/landingpage/page-components.feature
+++ b/examples/nuxt-app/test/features/landingpage/page-components.feature
@@ -17,6 +17,12 @@ Feature: Home page
       | Accordion #1 | Test rich text content #1 |
       | Accordion #2 | Test rich text content #2 |
     And the accordion with ID "972" should display the description "Test accordion description"
+    When I click the accordion item "Accordion #1" in accordion with ID "accordion-972"
+    When I click the accordion item "Accordion #1" in accordion with ID "accordion-972"
+    Then the dataLayer should include the following events
+      | event           | element_id        | element_text | name                 | component     |
+      | open_accordion  | accordion-972-970 | Accordion #1 | Test accordion title | rpl-accordion |
+      | close_accordion | accordion-972-970 | Accordion #1 | Test accordion title | rpl-accordion |
 
   @mockserver
   Scenario: Page component - Accordion (Open/close all)
@@ -25,6 +31,10 @@ Feature: Home page
 
     When I click the close all button on accordion with ID "accordion-972"
     Then all accordion items in accordion ID "accordion-972" should be hidden
+    And the dataLayer should include the following events
+      | event               | element_id    | element_text | name                 | component     |
+      | open_accordion_all  | accordion-972 | Open all     | Test accordion title | rpl-accordion |
+      | close_accordion_all | accordion-972 | Close all    | Test accordion title | rpl-accordion |
 
   @mockserver
   Scenario: Page component - Promo card
@@ -54,7 +64,6 @@ Feature: Home page
       | displayStyle | title               | content            | image                    |
       | featured     | Nav card (featured) | Sample description | /placeholders/medium.png |
 
-
   @mockserver
   Scenario: Page component - Key dates card
     Then a key dates card with ID "988" should exist with the title "Key calendar dates"
@@ -68,10 +77,10 @@ Feature: Home page
   Scenario: Page component - Timeline
     Then a timeline with ID "992" should exist with the title "Test timeline title"
     Then a timeline with ID "992" should exist with the following items
-      | title             | date                     | summary                   | url                 | image                    |
-      | Milestone 1 title | 2 June to 11 November    | Milestone 1 summary field | /test-destination-1 | /placeholders/small.png  |
-      | Milestone 2 title | 4 October to 17 November | Milestone 2 summary field | /test-destination-2 |                          |
-      | Milestone 3 title |                          | Milestone 3 text          |                     |                          |
+      | title             | date                     | summary                   | url                 | image                   |
+      | Milestone 1 title | 2 June to 11 November    | Milestone 1 summary field | /test-destination-1 | /placeholders/small.png |
+      | Milestone 2 title | 4 October to 17 November | Milestone 2 summary field | /test-destination-2 |                         |
+      | Milestone 3 title |                          | Milestone 3 text          |                     |                         |
 
   @mockserver
   Scenario: Page component - Call to action
@@ -106,6 +115,11 @@ Feature: Home page
     Then the active slide on "1155" should be "1"
     And the pagination button "Previous" on "1155" should be disabled
 
+    And the dataLayer should include the following events
+      | event         | element_id          | element_text | component         |
+      | paginate_next | page-component-1155 | Next         | rpl-card-carousel |
+      | paginate_prev | page-component-1155 | Previous     | rpl-card-carousel |
+
   @mockserver
   Scenario: Page component - Media Gallery
     Given a media gallery with ID "1056" should exist with the following gallery items
@@ -124,6 +138,10 @@ Feature: Home page
     And the pagination button "Next" on "1056" should be disabled
     When I click the button "Previous" on the component with ID "1056"
     Then the active slide on "1056" should be "2"
+    And the dataLayer should include the following events
+      | event         | element_id          | element_text | label           | component         |
+      | paginate_next | page-component-1056 | Next         | Media title two | rpl-media-gallery |
+      | paginate_prev | page-component-1056 | Previous     | Media title two | rpl-media-gallery |
 
   @mockserver
   Scenario: Page component - Media Gallery (Modal)
@@ -131,6 +149,10 @@ Feature: Home page
     Then the "media-gallery" modal should be "visible"
     When I click the "media-gallery" modal button "Close"
     Then the "media-gallery" modal should be "hidden"
+    And the dataLayer should include the following events
+      | event            | element_id          | element_text                      | label           | component         |
+      | enter_fullscreen | page-component-1056 | View 'Media title one' fullscreen | Media title one | rpl-media-gallery |
+      | exit_fullscreen  | page-component-1056 | Close                             | Media title one | rpl-media-gallery |
 
   @mockserver
   Scenario: Page component - Data Table
@@ -157,3 +179,29 @@ Feature: Home page
       | title    | content          | image                    | url                 |
       | Card one | Card one summary | /placeholders/medium.png | /landing-page-cc-2  |
       | Card two | Card two summary | /placeholders/medium.png | https://google.com/ |
+
+  @mockserver
+  Scenario: Page component - Complex image/Media Embed
+    Given a media embed with ID "1951" should exist
+    Then the media embed image for "1951" should be "/placeholders/medium.png"
+    When I click the action "More info" for media embed "1951"
+    Then the extra data for media embed "1951" should be visible
+    When I click the action "More info" for media embed "1951"
+    Then the extra data for media embed "1951" should be hidden
+
+    When I click the action "Fullscreen" for media embed "1951"
+    Then the "media-embed" modal should be "visible"
+    When I click the "media-embed" modal button "Close"
+    Then the "media-embed" modal should be "hidden"
+
+    And the dataLayer should include the following events
+      | event            | element_id          | element_text | label         | component       |
+      | open_data        | page-component-1951 | More info    | Complex image | rpl-media-embed |
+      | close_data       | page-component-1951 | More info    | Complex image | rpl-media-embed |
+      | enter_fullscreen | page-component-1951 | Fullscreen   | Complex image | rpl-media-embed |
+      | exit_fullscreen  | page-component-1951 | Close        | Complex image | rpl-media-embed |
+
+    When I trigger a click for the action "Download it" on the media embed "1951"
+    Then the dataLayer should include the following events
+      | event         | element_id          | element_text | label         | file_name  | file_extension | type  | component       |
+      | file_download | page-component-1951 | Download it  | Complex image | medium.png | png            | image | rpl-media-embed |
diff --git a/examples/nuxt-app/test/features/maps/geolocate.feature b/examples/nuxt-app/test/features/maps/geolocate.feature
new file mode 100644
index 0000000000..4f0ccb5696
--- /dev/null
+++ b/examples/nuxt-app/test/features/maps/geolocate.feature
@@ -0,0 +1,34 @@
+Feature: Custom collection map component
+
+  I want to display a map of features from an indexed data pipeline
+
+  Background:
+    Given the site endpoint returns fixture "/site/vic" with status 200
+    And the search autocomplete request is stubbed with "/search-listing/suggestions/none" fixture
+    Given I am using a "macbook-16" device
+    Given the "/api/tide/elasticsearch/elasticsearch_index_develop_node/_search" aggregation request is stubbed with fixture "/map-table/vsba/aggregations" and status 200 as alias "aggReq"
+    Given the "/test-map-shape-layer" network request is stubbed with fixture "/maps/sample-shapes"
+      | method | status |
+      | GET    | 200    |
+    Given the "https://base.maps.vic.gov.au/service*" network request is stubbed with fixture "/maps/service.png"
+      | method | status |
+      | GET    | 200    |
+
+  @mockserver
+  Scenario: The geolocate button is hidden when not enabled
+    Given I load the page fixture with "/maps/basic-page"
+    Given the geolocation button is not enabled
+    And the page endpoint for path "/map" returns the loaded fixture
+    And the "/api/tide/elasticsearch/elasticsearch_index_develop_node/_search" network request is delayed by 1000 milliseconds and stubbed with fixture "/site/search-response", status 200 and alias "searchReq"
+    Given I visit the page "/map"
+
+    Then the geolocate button is hidden
+
+  @mockserver
+  Scenario: The geolocate button is shown when enabled
+    Given I load the page fixture with "/maps/basic-page"
+    Given the geolocation button is enabled
+    And the page endpoint for path "/map" returns the loaded fixture
+    And the "/api/tide/elasticsearch/elasticsearch_index_develop_node/_search" network request is delayed by 1000 milliseconds and stubbed with fixture "/site/search-response", status 200 and alias "searchReq"
+    Given I visit the page "/map"
+    Then the geolocate button is displayed
diff --git a/examples/nuxt-app/test/features/maps/suggestions.feature b/examples/nuxt-app/test/features/maps/suggestions.feature
new file mode 100644
index 0000000000..dd503ee9be
--- /dev/null
+++ b/examples/nuxt-app/test/features/maps/suggestions.feature
@@ -0,0 +1,70 @@
+Feature: Suggestions
+
+  I want to be able to customise the suggestions for location search
+
+  Background:
+    Given the site endpoint returns fixture "/site/vic" with status 200
+    And the location autocomplete request is stubbed with "/maps/example-suburbs-response" fixture
+    Given I am using a "macbook-16" device
+    Given the "/api/tide/elasticsearch/elasticsearch_index_develop_node/_search" aggregation request is stubbed with fixture "/map-table/vsba/aggregations" and status 200 as alias "aggReq"
+    Given the "/test-map-shape-layer" network request is stubbed with fixture "/maps/sample-shapes"
+      | method | status |
+      | GET    | 200    |
+    Given the "https://base.maps.vic.gov.au/service*" network request is stubbed with fixture "/maps/service.png"
+      | method | status |
+      | GET    | 200    |
+    Given the ArcGIS findAddressCandidates endpoint returns "/maps/arcgis-address-candidates" fixture
+
+  @mockserver
+  Scenario: Default
+    Given I load the page fixture with "/maps/basic-page"
+    Given the page endpoint for path "/map" returns the loaded fixture
+    Given the "/api/tide/elasticsearch/elasticsearch_index_develop_node/_search" network request is stubbed with fixture "/maps/simple-map-results" and status 200 as alias "searchReq"
+    Given I visit the page "/map?activeTab=listing"
+    And I wait 2 seconds
+    And I type "bays" into the location search bar
+    And the search suggestions displayed should include
+      | Bayswater North |
+      | Bayswater       |
+    And I wait 2 seconds
+
+  @mockserver
+  Scenario: Custom suggestions function
+    Given I load the page fixture with "/maps/basic-page"
+    And a custom suggestions function called "exampleSuggestionsFn" is used
+    Given the page endpoint for path "/map" returns the loaded fixture
+    Given the "/api/tide/elasticsearch/elasticsearch_index_develop_node/_search" network request is stubbed with fixture "/maps/simple-map-results" and status 200 as alias "searchReq"
+    Given I visit the page "/map?activeTab=listing"
+    And I wait 2 seconds
+    And I type "bays" into the location search bar
+    And the search suggestions displayed should include
+      | Test location - testValue - 1 |
+      | Test location - testValue - 2 |
+      | With magic key                |
+    And I wait 2 seconds
+    And I click the search suggestion labelled "Test location - testValue - 1"
+    Then the URL should reflect that the location has the following:
+      | key  | value                         |
+      | id   | 1                             |
+      | name | Test location - testValue - 1 |
+
+  @mockserver
+  Scenario: Custom suggestions function with ArcGIS magic keys
+    Given I load the page fixture with "/maps/basic-page"
+    And a custom suggestions function called "exampleSuggestionsFn" is used
+    Given the page endpoint for path "/map" returns the loaded fixture
+    Given the "/api/tide/elasticsearch/elasticsearch_index_develop_node/_search" network request is stubbed with fixture "/maps/simple-map-results" and status 200 as alias "searchReq"
+    Given I visit the page "/map?activeTab=listing"
+    And I wait 2 seconds
+    And I type "bays" into the location search bar
+    And the search suggestions displayed should include
+      | Test location - testValue - 1 |
+      | Test location - testValue - 2 |
+      | With magic key                |
+    And I wait 2 seconds
+    And I click the search suggestion labelled "With magic key"
+    Then the URL should reflect that the location has the following:
+      | key  | value                           |
+      | id   | fake1234                        |
+      | name | 1234 Fake St Fakeville Vic 3000 |
+
diff --git a/examples/nuxt-app/test/features/publication/publication.feature b/examples/nuxt-app/test/features/publication/publication.feature
index d50e93c1b1..1b83d5d2d1 100644
--- a/examples/nuxt-app/test/features/publication/publication.feature
+++ b/examples/nuxt-app/test/features/publication/publication.feature
@@ -22,6 +22,14 @@ Feature: Publication page
       | The Victorian Skills Plan 2022 into 2023 actions and initiatives | The 25 initiatives scheduled to start in year one are well underway.                    | /victorian-skills-plan-2023-implementation-update/2022-victorian-skills-plan-actions-and-initiatives   |
       | Promoting post-secondary education skills and career pathways    | The first priority area's actions and initiatives from the Victorian Skills Plan 2022.  | /victorian-skills-plan-2023-implementation-update/promoting-post-secondary-education-skills-and-career |
       | Lifting participation in education and training                  | The second priority area's actions and initiatives from the Victorian Skills Plan 2022. | /victorian-skills-plan-2023-implementation-update/lifting-participation-education-and-training         |
+    And the publication should display the following documents
+      | title                                                    | url                                                                               | type | size    |
+      | Victorian Skills Plan Implementation Update October 2023 | /sites/default/files/2023-10/16686-VSA-Implementation-Plan-Section_FA_Digital.pdf | pdf  | 4.61 MB |
+      | Print full document                                      | /victorian-skills-plan-2023-implementation-update/print-all                       |      |         |
+    When I click on the document "Victorian Skills Plan Implementation Update October 2023"
+    Then the dataLayer should include the following events
+      | event         | element_text                                             | file_name                                            | file_extension | file_size | component |
+      | file_download | Victorian Skills Plan Implementation Update October 2023 | 16686-VSA-Implementation-Plan-Section_FA_Digital.pdf | pdf            | 4.61 MB   | rpl-file  |
 
   @mockserver
   Example: Publication child
@@ -29,6 +37,10 @@ Feature: Publication page
     Then the title should be "The Victorian Skills Plan 2022 into 2023 actions and initiatives"
     And there should be a page link with a title of "Previous" and description text of "Victorian Skills Plan Implementation Update"
     And there should be a page link with a title of "Next" and description text of "Promoting post-secondary education skills and career pathways"
+    And the publication should display the following documents
+      | title                                                    | url                                                                               | type | size    |
+      | Victorian Skills Plan Implementation Update October 2023 | /sites/default/files/2023-10/16686-VSA-Implementation-Plan-Section_FA_Digital.pdf | pdf  | 4.61 MB |
+      | Print full document                                      | /victorian-skills-plan-2023-implementation-update/print-all                       |      |         |
 
   @mockserver
   Example: Publication print all
diff --git a/examples/nuxt-app/test/features/search-listing/list.feature b/examples/nuxt-app/test/features/search-listing/list.feature
index 6a40b233c2..5a4026b44d 100644
--- a/examples/nuxt-app/test/features/search-listing/list.feature
+++ b/examples/nuxt-app/test/features/search-listing/list.feature
@@ -20,10 +20,10 @@ Feature: List layout
     And the search network request should be called with the "/search-listing/list/request" fixture
     And the search listing results count should read "Displaying 1-9 of 124 results"
     And the search listing results should have following items:
-      | title                    | content                                       | component          |
-      | 2-BE-event-1             | The ingenious hero who travelled far and wide | tide-search-result |
-      | 5-BE-land-3 Landing Page | Outside thundered the approaching surf of war | tide-search-result |
-      | Accessibility - demo     | Accessibility information about this website. | tide-search-result |
+      | title                    | content                                       | url                                     | component          |
+      | 2-BE-event-1             | The ingenious hero who travelled far and wide | /2-be-event-1                           | tide-search-result |
+      | 5-BE-land-3 Landing Page | Outside thundered the approaching surf of war | /5-be-land-3-landing-page-complete-test | tide-search-result |
+      | Accessibility - demo     | Accessibility information about this website. | https://vic.gov.au/page                 | tide-search-result |
 
   @mockserver
   Example: A custom skeleton loader can be use for list result items
diff --git a/examples/nuxt-app/test/features/search-listing/table.feature b/examples/nuxt-app/test/features/search-listing/table.feature
index d338bbf87a..0cb8c0a8c5 100644
--- a/examples/nuxt-app/test/features/search-listing/table.feature
+++ b/examples/nuxt-app/test/features/search-listing/table.feature
@@ -59,7 +59,7 @@ Feature: Table layout
     Then the tables extra content should contain the label "Funded for" and text "Multicultural Service"
     And the tables extra content should contain the label "Email", value "contact@africanfamilyservices.org.au" and link "mailto:contact@africanfamilyservices.org.au"
     And the tables extra content should contain the label "Phone", value "03 9602 5046" and link "tel:03 9602 5046"
-    And the tables extra content should contain the label "Website", value "http://africanfamilyservices.org.au/#contact-us" and link "http://africanfamilyservices.org.au/#contact-us"
+    And the tables extra content should contain the label "Website", value "African Family Services" and link "http://africanfamilyservices.org.au/#contact-us"
     And the tables extra content should contain the text "Includes statewide service"
     And the tables extra content should contain the class "rpl-tag--dark"
     And the table row with text "Department with no extra content" should not display more information
diff --git a/examples/nuxt-app/test/features/site/analytics.feature b/examples/nuxt-app/test/features/site/analytics.feature
new file mode 100644
index 0000000000..694c88aaab
--- /dev/null
+++ b/examples/nuxt-app/test/features/site/analytics.feature
@@ -0,0 +1,14 @@
+Feature: Analytics
+
+  Background:
+    Given the site endpoint returns fixture "/site/reference" with status 200
+
+  @mockserver
+  Scenario: DataLayer events
+    Given the site endpoint returns fixture "/site/reference" with status 200
+    And the page endpoint for path "/" returns fixture "/landingpage/home" with status 200
+    Given I visit the page "/"
+
+    Then the dataLayer should include the following events
+      | event       | page_title        | page_url | content_type |
+      | routeChange | Demo Landing Page | /        | landing_page |
diff --git a/examples/nuxt-app/test/features/site/search.feature b/examples/nuxt-app/test/features/site/search.feature
index a860445d10..4a86154c6d 100644
--- a/examples/nuxt-app/test/features/site/search.feature
+++ b/examples/nuxt-app/test/features/site/search.feature
@@ -1,10 +1,8 @@
 Feature: Site search
 
-  Background:
-    Given the site endpoint returns fixture "/site/reference" with status 200
-
   @mockserver
   Example: Display and manage site search results
+    Given the site endpoint returns fixture "/site/reference" with status 200
     Given the "/api/tide/search/**" network request is delayed by 500 milliseconds and stubbed with fixture "/site/search-response", status 200 and alias "siteSearchReq"
     When I visit the page "/search?q=demo"
     Then the search listing skeleton should display 10 items with the class "tide-search-result-skeleton"
@@ -35,8 +33,22 @@ Feature: Site search
     Then the filters toggle should show 0 applied filters
     And the search input should have the value ""
 
+  @mockserver
+  Example: Overrides site search content types with feature flag
+    Given the "/api/tide/search/**" network request is stubbed with fixture "/site/search-response" and status 200 as alias "siteSearchReq"
+    Then I load the site fixture with "/site/reference"
+    And the feature flag "search.contentTypes.grant" is set to "false"
+    And the feature flag "search.contentTypes.product" is set to "true"
+    And the site endpoint returns the loaded fixture
+
+    When I visit the page "/search?q=demo"
+    Then I toggle the search listing filters section
+    And I clear the search filters
+    Then the network request "siteSearchReq" should be called with the "/site/search-request-content-types" fixture
+
   @mockserver
   Example: Search bar max input length
+    Given the site endpoint returns fixture "/site/reference" with status 200
     Given the "/api/tide/search/**" network request is stubbed with fixture "/site/search-response" and status 200 as alias "siteSearchReq"
     When I visit the page "/search"
     Then the search input should be have a max length of 128
diff --git a/examples/nuxt-app/test/features/site/shared-elements.feature b/examples/nuxt-app/test/features/site/shared-elements.feature
index 0f967b88eb..6fea7fa727 100644
--- a/examples/nuxt-app/test/features/site/shared-elements.feature
+++ b/examples/nuxt-app/test/features/site/shared-elements.feature
@@ -83,6 +83,28 @@ Feature: Shared site elements
       | Demo Topic | /topic/demo-topic |
       | Demo Tag   | /tags/demo-tag    |
 
+  @mockserver
+  Scenario: Content Rating (visible)
+    Given the site endpoint returns fixture "/site/shared-elements" with status 200
+    And I load the page fixture with "/landingpage/home"
+    And the content rating form is enabled
+    Then the page endpoint for path "/page" returns the loaded fixture
+
+    Given I visit the page "/page"
+    Then the content rating form should be displayed
+    And I click the content rating option labelled "Yes"
+    Then the content rating form should display the custom text "Test custom rating text."
+
+  @mockserver
+  Scenario: Content Rating (hidden)
+    Given the site endpoint returns fixture "/site/shared-elements" with status 200
+    And I load the page fixture with "/landingpage/home"
+    And the content rating form is disabled
+    Then the page endpoint for path "/page" returns the loaded fixture
+
+    Given I visit the page "/page"
+    Then the content rating form should not be displayed
+
   @mockserver
   Scenario: Footer
     Given the site endpoint returns fixture "/site/shared-elements" with status 200
diff --git a/examples/nuxt-app/test/features/site/theme.feature b/examples/nuxt-app/test/features/site/theme.feature
index 3583731f94..28cd35ddb4 100644
--- a/examples/nuxt-app/test/features/site/theme.feature
+++ b/examples/nuxt-app/test/features/site/theme.feature
@@ -55,6 +55,20 @@ Feature: Site theme
     Given I visit the page "/"
     Then the last updated date should not be displayed
 
+  @mockserver
+  Scenario: Default behaviour for long link titles in the primary navigation
+    Given the site endpoint returns fixture "/site/primary-nav-wrap" with status 200
+    And the page endpoint for path "/" returns fixture "/landingpage/image-banner" with status 200
+    Given I visit the page "/"
+    Then the primary nav links should wrap
+
+  @mockserver
+  Scenario: Feature flag to force multi-line links to render on a single line in the primary navigation
+    Given the site endpoint returns fixture "/site/primary-nav-nowrap" with status 200
+    And the page endpoint for path "/" returns fixture "/landingpage/image-banner" with status 200
+    Given I visit the page "/"
+    Then the primary nav links should not wrap
+
   @mockserver
   Scenario: Favicon and app icons are set correctly
     Given the site endpoint returns fixture "/site/reference" with status 200
diff --git a/examples/nuxt-app/test/fixtures/landingpage/home.json b/examples/nuxt-app/test/fixtures/landingpage/home.json
index ada9c00fd0..f2e982bbd0 100644
--- a/examples/nuxt-app/test/fixtures/landingpage/home.json
+++ b/examples/nuxt-app/test/fixtures/landingpage/home.json
@@ -907,6 +907,25 @@
           }
         ]
       }
+    },
+    {
+      "uuid": "5cb51ee5-a63f-433e-92a6-017b92ce37fe",
+      "component": "TideLandingPageMediaEmbed",
+      "id": "1951",
+      "props": {
+        "title": "Complex image",
+        "caption": "Source by the Department",
+        "src": "/placeholders/medium.png",
+        "dataLabel": "More info",
+        "dataContent": "<p>Ex eiusmod quis pariatur ipsum exercitation est velit eu magna.</p>",
+        "fullscreenLabel": "Fullscreen",
+        "downloadUrl": "/placeholders/medium.png",
+        "downloadLabel": "Download it",
+        "type": "image",
+        "variant": "complex",
+        "allowFullscreen": true,
+        "showTitle": true
+      }
     }
   ],
   "meta": {
diff --git a/examples/nuxt-app/test/fixtures/maps/arcgis-address-candidates.json b/examples/nuxt-app/test/fixtures/maps/arcgis-address-candidates.json
new file mode 100644
index 0000000000..87552915cb
--- /dev/null
+++ b/examples/nuxt-app/test/fixtures/maps/arcgis-address-candidates.json
@@ -0,0 +1,23 @@
+{
+  "spatialReference": {
+    "wkid": 4283,
+    "latestWkid": 4283
+  },
+  "candidates": [
+    {
+      "address": "1234 FAKE ST, FAKEVILLE VIC 3000",
+      "location": {
+        "x": 143.49399077922746,
+        "y": -38.50295307104747
+      },
+      "score": 100,
+      "attributes": {},
+      "extent": {
+        "xmin": 143.4921921351353,
+        "ymin": -38.50475171513962,
+        "xmax": 143.49578942331962,
+        "ymax": -38.501154426955324
+      }
+    }
+  ]
+}
diff --git a/examples/nuxt-app/test/fixtures/maps/basic-page.json b/examples/nuxt-app/test/fixtures/maps/basic-page.json
index 1a711df835..7bc59eb4d0 100644
--- a/examples/nuxt-app/test/fixtures/maps/basic-page.json
+++ b/examples/nuxt-app/test/fixtures/maps/basic-page.json
@@ -91,6 +91,7 @@
           "index": "elasticsearch_index_develop_node",
           "resultsPerPage": 5,
           "displayMapTab": true,
+          "formTheme": "reverse",
           "labels": {
             "submit": "Search",
             "placeholder": "Search by postcode or suburb"
@@ -196,12 +197,12 @@
             "props": {
               "columns": [
                 {
-                  "label": "School name",
-                  "component": "TideSearchListingTableLink"
+                  "label": "Title",
+                  "objectKey": "test_title"
                 },
                 {
-                  "label": "Suburb",
-                  "objectKey": "field_suburb"
+                  "label": "Description",
+                  "objectKey": "description"
                 }
               ]
             }
diff --git a/examples/nuxt-app/test/fixtures/maps/example-suburbs-response.json b/examples/nuxt-app/test/fixtures/maps/example-suburbs-response.json
new file mode 100644
index 0000000000..2040bf329f
--- /dev/null
+++ b/examples/nuxt-app/test/fixtures/maps/example-suburbs-response.json
@@ -0,0 +1,89 @@
+{
+  "took": 5,
+  "timed_out": false,
+  "_shards": {
+    "total": 2,
+    "successful": 2,
+    "skipped": 0,
+    "failed": 0
+  },
+  "hits": {
+    "total": {
+      "value": 2,
+      "relation": "eq"
+    },
+    "max_score": 1.0,
+    "hits": [
+      {
+        "_index": ".ent-search-engine-documents-vicpol-postcode-localities",
+        "_id": "doc-661493669bd65fde1ab9b791",
+        "_score": 1.0,
+        "_ignored": [
+          "name.date",
+          "bbox.location",
+          "bbox.date",
+          "center.date",
+          "lga.date",
+          "name.location",
+          "center.float",
+          "lga.float",
+          "name.float",
+          "lga.location",
+          "areatype.location",
+          "postcode.date",
+          "areatype.float",
+          "areatype.date"
+        ],
+        "_source": {
+          "name": "Bayswater North",
+          "areatype": "locality",
+          "center": "-37.8268821,145.2836623",
+          "bbox": [
+            "145.25846667091363",
+            "-37.83800461846399",
+            "145.30593610877344",
+            "-37.813258938042594"
+          ],
+          "postcode": ["3153"],
+          "lga": ["Maroondah City"],
+          "id": "doc-661493669bd65fde1ab9b791"
+        }
+      },
+      {
+        "_index": ".ent-search-engine-documents-vicpol-postcode-localities",
+        "_id": "doc-661493669bd65fde1ab9b790",
+        "_score": 1.0,
+        "_ignored": [
+          "name.date",
+          "bbox.location",
+          "bbox.date",
+          "center.date",
+          "lga.date",
+          "name.location",
+          "center.float",
+          "lga.float",
+          "name.float",
+          "lga.location",
+          "areatype.location",
+          "postcode.date",
+          "areatype.float",
+          "areatype.date"
+        ],
+        "_source": {
+          "name": "Bayswater",
+          "areatype": "locality",
+          "center": "-37.845164,145.2647374",
+          "bbox": [
+            "145.2382753619277",
+            "-37.85963511312151",
+            "145.28737155665652",
+            "-37.833007533571006"
+          ],
+          "postcode": ["3153"],
+          "lga": ["Knox City"],
+          "id": "doc-661493669bd65fde1ab9b790"
+        }
+      }
+    ]
+  }
+}
diff --git a/examples/nuxt-app/test/fixtures/publication/sample-publication-page.json b/examples/nuxt-app/test/fixtures/publication/sample-publication-page.json
index 5d54128761..ea2462aafd 100644
--- a/examples/nuxt-app/test/fixtures/publication/sample-publication-page.json
+++ b/examples/nuxt-app/test/fixtures/publication/sample-publication-page.json
@@ -127,7 +127,7 @@
     "documents": [
       {
         "name": "Victorian Skills Plan Implementation Update October 2023",
-        "url": "https://master.content.vic.gov.au/sites/default/files/2023-10/16686-VSA-Implementation-Plan-Section_FA_Digital.pdf",
+        "url": "/sites/default/files/2023-10/16686-VSA-Implementation-Plan-Section_FA_Digital.pdf",
         "size": "4.61 MB",
         "extension": "pdf",
         "id": "64b1b6fc-083d-4570-8b0e-5f54a756a80c"
diff --git a/examples/nuxt-app/test/fixtures/publication/sample-publication.json b/examples/nuxt-app/test/fixtures/publication/sample-publication.json
index bbe43d6238..dfa0fd8916 100644
--- a/examples/nuxt-app/test/fixtures/publication/sample-publication.json
+++ b/examples/nuxt-app/test/fixtures/publication/sample-publication.json
@@ -199,7 +199,7 @@
     "documents": [
       {
         "name": "Victorian Skills Plan Implementation Update October 2023",
-        "url": "https://master.content.vic.gov.au/sites/default/files/2023-10/16686-VSA-Implementation-Plan-Section_FA_Digital.pdf",
+        "url": "/sites/default/files/2023-10/16686-VSA-Implementation-Plan-Section_FA_Digital.pdf",
         "size": "4.61 MB",
         "extension": "pdf",
         "id": "64b1b6fc-083d-4570-8b0e-5f54a756a80c"
diff --git a/examples/nuxt-app/test/fixtures/search-listing/list/response.json b/examples/nuxt-app/test/fixtures/search-listing/list/response.json
index 63c00c9aa0..8e30929414 100644
--- a/examples/nuxt-app/test/fixtures/search-listing/list/response.json
+++ b/examples/nuxt-app/test/fixtures/search-listing/list/response.json
@@ -321,6 +321,9 @@
           "field_paragraph_body": [
             "The Department of Premier and Cabinet, as owner of this website on behalf of the Victorian Government, is committed to providing a website that is accessible to the widest possible audience, regardless of technology or ability.  This website aims to meet level AA of the Web Content Accessibility Guidelines (WCAG) 2.1 World Wide Web Consortium (W3C) Web Content Accessibility Guidelines 2.0 . If there is information on this website that you can't access, or have any suggestions on how we can improve the accessibility of this website, please email us via  digital@dpc.vic.gov.au digital@dpc.vic.gov.au  or contact us by mail to: Department of Premier and Cabinet 1 Treasury Place East Melbourne VIC 3002 All constructive feedback regarding the accessibility or usability of this website is welcome and will be carefully considered. Assistance If you are a TTY user, phone 133 677 133 677 then ask for 1300 366 356 If you are a Speak and Listen user, phone 1300 555 727 1300 555 727 then ask for 1300 366 356 For SMS relay, use 0423 677 767 0423 677 767 If you are an internet relay user, visit the Internet Relay call page Make an Internet Relay call page and use this number: 1300 366 356"
           ],
+          "field_redirect_website": [
+            "https://vic.gov.au/page"
+          ],
           "field_tags": [
             2095,
             2096
diff --git a/examples/nuxt-app/test/fixtures/search-listing/table/page-extra-structured.json b/examples/nuxt-app/test/fixtures/search-listing/table/page-extra-structured.json
index 4b1e5b9752..1a5e2e53d6 100644
--- a/examples/nuxt-app/test/fixtures/search-listing/table/page-extra-structured.json
+++ b/examples/nuxt-app/test/fixtures/search-listing/table/page-extra-structured.json
@@ -79,6 +79,7 @@
               {
                 "label": "Website",
                 "objectKey": "Website/Links",
+                "objectTextKey": "Organisation",
                 "component": "TideSearchListingTableUrl"
               },
               {
diff --git a/examples/nuxt-app/test/fixtures/site/primary-nav-nowrap.json b/examples/nuxt-app/test/fixtures/site/primary-nav-nowrap.json
new file mode 100644
index 0000000000..0d8cffdf35
--- /dev/null
+++ b/examples/nuxt-app/test/fixtures/site/primary-nav-nowrap.json
@@ -0,0 +1,44 @@
+{
+  "name": "Test site for neutral theme",
+  "acknowledgementHeader": "Test hero acknowledgement",
+  "acknowledgementFooter": "Test footer acknowledgement",
+  "socialImages": {
+    "twitter": {},
+    "og": {}
+  },
+  "siteLogo": {
+    "href": "/",
+    "src": "https://placehold.co/140x40",
+    "altText": ""
+  },
+  "featureFlags": {
+    "primaryNavNowrap": true
+  },
+  "menus": {
+    "menuMain": [
+      {
+        "text": "This link has an excessively long title",
+        "url": "/demo-landing-page",
+        "uuid": "29bc9750-a335-455e-9e9a-4166c0bd73df",
+        "parent": null,
+        "weight": 0
+      },
+      {
+        "text": "Another random link",
+        "url": "/demo-landing-page",
+        "uuid": "04e44b77-20df-4a73-b0d1-cf2d3d614754",
+        "parent": null,
+        "weight": 0
+      }
+    ],
+    "menuFooter": [
+      {
+        "text": "Demo Landing Page",
+        "url": "/demo-landing-page",
+        "uuid": "04e44b77-20df-4a73-b0d1-cf2d3d614754",
+        "parent": null,
+        "weight": 0
+      }
+    ]
+  }
+}
diff --git a/examples/nuxt-app/test/fixtures/site/primary-nav-wrap.json b/examples/nuxt-app/test/fixtures/site/primary-nav-wrap.json
new file mode 100644
index 0000000000..0d133a87fe
--- /dev/null
+++ b/examples/nuxt-app/test/fixtures/site/primary-nav-wrap.json
@@ -0,0 +1,41 @@
+{
+  "name": "Test site for neutral theme",
+  "acknowledgementHeader": "Test hero acknowledgement",
+  "acknowledgementFooter": "Test footer acknowledgement",
+  "socialImages": {
+    "twitter": {},
+    "og": {}
+  },
+  "siteLogo": {
+    "href": "/",
+    "src": "https://placehold.co/140x40",
+    "altText": ""
+  },
+  "menus": {
+    "menuMain": [
+      {
+        "text": "This link has an excessively long title",
+        "url": "/demo-landing-page",
+        "uuid": "29bc9750-a335-455e-9e9a-4166c0bd73df",
+        "parent": null,
+        "weight": 0
+      },
+      {
+        "text": "Another random link",
+        "url": "/demo-landing-page",
+        "uuid": "04e44b77-20df-4a73-b0d1-cf2d3d614754",
+        "parent": null,
+        "weight": 0
+      }
+    ],
+    "menuFooter": [
+      {
+        "text": "Demo Landing Page",
+        "url": "/demo-landing-page",
+        "uuid": "04e44b77-20df-4a73-b0d1-cf2d3d614754",
+        "parent": null,
+        "weight": 0
+      }
+    ]
+  }
+}
diff --git a/examples/nuxt-app/test/fixtures/site/search-request-content-types.json b/examples/nuxt-app/test/fixtures/site/search-request-content-types.json
new file mode 100644
index 0000000000..3d58126ce5
--- /dev/null
+++ b/examples/nuxt-app/test/fixtures/site/search-request-content-types.json
@@ -0,0 +1,72 @@
+{
+  "query": "",
+  "filters": {
+    "all": [
+      {
+        "any": [
+          {
+            "field_node_site": "TEST_SITE"
+          }
+        ]
+      },
+      {
+        "any": [
+          {
+            "type": [
+              "landing_page",
+              "event",
+              "news",
+              "publication",
+              "publication_page",
+              "tide_search_listing",
+              "product"
+            ]
+          }
+        ]
+      }
+    ]
+  },
+  "search_fields": {
+    "title": {
+      "weight": 10
+    },
+    "body": {},
+    "field_paragraph_body": {},
+    "field_landing_page_summary": {},
+    "summary_processed": {},
+    "field_paragraph_summary": {},
+    "field_event_details_event_locality": {}
+  },
+  "result_fields": {
+    "title": {
+      "raw": {
+        "size": 150
+      }
+    },
+    "field_landing_page_summary": {
+      "snippet": {
+        "size": 150,
+        "fallback": true
+      }
+    },
+    "summary_processed": {
+      "snippet": {
+        "size": 150,
+        "fallback": true
+      }
+    },
+    "changed": {
+      "raw": {}
+    },
+    "url": {
+      "raw": {}
+    },
+    "type": {
+      "raw": {}
+    }
+  },
+  "page": {
+    "size": 10,
+    "current": 1
+  }
+}
diff --git a/examples/nuxt-app/test/fixtures/site/shared-elements.json b/examples/nuxt-app/test/fixtures/site/shared-elements.json
index c36fd0fd43..4a4c9fa138 100644
--- a/examples/nuxt-app/test/fixtures/site/shared-elements.json
+++ b/examples/nuxt-app/test/fixtures/site/shared-elements.json
@@ -5,6 +5,7 @@
   "acknowledgementHeader": "The Victorian Government acknowledges Aboriginal Traditional Owners of Country throughout Victoria and pays respect to their cultures and Elders past, present and emerging.",
   "acknowledgementFooter": "Test footer acknowledgement",
   "copyrightHtml": "<p>Test <strong>footer</strong> copyright html</p>",
+  "contentRatingText": "<p>Test custom rating text.</p>",
   "footerLogos": [
     {
       "alt": "Test logo 1",
diff --git a/jest.config.js b/jest.config.js
index 4729fb4e4a..eac7da33c3 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -13,7 +13,9 @@ module.exports = {
     '^.+\\.ts$': '<rootDir>/node_modules/ts-jest',
     '.*\\.vue$': '<rootDir>/node_modules/@vue/vue3-jest'
   },
-  transformIgnorePatterns: ['node_modules/(?!.pnpm)(?!(ripple-*|lodash-es)/)'],
+  transformIgnorePatterns: [
+    'node_modules/(?!.pnpm)(?!(ripple-*|lodash-es|cheerio)/)'
+  ],
   extensionsToTreatAsEsm: ['.ts'],
   moduleNameMapper: {
     '^(\\.{1,2}/.*)\\.js$': '$1',
diff --git a/lerna.json b/lerna.json
index c3d93e8857..fa975db385 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.11.0",
+  "version": "2.14.0",
   "npmClient": "pnpm",
   "exact": true,
   "command": {
diff --git a/packages/eslint-config-ripple/package.json b/packages/eslint-config-ripple/package.json
index 1a83192554..54faab5bb6 100644
--- a/packages/eslint-config-ripple/package.json
+++ b/packages/eslint-config-ripple/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/eslint-config-ripple",
   "description": "ESLint config for Ripple projects",
-  "version": "2.11.0",
+  "version": "2.14.0",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "index.js",
diff --git a/packages/nuxt-ripple-analytics/lib/index.ts b/packages/nuxt-ripple-analytics/lib/index.ts
index 93fa2b5046..c80b186d1e 100644
--- a/packages/nuxt-ripple-analytics/lib/index.ts
+++ b/packages/nuxt-ripple-analytics/lib/index.ts
@@ -170,7 +170,8 @@ export default {
   },
   'rpl-file/download': () => {
     return (payload: any) => {
-      const { host, pathname } = new URL(payload?.value)
+      const { $app_origin } = useNuxtApp()
+      const { host, pathname } = new URL(payload?.value, $app_origin)
 
       trackEvent({
         event: `file_${payload.action}`,
@@ -291,7 +292,8 @@ export default {
   },
   'rpl-media-embed/downloadImage': () => {
     return (payload: any) => {
-      const { pathname, host } = new URL(payload?.value)
+      const { $app_origin } = useNuxtApp()
+      const { pathname, host } = new URL(payload?.value, $app_origin)
       const fileName = pathname.split('/').pop()
 
       trackEvent({
diff --git a/packages/nuxt-ripple-analytics/package.json b/packages/nuxt-ripple-analytics/package.json
index 637bc283ab..55d49d22d7 100644
--- a/packages/nuxt-ripple-analytics/package.json
+++ b/packages/nuxt-ripple-analytics/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/nuxt-ripple-analytics",
   "description": "Nuxt module for handling event tracking.",
-  "version": "2.11.0",
+  "version": "2.14.0",
   "license": "Apache-2.0",
   "main": "./nuxt.config.ts",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
diff --git a/packages/nuxt-ripple-cli/package.json b/packages/nuxt-ripple-cli/package.json
index aab13a568c..9c5e9e9e80 100644
--- a/packages/nuxt-ripple-cli/package.json
+++ b/packages/nuxt-ripple-cli/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/nuxt-ripple-cli",
   "description": "A CLI for simplifying common setup and scaffolding tasks",
-  "version": "2.11.0",
+  "version": "2.14.0",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./dist/index.js",
diff --git a/packages/nuxt-ripple-cli/src/commands/init/_templates/layer/latest/github/publish.yml.t b/packages/nuxt-ripple-cli/src/commands/init/_templates/layer/latest/github/publish.yml.t
index befccbe5c7..d796cb4058 100644
--- a/packages/nuxt-ripple-cli/src/commands/init/_templates/layer/latest/github/publish.yml.t
+++ b/packages/nuxt-ripple-cli/src/commands/init/_templates/layer/latest/github/publish.yml.t
@@ -14,9 +14,9 @@ jobs:
       packages: write
       contents: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           registry-url: 'https://npm.pkg.github.com/'
           node-version: 20
@@ -25,10 +25,10 @@ jobs:
           git config --global user.email "sdp.devs@dpc.vic.gov.au"
           git config --global user.name "SDP Deploy"
       - name: Bump version from release number
-        run: npm version ${{ github.event.release.name }} --allow-same-version
+        run: npm version ${{ github.event.release.name }} --no-git-tag-version
         env:
           NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Publish to GH Package registry
-        run: npm publish
+        run: npm publish --tag ${{ github.event.release.prerelease && 'alpha' || 'latest' }}
         env:
           NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/packages/nuxt-ripple-preview/package.json b/packages/nuxt-ripple-preview/package.json
index 5513ef756c..67c4ff9f85 100644
--- a/packages/nuxt-ripple-preview/package.json
+++ b/packages/nuxt-ripple-preview/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/nuxt-ripple-preview",
   "description": "Adds support for drupal preview links in Ripple frontend sites",
-  "version": "2.11.0",
+  "version": "2.14.0",
   "license": "Apache-2.0",
   "main": "./nuxt.config.ts",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
diff --git a/packages/nuxt-ripple/app.config.ts b/packages/nuxt-ripple/app.config.ts
index 83f9106604..ce7f3ff82e 100644
--- a/packages/nuxt-ripple/app.config.ts
+++ b/packages/nuxt-ripple/app.config.ts
@@ -46,9 +46,23 @@ declare module '@nuxt/schema' {
         >
         mapResultHooks?: Record<
           string,
-          (map: any, results: any, location: any) => void
+          (map: any, results: any, location: any, mapDeadSpace: any) => void
         >
       }
+      customInputs?: {
+        [key: string]: {
+          id: string
+          type: string
+          formkitDefProps: {
+            [key: string]: any
+          }
+          mapping: (
+            fieldID: string,
+            field: any,
+            fieldKey: string
+          ) => Record<string, any>
+        }
+      }
     }
   }
 }
diff --git a/packages/nuxt-ripple/components/TideBaseLayout.vue b/packages/nuxt-ripple/components/TideBaseLayout.vue
index 79be04bf6e..398959f507 100644
--- a/packages/nuxt-ripple/components/TideBaseLayout.vue
+++ b/packages/nuxt-ripple/components/TideBaseLayout.vue
@@ -63,6 +63,7 @@
       <slot name="belowBody"></slot>
       <TideContentRating
         v-if="showContentRating"
+        :contentRatingText="site?.contentRatingText"
         :siteSectionName="siteSection ? siteSection.name : ''"
       />
     </template>
@@ -111,8 +112,8 @@ export interface Props {
   footerImageCaption?: string
   topicTags?: TideTopicTag[]
   updatedDate?: string | null
-  siteSection: TideSiteSection | null
-  page: any
+  siteSection?: TideSiteSection | null
+  page?: any
   showContentRating?: boolean
 }
 
@@ -123,6 +124,7 @@ const props = withDefaults(defineProps<Props>(), {
   topicTags: () => [],
   updatedDate: null,
   siteSection: null,
+  page: null,
   showContentRating: false
 })
 
diff --git a/packages/nuxt-ripple/components/TideContentRating.vue b/packages/nuxt-ripple/components/TideContentRating.vue
index 7c10483b19..eccfdf2e08 100644
--- a/packages/nuxt-ripple/components/TideContentRating.vue
+++ b/packages/nuxt-ripple/components/TideContentRating.vue
@@ -3,10 +3,12 @@ import { onMounted, ref } from 'vue'
 
 interface Props {
   siteSectionName: string
+  contentRatingText: string
 }
 
 withDefaults(defineProps<Props>(), {
-  siteSectionName: ''
+  siteSectionName: '',
+  contentRatingText: ''
 })
 
 // This is an actual webform that exists in drupal
@@ -70,7 +72,7 @@ onMounted(() => {
                     id="comments"
                     type="RplFormTextarea"
                     name="comments"
-                    label="Enter your comments"
+                    label="Enter your feedback"
                     :maxlength="5000"
                     :rows="4"
                     :validation="[['matches', '/^\\W*(\\w+(\\W+|$)){1,500}$/']]"
@@ -78,14 +80,11 @@ onMounted(() => {
                       matches: 'You must enter between 1 and 500 words'
                     }"
                   />
-                  <RplContent>
-                    <p>
-                      If you need a response, please use our
-                      <RplTextLink url="/contact-us"
-                        >contact us form</RplTextLink
-                      >.
-                    </p>
-                  </RplContent>
+                  <RplContent
+                    v-if="contentRatingText"
+                    :html="contentRatingText"
+                    class="tide-content-rating__text"
+                  />
                   <FormKit
                     v-if="value.was_this_page_helpful"
                     type="RplFormActions"
diff --git a/packages/nuxt-ripple/mapping/site/index.ts b/packages/nuxt-ripple/mapping/site/index.ts
index f4c19df8d4..adc8752d35 100644
--- a/packages/nuxt-ripple/mapping/site/index.ts
+++ b/packages/nuxt-ripple/mapping/site/index.ts
@@ -2,6 +2,7 @@ import {
   getImageFromField,
   getBody,
   getBodyFromField,
+  getMediaPath,
   getLinkFromField,
   getSiteKeyValues,
   TideSiteApi
@@ -31,9 +32,9 @@ export default {
       if (src.field_site_logo) {
         return {
           href: '/',
-          src: src.field_site_logo.url,
+          src: getMediaPath(src, 'field_site_logo'),
           altText: src.field_site_logo.meta?.alt,
-          printSrc: getImageFromField(src, 'field_print_friendly_logo')?.src
+          printSrc: getMediaPath(src, 'field_print_friendly_logo')
         }
       }
 
@@ -52,6 +53,11 @@ export default {
       bottom: (src: any) =>
         getImageFromField(src, 'field_bottom_corner_graphic')
     },
+    contentRatingText: (src: any) => {
+      return src.hasOwnProperty('field_additional_comment')
+        ? getBodyFromField(src, 'field_additional_comment')
+        : '<p>If you need a response, please use our <a href="/contact-us" class="rpl-text-link rpl-u-focusable-inline">contact us form</a>.</p>'
+    },
     acknowledgementFooter: 'field_acknowledgement_to_country',
     copyrightHtml: (src: any) => {
       return getBody(src.field_site_footer_text?.processed)
diff --git a/packages/nuxt-ripple/package.json b/packages/nuxt-ripple/package.json
index 5554d1a930..68161d3266 100644
--- a/packages/nuxt-ripple/package.json
+++ b/packages/nuxt-ripple/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/nuxt-ripple",
   "description": "Nuxt module for integrating Ripple and Tide",
-  "version": "2.11.0",
+  "version": "2.14.0",
   "license": "Apache-2.0",
   "main": "./nuxt.config.ts",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
diff --git a/packages/nuxt-ripple/server/plugins/prefetch.ts b/packages/nuxt-ripple/server/plugins/prefetch.ts
index d1d9f851f0..edc060719a 100644
--- a/packages/nuxt-ripple/server/plugins/prefetch.ts
+++ b/packages/nuxt-ripple/server/plugins/prefetch.ts
@@ -1,4 +1,4 @@
-import * as cheerio from 'cheerio'
+import { load } from 'cheerio'
 import type { NitroApp } from 'nitropack'
 
 // fix type stub - See https://github.com/nuxt/nuxt/issues/18556
@@ -17,7 +17,7 @@ export default defineNitroPlugin((nitroApp) => {
     // https://github.com/nuxt/nuxt/issues/18376
 
     html.head = html.head.map((head) => {
-      const $ = cheerio.load(head)
+      const $ = load(head)
       $('link[rel=prefetch]').each(function () {
         $(this).remove()
       })
diff --git a/packages/ripple-sdp-core/LICENSE b/packages/ripple-sdp-core/LICENSE
new file mode 100644
index 0000000000..6b97259524
--- /dev/null
+++ b/packages/ripple-sdp-core/LICENSE
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1.  Definitions.
+
+    "License" shall mean the terms and conditions for use, reproduction,
+    and distribution as defined by Sections 1 through 9 of this document.
+
+    "Licensor" shall mean the copyright owner or entity authorized by
+    the copyright owner that is granting the License.
+
+    "Legal Entity" shall mean the union of the acting entity and all
+    other entities that control, are controlled by, or are under common
+    control with that entity. For the purposes of this definition,
+    "control" means (i) the power, direct or indirect, to cause the
+    direction or management of such entity, whether by contract or
+    otherwise, or (ii) ownership of fifty percent (50%) or more of the
+    outstanding shares, or (iii) beneficial ownership of such entity.
+
+    "You" (or "Your") shall mean an individual or Legal Entity
+    exercising permissions granted by this License.
+
+    "Source" form shall mean the preferred form for making modifications,
+    including but not limited to software source code, documentation
+    source, and configuration files.
+
+    "Object" form shall mean any form resulting from mechanical
+    transformation or translation of a Source form, including but
+    not limited to compiled object code, generated documentation,
+    and conversions to other media types.
+
+    "Work" shall mean the work of authorship, whether in Source or
+    Object form, made available under the License, as indicated by a
+    copyright notice that is included in or attached to the work
+    (an example is provided in the Appendix below).
+
+    "Derivative Works" shall mean any work, whether in Source or Object
+    form, that is based on (or derived from) the Work and for which the
+    editorial revisions, annotations, elaborations, or other modifications
+    represent, as a whole, an original work of authorship. For the purposes
+    of this License, Derivative Works shall not include works that remain
+    separable from, or merely link (or bind by name) to the interfaces of,
+    the Work and Derivative Works thereof.
+
+    "Contribution" shall mean any work of authorship, including
+    the original version of the Work and any modifications or additions
+    to that Work or Derivative Works thereof, that is intentionally
+    submitted to Licensor for inclusion in the Work by the copyright owner
+    or by an individual or Legal Entity authorized to submit on behalf of
+    the copyright owner. For the purposes of this definition, "submitted"
+    means any form of electronic, verbal, or written communication sent
+    to the Licensor or its representatives, including but not limited to
+    communication on electronic mailing lists, source code control systems,
+    and issue tracking systems that are managed by, or on behalf of, the
+    Licensor for the purpose of discussing and improving the Work, but
+    excluding communication that is conspicuously marked or otherwise
+    designated in writing by the copyright owner as "Not a Contribution."
+
+    "Contributor" shall mean Licensor and any individual or Legal Entity
+    on behalf of whom a Contribution has been received by Licensor and
+    subsequently incorporated within the Work.
+
+2.  Grant of Copyright License. Subject to the terms and conditions of
+    this License, each Contributor hereby grants to You a perpetual,
+    worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+    copyright license to reproduce, prepare Derivative Works of,
+    publicly display, publicly perform, sublicense, and distribute the
+    Work and such Derivative Works in Source or Object form.
+
+3.  Grant of Patent License. Subject to the terms and conditions of
+    this License, each Contributor hereby grants to You a perpetual,
+    worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+    (except as stated in this section) patent license to make, have made,
+    use, offer to sell, sell, import, and otherwise transfer the Work,
+    where such license applies only to those patent claims licensable
+    by such Contributor that are necessarily infringed by their
+    Contribution(s) alone or by combination of their Contribution(s)
+    with the Work to which such Contribution(s) was submitted. If You
+    institute patent litigation against any entity (including a
+    cross-claim or counterclaim in a lawsuit) alleging that the Work
+    or a Contribution incorporated within the Work constitutes direct
+    or contributory patent infringement, then any patent licenses
+    granted to You under this License for that Work shall terminate
+    as of the date such litigation is filed.
+
+4.  Redistribution. You may reproduce and distribute copies of the
+    Work or Derivative Works thereof in any medium, with or without
+    modifications, and in Source or Object form, provided that You
+    meet the following conditions:
+
+    (a) You must give any other recipients of the Work or
+    Derivative Works a copy of this License; and
+
+    (b) You must cause any modified files to carry prominent notices
+    stating that You changed the files; and
+
+    (c) You must retain, in the Source form of any Derivative Works
+    that You distribute, all copyright, patent, trademark, and
+    attribution notices from the Source form of the Work,
+    excluding those notices that do not pertain to any part of
+    the Derivative Works; and
+
+    (d) If the Work includes a "NOTICE" text file as part of its
+    distribution, then any Derivative Works that You distribute must
+    include a readable copy of the attribution notices contained
+    within such NOTICE file, excluding those notices that do not
+    pertain to any part of the Derivative Works, in at least one
+    of the following places: within a NOTICE text file distributed
+    as part of the Derivative Works; within the Source form or
+    documentation, if provided along with the Derivative Works; or,
+    within a display generated by the Derivative Works, if and
+    wherever such third-party notices normally appear. The contents
+    of the NOTICE file are for informational purposes only and
+    do not modify the License. You may add Your own attribution
+    notices within Derivative Works that You distribute, alongside
+    or as an addendum to the NOTICE text from the Work, provided
+    that such additional attribution notices cannot be construed
+    as modifying the License.
+
+    You may add Your own copyright statement to Your modifications and
+    may provide additional or different license terms and conditions
+    for use, reproduction, or distribution of Your modifications, or
+    for any such Derivative Works as a whole, provided Your use,
+    reproduction, and distribution of the Work otherwise complies with
+    the conditions stated in this License.
+
+5.  Submission of Contributions. Unless You explicitly state otherwise,
+    any Contribution intentionally submitted for inclusion in the Work
+    by You to the Licensor shall be under the terms and conditions of
+    this License, without any additional terms or conditions.
+    Notwithstanding the above, nothing herein shall supersede or modify
+    the terms of any separate license agreement you may have executed
+    with Licensor regarding such Contributions.
+
+6.  Trademarks. This License does not grant permission to use the trade
+    names, trademarks, service marks, or product names of the Licensor,
+    except as required for reasonable and customary use in describing the
+    origin of the Work and reproducing the content of the NOTICE file.
+
+7.  Disclaimer of Warranty. Unless required by applicable law or
+    agreed to in writing, Licensor provides the Work (and each
+    Contributor provides its Contributions) on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+    implied, including, without limitation, any warranties or conditions
+    of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+    PARTICULAR PURPOSE. You are solely responsible for determining the
+    appropriateness of using or redistributing the Work and assume any
+    risks associated with Your exercise of permissions under this License.
+
+8.  Limitation of Liability. In no event and under no legal theory,
+    whether in tort (including negligence), contract, or otherwise,
+    unless required by applicable law (such as deliberate and grossly
+    negligent acts) or agreed to in writing, shall any Contributor be
+    liable to You for damages, including any direct, indirect, special,
+    incidental, or consequential damages of any character arising as a
+    result of this License or out of the use or inability to use the
+    Work (including but not limited to damages for loss of goodwill,
+    work stoppage, computer failure or malfunction, or any and all
+    other commercial damages or losses), even if such Contributor
+    has been advised of the possibility of such damages.
+
+9.  Accepting Warranty or Additional Liability. While redistributing
+    the Work or Derivative Works thereof, You may choose to offer,
+    and charge a fee for, acceptance of support, warranty, indemnity,
+    or other liability obligations and/or rights consistent with this
+    License. However, in accepting such obligations, You may act only
+    on Your own behalf and on Your sole responsibility, not on behalf
+    of any other Contributor, and only if You agree to indemnify,
+    defend, and hold each Contributor harmless for any liability
+    incurred by, or claims asserted against, such Contributor by reason
+    of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+Copyright 2018 Software Freedom Conservancy (SFC)
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/packages/ripple-sdp-core/README.md b/packages/ripple-sdp-core/README.md
new file mode 100644
index 0000000000..013603a2a4
--- /dev/null
+++ b/packages/ripple-sdp-core/README.md
@@ -0,0 +1,24 @@
+# Ripple Sdp Core
+
+> SDP core content types.
+
+## Installation
+
+To use this package in your Nuxt project first install it with `npm`.
+
+```bash
+npm install @dpc-sdp/ripple-sdp-core
+```
+
+## Usage
+
+Add the installed package in your sites `nuxt.config.js` file under the extends property, this includes the package as a [Nuxt Layer](https://nuxt.com/docs/getting-started/layers).
+This will add front end support for the `grant` content type.
+
+```js
+export default defineNuxtConfig({
+  extends: [
+    '@dpc-sdp/ripple-sdp-core'
+  ]
+})
+```
diff --git a/packages/ripple-sdp-core/nuxt.config.ts b/packages/ripple-sdp-core/nuxt.config.ts
new file mode 100644
index 0000000000..4d0bb03120
--- /dev/null
+++ b/packages/ripple-sdp-core/nuxt.config.ts
@@ -0,0 +1,15 @@
+import { defineNuxtConfig } from 'nuxt/config'
+
+export default defineNuxtConfig({
+  extends: [
+    '@dpc-sdp/ripple-tide-event',
+    '@dpc-sdp/ripple-tide-topic',
+    '@dpc-sdp/ripple-tide-landing-page',
+    '@dpc-sdp/ripple-tide-grant',
+    '@dpc-sdp/ripple-tide-publication',
+    '@dpc-sdp/ripple-tide-media',
+    '@dpc-sdp/ripple-tide-news',
+    '@dpc-sdp/ripple-tide-search',
+    '@dpc-sdp/ripple-tide-webform'
+  ]
+})
diff --git a/packages/ripple-sdp-core/package.json b/packages/ripple-sdp-core/package.json
new file mode 100644
index 0000000000..fb8b37e982
--- /dev/null
+++ b/packages/ripple-sdp-core/package.json
@@ -0,0 +1,22 @@
+{
+  "name": "@dpc-sdp/ripple-sdp-core",
+  "description": "SDP core content types",
+  "version": "2.14.0",
+  "license": "Apache-2.0",
+  "repository": "https://github.com/dpc-sdp/ripple-framework",
+  "main": "./nuxt.config.ts",
+  "exports": {
+    ".": "./nuxt.config.ts"
+  },
+  "dependencies": {
+    "@dpc-sdp/ripple-tide-event": "workspace:*",
+    "@dpc-sdp/ripple-tide-grant": "workspace:*",
+    "@dpc-sdp/ripple-tide-landing-page": "workspace:*",
+    "@dpc-sdp/ripple-tide-media": "workspace:*",
+    "@dpc-sdp/ripple-tide-news": "workspace:*",
+    "@dpc-sdp/ripple-tide-publication": "workspace:*",
+    "@dpc-sdp/ripple-tide-search": "workspace:*",
+    "@dpc-sdp/ripple-tide-topic": "workspace:*",
+    "@dpc-sdp/ripple-tide-webform": "workspace:*"
+  }
+}
diff --git a/packages/ripple-sdp-core/tsconfig.json b/packages/ripple-sdp-core/tsconfig.json
new file mode 100644
index 0000000000..2403fca1a1
--- /dev/null
+++ b/packages/ripple-sdp-core/tsconfig.json
@@ -0,0 +1,3 @@
+{
+  "extends": "./../../examples/nuxt-app/.nuxt/tsconfig.json"
+}
diff --git a/packages/ripple-storybook/package.json b/packages/ripple-storybook/package.json
index 31f87ebba8..a32cb6c4ae 100644
--- a/packages/ripple-storybook/package.json
+++ b/packages/ripple-storybook/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ripple-storybook",
   "description": "Ripple Storybook instance",
-  "version": "2.11.0",
+  "version": "2.14.0",
   "license": "Apache-2.0",
   "private": true,
   "repository": "https://github.com/dpc-sdp/ripple-framework",
diff --git a/packages/ripple-test-utils/package.json b/packages/ripple-test-utils/package.json
index 95f55050fa..9a5d32bcf1 100644
--- a/packages/ripple-test-utils/package.json
+++ b/packages/ripple-test-utils/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/ripple-test-utils",
   "description": "Test utils for Ripple sites",
-  "version": "2.11.0",
+  "version": "2.14.0",
   "license": "Apache-2.0",
   "type": "module",
   "main": "./dist/config/index.js",
diff --git a/packages/ripple-test-utils/step_definitions/common/index.ts b/packages/ripple-test-utils/step_definitions/common/index.ts
index b914f08684..b0342dfe77 100644
--- a/packages/ripple-test-utils/step_definitions/common/index.ts
+++ b/packages/ripple-test-utils/step_definitions/common/index.ts
@@ -2,6 +2,7 @@ import './navigation'
 import './mocks'
 import './site/alerts'
 import './site/theme'
+import './site/analytics'
 import './shared-elements'
 import './sitemap'
 import './languages'
diff --git a/packages/ripple-test-utils/step_definitions/common/shared-elements.ts b/packages/ripple-test-utils/step_definitions/common/shared-elements.ts
index d28b2e372a..c0a041b15b 100644
--- a/packages/ripple-test-utils/step_definitions/common/shared-elements.ts
+++ b/packages/ripple-test-utils/step_definitions/common/shared-elements.ts
@@ -58,6 +58,17 @@ Then('the last updated date should not be displayed', () => {
   cy.get(`[data-cy="updated-date"]`).should('not.exist')
 })
 
+Then('the primary nav links should wrap', () => {
+  cy.get('.rpl-primary-nav__nav-bar-actions-list--nowrap').should('not.exist')
+})
+
+Then('the primary nav links should not wrap', () => {
+  cy.get('.rpl-primary-nav__nav-bar-actions-list').should(
+    'have.class',
+    'rpl-primary-nav__nav-bar-actions-list--nowrap'
+  )
+})
+
 Then(
   'the page should have the following topic tags',
   (dataTable: DataTable) => {
@@ -215,6 +226,8 @@ Then('the footer should have the following logos', (dataTable: DataTable) => {
 Given(
   'the feature flag {string} is set to {string}',
   (flag: string, value: string) => {
+    if (value === 'true') value = true
+    if (value === 'false') value = false
     cy.get('@siteFixture').then((response) => {
       set(response, `featureFlags.${flag}`, value)
     })
@@ -241,6 +254,37 @@ Then('the quick exit should not be displayed', () => {
   cy.get('.rpl-primary-nav__quick-exit').should('not.exist')
 })
 
+Then('the content rating form should be displayed', () => {
+  cy.get('.tide-content-rating').should('be.visible')
+})
+
+Then('the content rating form should not be displayed', () => {
+  cy.get('.tide-content-rating').should('not.exist')
+})
+
+Then(
+  'the content rating form should display the custom text {string}',
+  (text: string) => {
+    cy.get('.tide-content-rating__text').should('have.text', text)
+  }
+)
+
+Then('I click the content rating option labelled {string}', (label: string) => {
+  cy.get('.tide-content-rating label').contains(label).click()
+})
+
+Given('the content rating form is enabled', () => {
+  cy.get('@pageFixture').then((response) => {
+    set(response, 'showContentRating', true)
+  })
+})
+
+Given('the content rating form is disabled', () => {
+  cy.get('@pageFixture').then((response) => {
+    set(response, 'showContentRating', false)
+  })
+})
+
 Given('the site sections share links are set to included WhatsApp', () => {
   cy.get('@pageFixture').then((response) => {
     set(
@@ -266,3 +310,7 @@ Then('the in page navigation should include', (dataTable: DataTable) => {
       })
   })
 })
+
+Given('I click on the document {string}', (label: string) => {
+  cy.contains('.rpl-document__link', label).trigger('click')
+})
diff --git a/packages/ripple-test-utils/step_definitions/common/site/analytics.ts b/packages/ripple-test-utils/step_definitions/common/site/analytics.ts
new file mode 100644
index 0000000000..bb3bf741e0
--- /dev/null
+++ b/packages/ripple-test-utils/step_definitions/common/site/analytics.ts
@@ -0,0 +1,25 @@
+import { DataTable, Then } from '@badeball/cypress-cucumber-preprocessor'
+
+Then(
+  'the dataLayer should include the following events',
+  (dataTable: DataTable) => {
+    const table = dataTable.hashes()
+
+    table.forEach((row) => {
+      cy.window().then((window) => {
+        const dataLayer = window.dataLayer
+
+        const event = dataLayer.find((i) => i.event === row.event)
+
+        const updatedRow = Object.entries(row).reduce((acc, [key, value]) => {
+          return {
+            ...acc,
+            [key]: value
+          }
+        }, {})
+
+        cy.wrap(event).should('include', updatedRow)
+      })
+    })
+  }
+)
diff --git a/packages/ripple-test-utils/step_definitions/components/accordion.ts b/packages/ripple-test-utils/step_definitions/components/accordion.ts
index 553a2e68c2..7d1d9dbb83 100644
--- a/packages/ripple-test-utils/step_definitions/components/accordion.ts
+++ b/packages/ripple-test-utils/step_definitions/components/accordion.ts
@@ -43,6 +43,13 @@ Then(
   }
 )
 
+Then(
+  'I click the accordion item {string} in accordion with ID {string}',
+  (text: string, id: string) => {
+    cy.get(`#${id}`).contains('button', text).click()
+  }
+)
+
 When(
   'I click the open all button on accordion with ID {string}',
   (id: string) => {
diff --git a/packages/ripple-test-utils/step_definitions/components/forms.ts b/packages/ripple-test-utils/step_definitions/components/forms.ts
index 1155541e2b..a11c1b40ef 100644
--- a/packages/ripple-test-utils/step_definitions/components/forms.ts
+++ b/packages/ripple-test-utils/step_definitions/components/forms.ts
@@ -349,8 +349,25 @@ Then(
   }
 )
 
-// Open forms
+// Extended
+Then(
+  'a field labelled {string} should exist with the CSS class {string}',
+  (label: string, css: string) => {
+    cy.get(css)
+      .closest('.rpl-form__outer')
+      .find('label.rpl-form-label')
+      .should('contain', label)
+  }
+)
+
+// Unsupported
+Then('an input of type {string} is not yet supported', (inputType: string) => {
+  cy.get('.rpl-form__outer.rpl-form__input--unsupported')
+    .contains(inputType)
+    .should('exist')
+})
 
+// Open forms
 Then('there is an openforms embed with the url {string}', (url: string) => {
   cy.get(`iframe[src^="${url}"]`).should('exist')
 })
diff --git a/packages/ripple-test-utils/step_definitions/components/index.ts b/packages/ripple-test-utils/step_definitions/components/index.ts
index 9628c9c333..ce7c381f0e 100644
--- a/packages/ripple-test-utils/step_definitions/components/index.ts
+++ b/packages/ripple-test-utils/step_definitions/components/index.ts
@@ -7,6 +7,7 @@ import './intro-banner'
 import './key-dates'
 import './maps'
 import './media-gallery'
+import './media-embed'
 import './modals'
 import './promo-card'
 import './nav-card'
diff --git a/packages/ripple-test-utils/step_definitions/components/maps.ts b/packages/ripple-test-utils/step_definitions/components/maps.ts
index 665359701c..3b73080da2 100644
--- a/packages/ripple-test-utils/step_definitions/components/maps.ts
+++ b/packages/ripple-test-utils/step_definitions/components/maps.ts
@@ -1,4 +1,9 @@
-import { Then, When, Given } from '@badeball/cypress-cucumber-preprocessor'
+import {
+  Then,
+  When,
+  Given,
+  DataTable
+} from '@badeball/cypress-cucumber-preprocessor'
 import { set } from 'lodash-es'
 
 Then(`the ripple map component should be visible`, () => {
@@ -9,7 +14,7 @@ Then(`the data map component tabs should exist`, () => {
   cy.get('.rpl-tabs').should('exist')
 })
 
-Then(`the data map tabs should be labelled:`, (dataTable) => {
+Then(`the data map tabs should be labelled:`, (dataTable: DataTable) => {
   const items = dataTable.raw()
   cy.get('.rpl-tabs .rpl-tab').as('items')
   items.forEach((row, i: number) => {
@@ -125,3 +130,91 @@ Given('I click the side panel item with text {string}', (title) => {
     .contains(title)
     .click({ force: true })
 })
+
+Given('a custom suggestions function called {string} is used', (fnName) => {
+  cy.get('@pageFixture').then((response) => {
+    set(
+      response,
+      'bodyComponents[0].props.locationQueryConfig.props.suggestionsConfig',
+      {
+        function: fnName,
+        args: {
+          testArg: 'testValue'
+        }
+      }
+    )
+  })
+})
+
+When(`I type {string} into the location search bar`, (inputStr: string) => {
+  cy.get(`[id="tide-address-lookup"]`).focus()
+  cy.get(`[id="tide-address-lookup"]`).type(`${inputStr}`)
+  cy.get(`[id="tide-address-lookup"]`).focus()
+})
+
+Given(
+  'the location autocomplete request is stubbed with {string} fixture',
+  (fixture: string) => {
+    cy.intercept('POST', `/api/tide/app-search/**/elasticsearch/_search`, {
+      statusCode: 200,
+      fixture
+    }).as('autocompleteRequest') // assign an alias
+  }
+)
+
+Then(
+  'the URL should reflect that the location has the following:',
+  (dataTable) => {
+    const items = dataTable.hashes()
+
+    cy.location().should((loc) => {
+      const params = new URLSearchParams(loc.search)
+
+      items.forEach((row) => {
+        expect(params.get(`location[${row.key}]`)).to.eq(`${row.value}`)
+      })
+    })
+  }
+)
+
+Given(
+  'the ArcGIS findAddressCandidates endpoint returns {string} fixture',
+  (fixture: string) => {
+    cy.intercept(
+      'GET',
+      `https://corp-geo.mapshare.vic.gov.au/arcgis/rest/services/Geocoder/VMAddressEZIAdd/GeocodeServer/findAddressCandidates*`,
+      {
+        statusCode: 200,
+        fixture
+      }
+    )
+  }
+)
+
+Given(`the geolocation button is not enabled`, () => {
+  cy.get('@pageFixture').then((response) => {
+    set(
+      response,
+      'bodyComponents[0].props.locationQueryConfig.showGeolocationButton',
+      false
+    )
+  })
+})
+
+Given(`the geolocation button is enabled`, () => {
+  cy.get('@pageFixture').then((response) => {
+    set(
+      response,
+      'bodyComponents[0].props.locationQueryConfig.showGeolocationButton',
+      true
+    )
+  })
+})
+
+Given(`the geolocate button is hidden`, () => {
+  cy.get('.rpl-map-geolocate__btn').should('not.exist')
+})
+
+Given(`the geolocate button is displayed`, () => {
+  cy.get('.rpl-map-geolocate__btn').should('exist')
+})
diff --git a/packages/ripple-test-utils/step_definitions/components/media-embed.ts b/packages/ripple-test-utils/step_definitions/components/media-embed.ts
new file mode 100644
index 0000000000..129fcbe60e
--- /dev/null
+++ b/packages/ripple-test-utils/step_definitions/components/media-embed.ts
@@ -0,0 +1,66 @@
+import { Given, Then } from '@badeball/cypress-cucumber-preprocessor'
+
+Given('a media embed with ID {string} should exist', (id: string) => {
+  cy.get(`[data-component-id="${id}"]`).as('component')
+  cy.get('@component').should('exist')
+  cy.get(`@component`).should(
+    'have.attr',
+    'data-component-type',
+    'TideLandingPageMediaEmbed'
+  )
+})
+
+Then(
+  'I click the action {string} for media embed {string}',
+  (label: string, id: string) => {
+    cy.get(`[data-component-id="${id}"]`).as('component')
+
+    cy.get('@component').within(() => {
+      cy.contains('.rpl-media-embed__action', label).click()
+    })
+  }
+)
+
+Then(
+  'I trigger a click for the action {string} on the media embed {string}',
+  (label: string, id: string) => {
+    cy.get(`[data-component-id="${id}"]`).as('component')
+
+    cy.get('@component').within(() => {
+      cy.contains('.rpl-media-embed__action', label).trigger('click')
+    })
+  }
+)
+
+Then(
+  'the media embed image for {string} should be {string}',
+  (id: string, image: string) => {
+    cy.get(`[data-component-id="${id}"]`).as('component')
+
+    cy.get('@component').within(() => {
+      cy.get('.rpl-media-embed__image').should('have.attr', 'src', image)
+    })
+  }
+)
+
+Then(
+  'the extra data for media embed {string} should be visible',
+  (id: string) => {
+    cy.get(`[data-component-id="${id}"]`).as('component')
+
+    cy.get('@component').within(() => {
+      cy.get('.rpl-media-embed__view-data-content').should('be.visible')
+    })
+  }
+)
+
+Then(
+  'the extra data for media embed {string} should be hidden',
+  (id: string) => {
+    cy.get(`[data-component-id="${id}"]`).as('component')
+
+    cy.get('@component').within(() => {
+      cy.get('.rpl-media-embed__view-data-content').should('be.hidden')
+    })
+  }
+)
diff --git a/packages/ripple-test-utils/step_definitions/content-types/listing.ts b/packages/ripple-test-utils/step_definitions/content-types/listing.ts
index 9da13a9b94..443dbb75f7 100644
--- a/packages/ripple-test-utils/step_definitions/content-types/listing.ts
+++ b/packages/ripple-test-utils/step_definitions/content-types/listing.ts
@@ -467,7 +467,7 @@ Then(
   `the search suggestions displayed should include`,
   (dataTable: DataTable) => {
     const table = dataTable.raw()
-    cy.get('#tide-search-bar__menu')
+    cy.get('.rpl-search-bar__menu')
       .find('[role="option"]')
       .as('suggestedOptions')
 
@@ -483,7 +483,7 @@ Then(
 )
 
 When('I click the search suggestion labelled {string}', (label: string) => {
-  cy.get('#tide-search-bar__menu')
+  cy.get('.rpl-search-bar__menu')
     .find('[role="option"]')
     .contains(label)
     .click()
diff --git a/packages/ripple-test-utils/step_definitions/content-types/publication.ts b/packages/ripple-test-utils/step_definitions/content-types/publication.ts
index dd5efbe2c3..79082b1a0a 100644
--- a/packages/ripple-test-utils/step_definitions/content-types/publication.ts
+++ b/packages/ripple-test-utils/step_definitions/content-types/publication.ts
@@ -70,3 +70,36 @@ Then(
     })
   }
 )
+
+Then(
+  'the publication should display the following documents',
+  (dataTable: DataTable) => {
+    const table = dataTable.hashes()
+
+    cy.get(`.tide-publication__sidebar .rpl-document`).as('items')
+
+    table.forEach((row, i: number) => {
+      cy.get('@items')
+        .eq(i)
+        .then((item) => {
+          cy.wrap(item).as('item')
+
+          cy.get('@item').find('a').as('link')
+          cy.get('@link').contains(row.title)
+          cy.get('@link')
+            .should('have.attr', 'href')
+            .then((href) => {
+              expect(href).to.contain(row.url)
+            })
+
+          if (row.type) {
+            cy.get('@item').find('.rpl-file__meta').contains(row.type)
+          }
+
+          if (row.size) {
+            cy.get('@item').find('.rpl-file__meta').contains(row.size)
+          }
+        })
+    })
+  }
+)
diff --git a/packages/ripple-tide-api/package.json b/packages/ripple-tide-api/package.json
index 39fa001654..fa0c6a1df0 100644
--- a/packages/ripple-tide-api/package.json
+++ b/packages/ripple-tide-api/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/ripple-tide-api",
   "description": "Ripple API endpoints for Tide Drupal backend",
-  "version": "2.11.0",
+  "version": "2.14.0",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./dist/index.js",
@@ -26,7 +26,7 @@
     "@nuxt/kit": "3.11.2",
     "axios": "^1.3.4",
     "change-case": "^4.1.2",
-    "cheerio": "^1.0.0-rc.10",
+    "cheerio": "^1.0.0",
     "h3": "^1.9.0",
     "js-yaml": "^4.1.0",
     "jsonapi-parse": "^2.0.1",
@@ -41,7 +41,7 @@
   },
   "devDependencies": {
     "@nuxt/schema": "3.11.2",
-    "@types/cheerio": "^0.22.31",
+    "@types/cheerio": "^0.22.35",
     "axios-mock-adapter": "^1.21.3",
     "defu": "^6.1.2",
     "rimraf": "^4.4.1"
diff --git a/packages/ripple-tide-api/src/index.ts b/packages/ripple-tide-api/src/index.ts
index 4dccd3e154..c660fb64eb 100644
--- a/packages/ripple-tide-api/src/index.ts
+++ b/packages/ripple-tide-api/src/index.ts
@@ -5,6 +5,7 @@ export { default as TideSiteApi } from './services/tide-site.js'
 export { default as logger } from './logger/logger.js'
 export * from './utils/createHandler.js'
 export { stripSiteId } from './utils/stripSiteId.js'
+export { stripMediaBaseUrl } from './utils/stripMediaBaseUrl.js'
 
 export {
   addAnchorLinksToHTML,
diff --git a/packages/ripple-tide-api/src/services/tide-page.ts b/packages/ripple-tide-api/src/services/tide-page.ts
index 73a4aad296..168cb8afe4 100644
--- a/packages/ripple-tide-api/src/services/tide-page.ts
+++ b/packages/ripple-tide-api/src/services/tide-page.ts
@@ -327,10 +327,10 @@ export default class TidePageApi extends TideApiBase {
   async getEntityList(
     entityType,
     bundle,
-    filtering,
-    includes,
-    pagination,
-    sorting,
+    filtering?,
+    includes?,
+    pagination?,
+    sorting?,
     { allPages = true } = {}
   ) {
     const params: Record<string, any> = {
@@ -442,20 +442,8 @@ export default class TidePageApi extends TideApiBase {
   }
 
   async getTaxonomy(taxonomyName: string) {
-    const params = {
-      site: this.site
-    }
     try {
-      const { data: response } = await this.get(
-        `/taxonomy_term/${taxonomyName}`,
-        {
-          params
-        }
-      )
-      if (response) {
-        const resource = jsonapiParse.parse(response).data
-        return resource
-      }
+      return await this.getEntityList('taxonomy_term', taxonomyName)
     } catch (error: any) {
       throw new ApplicationError('Error fetching taxonomy', { cause: error })
     }
diff --git a/packages/ripple-tide-api/src/utils.ts b/packages/ripple-tide-api/src/utils.ts
index 14b5091754..82ee8f5c48 100644
--- a/packages/ripple-tide-api/src/utils.ts
+++ b/packages/ripple-tide-api/src/utils.ts
@@ -1 +1,2 @@
 export { getDpcPkgs } from './utils/index.js'
+export { stripMediaBaseUrl } from './utils/stripMediaBaseUrl.js'
diff --git a/packages/ripple-tide-api/src/utils/mapping-utils.test.ts b/packages/ripple-tide-api/src/utils/mapping-utils.test.ts
index 2f05d547a3..cc2bb58569 100644
--- a/packages/ripple-tide-api/src/utils/mapping-utils.test.ts
+++ b/packages/ripple-tide-api/src/utils/mapping-utils.test.ts
@@ -1,6 +1,5 @@
 import { expect, describe } from '@jest/globals'
 import {
-  removeDomainFromPath,
   getImageFromField,
   getCardImageFromField,
   getLinkFromField,
@@ -129,7 +128,7 @@ const field = {
       y: 50
     },
     height: 700,
-    src: 'https://develop.content.reference.sdp.vic.gov.au/sites/default/files/tide_demo_content/Melbourne-tram.jpg',
+    src: '/sites/default/files/tide_demo_content/Melbourne-tram.jpg',
     title: 'Demo: Melbourne tram',
     width: 900
   },
@@ -140,18 +139,12 @@ const field = {
       y: 300
     },
     height: 785,
-    src: 'https://develop.content.reference.sdp.vic.gov.au/sites/default/files/tide_demo_content/Melbourne-tram.jpg',
+    src: '/sites/default/files/tide_demo_content/Melbourne-tram.jpg',
     title: 'Demo: Melbourne tram',
     width: 1413
   }
 
 describe('ripple-tide-api/mapping utils', () => {
-  it(`removes domain from a given path`, () => {
-    expect(
-      removeDomainFromPath('https://domain.com/sites/default/files')
-    ).toEqual('/sites/default/files')
-  })
-
   it(`processes api field data for images`, () => {
     expect(getImageFromField(field, 'field_media_image')).toEqual(processedImg)
   })
diff --git a/packages/ripple-tide-api/src/utils/mapping-utils.ts b/packages/ripple-tide-api/src/utils/mapping-utils.ts
index 92cc4638a2..66007a0893 100644
--- a/packages/ripple-tide-api/src/utils/mapping-utils.ts
+++ b/packages/ripple-tide-api/src/utils/mapping-utils.ts
@@ -1,7 +1,8 @@
 import { get } from 'lodash-es'
-import { TideImageField, TideUrlField } from '../../types'
+import { TideImageField, TideUrlField, TideDocumentField } from '../../types'
 import markupTranspiler from './markup-transpiler/index.js'
-import normaliseImageUrl from './normaliseImageUrl.js'
+import { stripMediaBaseUrl } from './stripMediaBaseUrl.js'
+import mime from 'mime-types'
 
 export type drupalField = Record<string, any>
 
@@ -46,13 +47,21 @@ type tidePageSitePartial = {
   ]
 }
 
-/**
- * @deprecated Need to make a decision on whether we proxy images or use direct url
- */
-export const removeDomainFromPath = (path: string) =>
-  typeof path === 'string' && path.length > 0
-    ? path.replace(/^.*(?=(\/sites\/default\/files))/, '')
-    : path
+export const getMediaPath = (field: any, path?: string | string[]): string => {
+  let uri = ''
+
+  if (path) {
+    field = get(field, path)
+  }
+
+  if (!field?.uri) {
+    uri = field?.url
+  } else {
+    uri = field?.uri?.url || field?.uri
+  }
+
+  return stripMediaBaseUrl(uri, process.env.NUXT_PUBLIC_TIDE_BASE_URL as string)
+}
 
 export const getImageFromField = (
   field: object,
@@ -85,10 +94,7 @@ export const getMediaImage = (
   }
 
   return {
-    src: normaliseImageUrl(
-      process.env.NUXT_PUBLIC_TIDE_BASE_URL as string,
-      fieldMediaImage.url
-    ),
+    src: getMediaPath(fieldMediaImage),
     ...fieldMediaImage.meta,
     focalPoint
   }
@@ -105,10 +111,7 @@ export const getCardImage = (fieldMediaImage: RawCardImage): TideImageField => {
     : null
 
   return {
-    src: normaliseImageUrl(
-      process.env.NUXT_PUBLIC_TIDE_BASE_URL as string,
-      fieldMediaImage.url
-    ),
+    src: getMediaPath(fieldMediaImage),
     focalPoint,
     alt: data?.alt,
     width: data?.width ? parseInt(data.width) : undefined,
@@ -117,6 +120,21 @@ export const getCardImage = (fieldMediaImage: RawCardImage): TideImageField => {
   }
 }
 
+export const getDocumentFromField = (
+  field: drupalField,
+  path = 'field_media_file'
+): TideDocumentField => {
+  const medaFile = get(field, path)
+
+  return {
+    id: field.id,
+    name: field.name,
+    url: getMediaPath(medaFile),
+    extension: mime.extension(medaFile.filemime) || '',
+    size: humanizeFilesize(medaFile.filesize)
+  }
+}
+
 export const getLinkFromField = (
   field: drupalField,
   path?: string | string[]
@@ -230,6 +248,8 @@ export default {
   getBodyFromField,
   humanizeFilesize,
   getField,
+  getMediaPath,
+  getDocumentFromField,
   getSiteKeyValues,
   getSiteSection
 }
diff --git a/packages/ripple-tide-api/src/utils/markup-transpiler/cheerio.test.ts b/packages/ripple-tide-api/src/utils/markup-transpiler/cheerio.test.ts
index 70c0c026f1..2cfe80fa21 100644
--- a/packages/ripple-tide-api/src/utils/markup-transpiler/cheerio.test.ts
+++ b/packages/ripple-tide-api/src/utils/markup-transpiler/cheerio.test.ts
@@ -11,12 +11,14 @@ const markup = {
   callout: `<div class="callout-wrapper"><p>Hey it's a callout</p></div><div class="callout-wrapper"><p>And another callout</p></div>
 <div class="wysiwyg-callout">This one is wysiwyg</div>`,
   quotation: `<blockquote class="quotation"><p>It was the best of times, it was the blurst of times.</p><footer><span>Chimp 273</span></footer></blockquote>`,
-  document: `<div class="embedded-entity--media--file" data-last-updated="1704932250"><a class="file file--mime-application-zip" href="https://example.com/file.zip">File</a></div>`,
+  document: `<div class="embedded-entity--media--file" data-last-updated="1704932250"><a class="file file--mime-application-zip" href="https://develop.content.reference.sdp.vic.gov.au/sites/default/files/file.zip">File</a></div>`,
   video: `<figure class="embedded-entity--media--embedded-video"><iframe src="https://www.youtube.com/embed/1234" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen=""></iframe><figcaption>Caption goes here</figcaption</figure>`,
-  image: `<div class="embedded-entity--media--image"><img src="https://example.com/image.jpg" alt="Image" title="Image" width="100" height="100"></div>`,
+  image: `<div class="embedded-entity--media--image"><img src="https://develop.content.reference.sdp.vic.gov.au/sites/default/files/image.jpg" alt="Image" title="Image" width="100" height="100"></div>`,
   button: `<a class="button" href="https://example.com">Button</a>`,
   link: `<a href="https://example.com" target="_blank">Link</a>`,
-  iframe: `<iframe src="https://powerbi.com" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen=""></iframe>`
+  list: `<ul type="disc"><li>List item</li></ul><ul type="circle"><li>List item</li></ul><ul type="square"><li>List item</li></ul><ol type="i"><li>List item</li></ol><ol type="I"><li>List item</li></ol><ol type="a"><li>List item</li></ol><ol type="A"><li>List item</li></ol>`,
+  iframe: `<iframe src="https://powerbi.com" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen=""></iframe>`,
+  alignment: `<p class="text-align-left">Left</p><p class="text-align-center">Center</p><p class="text-align-right">Right</p>`
 }
 
 const fixed = {
@@ -36,7 +38,7 @@ const fixed = {
 `,
   document: `
 <figure class="rpl-document">
-  <a class="rpl-document__link rpl-u-focusable-within" aria-label="undefined" href="https://example.com/file.zip" target="_blank">
+  <a class="rpl-document__link rpl-u-focusable-within" aria-label="undefined" href="/sites/default/files/file.zip" target="_blank">
     <span class="rpl-document__icon rpl-icon rpl-icon--size-l rpl-icon--colour-default rpl-icon--icon-document-lined">
       <svg role="presentation"><use xlink:href="#icon-document-lined"></use></svg>
     </span>
@@ -65,10 +67,12 @@ const fixed = {
 
 </div>
 `,
-  image: `<figure><img src="https://example.com/image.jpg" class="rpl-img" width="100" alt="Image" srcset="https://example.com/image.jpg?width=720, https://example.com/image.jpg?width=1440 2x"></figure>`,
+  image: `<figure><img src="/sites/default/files/image.jpg" class="rpl-img" width="100" alt="Image" srcset="/sites/default/files/image.jpg?width=720, /sites/default/files/image.jpg?width=1440 2x"></figure>`,
   button: `<a class="rpl-button rpl-button--default rpl-u-focusable-block rpl-button--filled" href="https://example.com"><span class="rpl-button__label rpl-type-label rpl-type-weight-bold">Button</span></a>`,
   link: `<a href="https://example.com" target="_blank" class="rpl-text-link rpl-u-focusable-inline">Link<span class="rpl-u-visually-hidden">(opens in a new window)</span></a>`,
-  iframe: `<div class="rpl-iframe rpl-iframe--default rpl-iframe--auto"><iframe src="https://powerbi.com" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen=""></iframe></div>`
+  list: `<ul class="rpl-type-list-ul--disc"><li>List item</li></ul><ul class="rpl-type-list-ul--disc"><li>List item</li></ul><ul class="rpl-type-list-ul--square"><li>List item</li></ul><ol class="rpl-type-list-ol--lower-roman"><li>List item</li></ol><ol class="rpl-type-list-ol--upper-roman"><li>List item</li></ol><ol class="rpl-type-list-ol--lower-latin"><li>List item</li></ol><ol class="rpl-type-list-ol--upper-latin"><li>List item</li></ol>`,
+  iframe: `<div class="rpl-iframe rpl-iframe--default rpl-iframe--auto"><iframe src="https://powerbi.com" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen=""></iframe></div>`,
+  alignment: `<p class="rpl-u-text-left">Left</p><p class="rpl-u-text-center">Center</p><p class="rpl-u-text-right">Right</p>`
 }
 
 describe('ripple-tide-api/utils/markup-transpiler/cheerio', () => {
diff --git a/packages/ripple-tide-api/src/utils/markup-transpiler/default-plugins.ts b/packages/ripple-tide-api/src/utils/markup-transpiler/default-plugins.ts
index 56f2fae691..5572d5519d 100644
--- a/packages/ripple-tide-api/src/utils/markup-transpiler/default-plugins.ts
+++ b/packages/ripple-tide-api/src/utils/markup-transpiler/default-plugins.ts
@@ -1,4 +1,5 @@
 import { epochToDate } from '../epochToDate.js'
+import { stripMediaBaseUrl } from '../stripMediaBaseUrl.js'
 
 const pluginTables = function (this: any) {
   // Wrap tables with a div.
@@ -86,7 +87,10 @@ const pluginDocuments = function (this: any) {
       mediaType === 'document' ? '.file--title' : '.field--name-name'
 
     const label = $element.find('a[aria-label]').attr('aria-label'),
-      link = $element.find('a').attr('href'),
+      link = stripMediaBaseUrl(
+        $element.find('a').attr('href'),
+        process.env.NUXT_PUBLIC_TIDE_BASE_URL as string
+      ),
       title = $element.find(titleSelector).text(),
       fileSize = $element.find('.file--size').text(),
       updated = $element.attr('data-last-updated')
@@ -189,7 +193,10 @@ const pluginImages = function (this: any) {
   this.find('.embedded-entity--media--image').map((i: any, el: any) => {
     const $img = this.find(el).find('img')
     const width = $img.attr('width')
-    const src = $img.attr('src')
+    const src = stripMediaBaseUrl(
+      $img.attr('src'),
+      process.env.NUXT_PUBLIC_TIDE_BASE_URL as string
+    )
     const alt = $img.attr('alt')
     const $caption = this.find(el)
       .find('div.field--name-field-media-caption')
@@ -248,6 +255,32 @@ const pluginLinks = function (this: any) {
   })
 }
 
+const pluginLists = function (this: any) {
+  this.find('ul[type], ol[type]').map((i: any, el: any) => {
+    const $list = this.find(el)
+    const type = $list.attr('type')
+
+    const listTypes = {
+      1: 'decimal',
+      a: 'lower-latin',
+      A: 'upper-latin',
+      i: 'lower-roman',
+      I: 'upper-roman',
+      disc: 'disc',
+      square: 'square',
+      circle: 'disc' // circles selection uses disc (a11y request)
+    }
+
+    $list.removeAttr('type')
+
+    if (listTypes[type]) {
+      $list.addClass(`rpl-type-list-${el?.name}--${listTypes[type]}`)
+    }
+
+    return $list
+  })
+}
+
 const pluginIFrames = function (this: any) {
   this.find('iframe').map((i: any, el: any) => {
     const $iframe = this.find(el)
@@ -268,6 +301,25 @@ const pluginIFrames = function (this: any) {
   })
 }
 
+const pluginTextAlign = function (this: any) {
+  this.find('.text-align-left, .text-align-center, .text-align-right').map(
+    (i: any, el: any) => {
+      const $el = this.find(el)
+      const alignments = ['left', 'center', 'right']
+
+      alignments.forEach((alignment) => {
+        if ($el.hasClass(`text-align-${alignment}`)) {
+          $el
+            .removeClass(`text-align-${alignment}`)
+            .addClass(`rpl-u-text-${alignment}`)
+        }
+      })
+
+      return $el
+    }
+  )
+}
+
 export default [
   pluginTables,
   pluginCallout,
@@ -277,5 +329,7 @@ export default [
   pluginImages,
   pluginButtons,
   pluginLinks,
-  pluginIFrames
+  pluginLists,
+  pluginIFrames,
+  pluginTextAlign
 ]
diff --git a/packages/ripple-tide-api/src/utils/markup-transpiler/index.ts b/packages/ripple-tide-api/src/utils/markup-transpiler/index.ts
index 0951befc75..6da8b383c4 100644
--- a/packages/ripple-tide-api/src/utils/markup-transpiler/index.ts
+++ b/packages/ripple-tide-api/src/utils/markup-transpiler/index.ts
@@ -1,4 +1,4 @@
-import cheerio from 'cheerio'
+import { load } from 'cheerio'
 import defaultPlugins from './default-plugins.js'
 
 // A markup transpiler for converting HTML into Vue template by giving plugins.
@@ -10,7 +10,7 @@ const markupTranspiler = (
   if (!html) {
     return ''
   }
-  const $ = cheerio.load(html, options)
+  const $ = load(html, options)
   const $body = $('body')
   let markupData = {}
 
diff --git a/packages/ripple-tide-api/src/utils/stripMediaBaseUrl.test.ts b/packages/ripple-tide-api/src/utils/stripMediaBaseUrl.test.ts
new file mode 100644
index 0000000000..559f3d130c
--- /dev/null
+++ b/packages/ripple-tide-api/src/utils/stripMediaBaseUrl.test.ts
@@ -0,0 +1,57 @@
+import { expect, describe, it } from '@jest/globals'
+
+import stripMediaBaseUrl from './stripMediaBaseUrl.js'
+
+describe('stripMediaBaseUrl(url, baseUrl)', () => {
+  it('strips the supplied baseUrl from the main url', () => {
+    expect(
+      stripMediaBaseUrl(
+        'https://example.com/sites/default/files/wow/cool.jpg?some=param',
+        'https://example.com'
+      )
+    ).toEqual('/sites/default/files/wow/cool.jpg?some=param')
+
+    expect(
+      stripMediaBaseUrl(
+        'https://example.com/sites/default/files/wow/cool.jpg?some=param',
+        'https://example.com/'
+      )
+    ).toEqual('/sites/default/files/wow/cool.jpg?some=param')
+  })
+
+  it('does not change a url if it points to an external domain', () => {
+    expect(
+      stripMediaBaseUrl(
+        'https://example.com/sites/default/files/wow/cool.jpg?some=param',
+        'https://google.com'
+      )
+    ).toEqual('https://example.com/sites/default/files/wow/cool.jpg?some=param')
+  })
+
+  it('leaves relative URLs unchanged if the domains differ', () => {
+    expect(
+      stripMediaBaseUrl(
+        'https://example.com/sites/default/files/wow/cool.jpg?some=param',
+        'https://google.com'
+      )
+    ).toEqual('https://example.com/sites/default/files/wow/cool.jpg?some=param')
+  })
+
+  it('leaves relative URLs unchanged if no baseUrl is passed', () => {
+    expect(
+      stripMediaBaseUrl(
+        'https://example.com/sites/default/files/wow/cool.jpg?some=param',
+        ''
+      )
+    ).toEqual('https://example.com/sites/default/files/wow/cool.jpg?some=param')
+  })
+
+  it('only strips the base URL for media files matching sites/default/files', () => {
+    expect(
+      stripMediaBaseUrl(
+        'https://example.com/sites/tmp/files/wow/cool.jpg',
+        'https://example.com'
+      )
+    ).toEqual('https://example.com/sites/tmp/files/wow/cool.jpg')
+  })
+})
diff --git a/packages/ripple-tide-api/src/utils/stripMediaBaseUrl.ts b/packages/ripple-tide-api/src/utils/stripMediaBaseUrl.ts
new file mode 100644
index 0000000000..bc4225e59b
--- /dev/null
+++ b/packages/ripple-tide-api/src/utils/stripMediaBaseUrl.ts
@@ -0,0 +1,13 @@
+export function stripMediaBaseUrl(url: string, baseUrl: string): string {
+  if (!url || typeof url !== 'string' || typeof baseUrl !== 'string') {
+    return url
+  }
+
+  if (!url.includes('/sites/default/files/')) {
+    return url
+  }
+
+  return url.replace(baseUrl.replace(/\/$/, ''), '')
+}
+
+export default stripMediaBaseUrl
diff --git a/packages/ripple-tide-api/types.d.ts b/packages/ripple-tide-api/types.d.ts
index 38055c2467..378076d319 100644
--- a/packages/ripple-tide-api/types.d.ts
+++ b/packages/ripple-tide-api/types.d.ts
@@ -30,6 +30,7 @@ export interface TideSiteData {
     top?: TideImageField
     bottom?: TideImageField
   }
+  contentRatingText?: string
   acknowledgementHeader?: string
   acknowledgementFooter: string
   copyrightHtml: string
@@ -84,6 +85,14 @@ export interface TideImageField {
   }
 }
 
+export type TideDocumentField = {
+  name: string
+  url: string
+  extension: string
+  size: string
+  id: string
+}
+
 export interface TidePageBase {
   title: string
   created: string
@@ -255,6 +264,10 @@ export interface IRplFeatureFlags {
    * @description Option to disable the display of the search form within the primary navigation
    */
   disablePrimaryNavSearch?: boolean
+  /**
+   * @description Force multi-line links to render on a single line in the primary navigation
+   */
+  primaryNavNowrap?: boolean
   /**
    * @description Option to override the default URL the search for redirects to
    */
@@ -283,6 +296,14 @@ export interface IRplFeatureFlags {
    * @description Sets the number of toggle-able levels
    */
   sectionNavToggleLevels?: number
+  /**
+   * @description Allow overriding the default site search content types
+   */
+  search?: {
+    contentTypes: {
+      [key: string]: boolean
+    }
+  }
   /**
    * @description Custom flags
    */
diff --git a/packages/ripple-tide-event/package.json b/packages/ripple-tide-event/package.json
index 7ba48a3098..603d570877 100644
--- a/packages/ripple-tide-event/package.json
+++ b/packages/ripple-tide-event/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/ripple-tide-event",
   "description": "Ripple mappings and components for Tide Event Content type",
-  "version": "2.11.0",
+  "version": "2.14.0",
   "license": "Apache-2.0",
   "main": "./nuxt.config.ts",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
diff --git a/packages/ripple-tide-grant/components/global/TideGrantSearchResult.vue b/packages/ripple-tide-grant/components/global/TideGrantSearchResult.vue
index 8bedda143d..5fa75fe2ae 100644
--- a/packages/ripple-tide-grant/components/global/TideGrantSearchResult.vue
+++ b/packages/ripple-tide-grant/components/global/TideGrantSearchResult.vue
@@ -29,8 +29,8 @@ const amount = computed(() => {
   return null
 })
 
-const isOnGoing = computed(() =>
-  getSearchResultValue(props.result, 'field_node_on_going')
+const isOnGoing = computed(
+  () => getSearchResultValue(props.result, 'field_node_on_going') ?? false
 )
 
 const dateFrom = computed(() =>
diff --git a/packages/ripple-tide-grant/mapping/index.ts b/packages/ripple-tide-grant/mapping/index.ts
index 618a39b7de..c97809b310 100644
--- a/packages/ripple-tide-grant/mapping/index.ts
+++ b/packages/ripple-tide-grant/mapping/index.ts
@@ -1,10 +1,9 @@
-import mime from 'mime-types'
 import {
   getBodyFromField,
   getField,
   getImageFromField,
   getLinkFromField,
-  humanizeFilesize
+  getDocumentFromField
 } from '@dpc-sdp/ripple-tide-api'
 import {
   tidePageBaseMapping,
@@ -89,13 +88,9 @@ const tideGrantModule: IRplTideModuleMapping = {
         }))
     },
     documents: (src: string) =>
-      getField(src, 'field_node_documents').map((doc: any) => ({
-        name: doc.name,
-        url: doc.field_media_file.url || doc.field_media_file.uri,
-        extension: mime.extension(doc.field_media_file.filemime),
-        size: humanizeFilesize(doc.field_media_file.filesize),
-        id: doc.id
-      })),
+      getField(src, 'field_node_documents').map((doc: any) =>
+        getDocumentFromField(doc)
+      ),
     sidebarComponents: ['RplSocialShare']
   },
   includes: [
diff --git a/packages/ripple-tide-grant/package.json b/packages/ripple-tide-grant/package.json
index a5813ae04b..699d90b55a 100644
--- a/packages/ripple-tide-grant/package.json
+++ b/packages/ripple-tide-grant/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/ripple-tide-grant",
   "description": "Ripple mappings and components for Tide Grant Content type",
-  "version": "2.11.0",
+  "version": "2.14.0",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./nuxt.config.ts",
diff --git a/packages/ripple-tide-landing-page/components/global/TideLandingPage/Accordion.vue b/packages/ripple-tide-landing-page/components/global/TideLandingPage/Accordion.vue
index 88b5740b31..f360b40153 100644
--- a/packages/ripple-tide-landing-page/components/global/TideLandingPage/Accordion.vue
+++ b/packages/ripple-tide-landing-page/components/global/TideLandingPage/Accordion.vue
@@ -5,6 +5,9 @@ defineProps<{
   description?: string
   numbered: boolean
   items: Array<any>
+  hasSidebar?: boolean
+  hasTitle?: boolean
+  pageBackground?: string
 }>()
 </script>
 
diff --git a/packages/ripple-tide-landing-page/components/global/TideLandingPage/ContentCollection.vue b/packages/ripple-tide-landing-page/components/global/TideLandingPage/ContentCollection.vue
index 41fd1dac2e..bdfe1653ee 100644
--- a/packages/ripple-tide-landing-page/components/global/TideLandingPage/ContentCollection.vue
+++ b/packages/ripple-tide-landing-page/components/global/TideLandingPage/ContentCollection.vue
@@ -55,6 +55,7 @@ import {
   IContentCollectionSort
 } from '../../../mapping/components/content-collection/content-collection-mapping'
 import type { IRplFeatureFlags } from '@dpc-sdp/ripple-tide-api/types'
+import { stripMediaBaseUrl } from '@dpc-sdp/ripple-tide-api/utils'
 
 const { public: config } = useRuntimeConfig()
 
@@ -88,7 +89,7 @@ const cardClasses = computed(() =>
 )
 
 const searchResultsMappingFn = (item): any => {
-  const { $app_origin } = useNuxtApp()
+  const { $app_origin, $config } = useNuxtApp()
   const rawUpdated = item.changed?.raw?.[0]
   const rawImage = item.field_media_image_absolute_path?.raw?.[0]
 
@@ -100,7 +101,7 @@ const searchResultsMappingFn = (item): any => {
       url: stripSiteId(item.url?.raw?.[0], $app_origin || ''),
       image:
         props.display.style === 'thumbnail' && rawImage
-          ? { src: rawImage }
+          ? { src: stripMediaBaseUrl(rawImage, $config.public?.tide?.baseUrl) }
           : null,
       updated: rawUpdated ? formatDate(rawUpdated) : '',
       type: item.type?.raw?.[0]
diff --git a/packages/ripple-tide-landing-page/components/global/TideLandingPage/WebForm.vue b/packages/ripple-tide-landing-page/components/global/TideLandingPage/WebForm.vue
index cf27d87cdb..3b3f5a37da 100644
--- a/packages/ripple-tide-landing-page/components/global/TideLandingPage/WebForm.vue
+++ b/packages/ripple-tide-landing-page/components/global/TideLandingPage/WebForm.vue
@@ -41,6 +41,41 @@ watch(
 )
 
 const submitted = computed(() => submissionState.value.status === 'success')
+
+import { FormKitPlugin, FormKitTypeDefinition } from '@formkit/core'
+import {
+  createRplFormInput,
+  defaultRplFormInputProps,
+  inputLibrary,
+  rplFeatures
+} from '@dpc-sdp/ripple-ui-forms'
+
+const appConfig = useAppConfig()?.ripple as { customInputs: any }
+const customInputDefs = appConfig.customInputs || {}
+
+const customInputs: FormKitPlugin = () => {}
+customInputs.library = (node: any) => {
+  Object.values(customInputDefs).forEach((item: any) => {
+    if (node.props.type === item.id) {
+      const def: FormKitTypeDefinition = {
+        schema: createRplFormInput({
+          $cmp: item.id,
+          props: {
+            ...defaultRplFormInputProps,
+            type: item.type
+          }
+        }),
+        library: {
+          [item.id]: resolveComponent(item.id),
+          ...inputLibrary
+        },
+        ...item.formkitDefProps,
+        features: rplFeatures
+      }
+      return node.define(def)
+    }
+  })
+}
 </script>
 
 <template>
@@ -65,6 +100,7 @@ const submitted = computed(() => submissionState.value.status === 'success')
       <RplForm
         :id="formId"
         :title="title"
+        :customInputs="customInputs"
         :schema="schema"
         :submissionState="submissionState as any"
         @submit="submitHandler(props, $event.data)"
diff --git a/packages/ripple-tide-landing-page/mapping/components/basic-text/basic-text-mapping.test.ts b/packages/ripple-tide-landing-page/mapping/components/basic-text/basic-text-mapping.test.ts
index e66a7884f2..58a89a0a1c 100644
--- a/packages/ripple-tide-landing-page/mapping/components/basic-text/basic-text-mapping.test.ts
+++ b/packages/ripple-tide-landing-page/mapping/components/basic-text/basic-text-mapping.test.ts
@@ -52,7 +52,7 @@ const result: TideDynamicPageComponent<ITideBasicText> = {
     }
   ],
   props: {
-    html: '<h2 id="nulla-ultricies-dignissim-leo-posuere-vestibulum-erat-cursus-vitae">Nulla ultricies dignissim leo &amp; posuere vestibulum erat cursus vitae</h2>\n<h3 id="phasellus-congue-aliquam-vehicula">Phasellus congue&nbsp;aliquam vehicula</h3>\n<p class="rpl-callout rpl-callout--neutral">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam tincidunt sit amet ligula sit amet lacinia. In a leo nec tortor aliquet faucibus. Quisque nec congue ligula, vitae condimentum tellus. Nulla nec urna augue. Curabitur commodo nisi est, eu pulvinar tortor cursus vel. Morbi dictum ex est, et semper diam finibus eu. Cras rutrum, nunc a fringilla convallis, massa est vulputate velit, in blandit augue dui vitae elit. Donec hendrerit commodo augue, in maximus orci tempor congue. Mauris ultricies euismod orci, nec vehicula quam vehicula ac. Nunc dictum tortor dolor, nec eleifend orci luctus sed.</p>\n<h3 id="donec-scelerisque-cursus-ex-varius-efficitur">Donec scelerisque cursus ex varius efficitur</h3>\n<div class="rpl-callout"><p class="rpl-callout__wrapper">Lorem ipsum dolor sit amet</p></div>\n<h4>Morbi cursus placerat mi</h4>\n<h5>Nullam laoreet ante placerat</h5>\n<p>Integer interdum nisl ut neque dictum, et sagittis metus feugiat. Sed in mattis neque. Duis at risus non ipsum semper dapibus. Sed enim sapien, molestie sed commodo vel, lacinia vitae risus. Proin sagittis diam nisi, sed rhoncus diam varius id. Sed malesuada felis tortor, scelerisque pretium elit tempor non. Pellentesque ultrices volutpat tincidunt. Fusce quis viverra urna, quis finibus nulla.</p>\n\n<figure class="rpl-blockquote">\n  <blockquote class="rpl-blockquote__quote">\n  <p class="rpl-type-p-large-fixed">Mauris tincidunt tincidunt felis vel tempus. Vestibulum rhoncus blandit justo quis finibus. Phasellus lacus lectus, sollicitudin sed posuere non, ultricies ut quam.</p>\n  </blockquote>\n  <figcaption class="rpl-blockquote__author rpl-type-label-small"><span class="rpl-blockquote__author-name">Duis ligula lacus</span><span class="rpl-blockquote__author-name">Phasellus est turpis, efficitur nec odio imperdiet</span></figcaption>\n</figure>\n\nMauris tincidunt tincidunt felis vel tempus\n<figure><img src="https://develop.content.reference.sdp.vic.gov.au/sites/default/files/tide_demo_content/Melbourne-tram.jpg" class="rpl-img" width="900" alt="Demo: Melbourne tram" srcset="https://develop.content.reference.sdp.vic.gov.au/sites/default/files/tide_demo_content/Melbourne-tram.jpg?width=720, https://develop.content.reference.sdp.vic.gov.au/sites/default/files/tide_demo_content/Melbourne-tram.jpg?width=1440 2x"></figure>\n<p>Phasellus in varius leo. Suspendisse potenti. Donec scelerisque cursus ex varius efficitur. Vivamus pretium nisi sed libero accumsan mattis. Duis convallis, velit eget varius tempus, orci erat aliquam sem, eget porta mauris nisl at mauris.</p>\n\n<figure class="rpl-document">\n  <a class="rpl-document__link rpl-u-focusable-within" aria-label="Demo Sample Document File type: Word. Size: 7.53 KB." href="https://develop.content.reference.sdp.vic.gov.au/sites/default/files/tide_demo_content/sample.docx" target="_blank">\n    <span class="rpl-document__icon rpl-icon rpl-icon--size-l rpl-icon--colour-default rpl-icon--icon-document-lined">\n      <svg role="presentation"><use xlink:href="#icon-document-lined"></use></svg>\n    </span>\n    <div class="rpl-document__content">\n      <span class="rpl-document__name rpl-type-p rpl-type-weight-bold rpl-u-focusable-inline">Demo Sample Document</span>\n      <div class="rpl-document__info rpl-type-label-small">\n        <span class="rpl-file__meta">Word</span>\n        <span class="rpl-file__meta">7.53 KB</span>\n      </div>\n    </div>\n    <span class="rpl-u-visually-hidden">(opens in a new window)</span>\n  </a>\n</figure>\n\n'
+    html: '<h2 id="nulla-ultricies-dignissim-leo-posuere-vestibulum-erat-cursus-vitae">Nulla ultricies dignissim leo &amp; posuere vestibulum erat cursus vitae</h2>\n<h3 id="phasellus-congue-aliquam-vehicula">Phasellus congue&nbsp;aliquam vehicula</h3>\n<p class="rpl-callout rpl-callout--neutral">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam tincidunt sit amet ligula sit amet lacinia. In a leo nec tortor aliquet faucibus. Quisque nec congue ligula, vitae condimentum tellus. Nulla nec urna augue. Curabitur commodo nisi est, eu pulvinar tortor cursus vel. Morbi dictum ex est, et semper diam finibus eu. Cras rutrum, nunc a fringilla convallis, massa est vulputate velit, in blandit augue dui vitae elit. Donec hendrerit commodo augue, in maximus orci tempor congue. Mauris ultricies euismod orci, nec vehicula quam vehicula ac. Nunc dictum tortor dolor, nec eleifend orci luctus sed.</p>\n<h3 id="donec-scelerisque-cursus-ex-varius-efficitur">Donec scelerisque cursus ex varius efficitur</h3>\n<div class="rpl-callout"><p class="rpl-callout__wrapper">Lorem ipsum dolor sit amet</p></div>\n<h4>Morbi cursus placerat mi</h4>\n<h5>Nullam laoreet ante placerat</h5>\n<p>Integer interdum nisl ut neque dictum, et sagittis metus feugiat. Sed in mattis neque. Duis at risus non ipsum semper dapibus. Sed enim sapien, molestie sed commodo vel, lacinia vitae risus. Proin sagittis diam nisi, sed rhoncus diam varius id. Sed malesuada felis tortor, scelerisque pretium elit tempor non. Pellentesque ultrices volutpat tincidunt. Fusce quis viverra urna, quis finibus nulla.</p>\n\n<figure class="rpl-blockquote">\n  <blockquote class="rpl-blockquote__quote">\n  <p class="rpl-type-p-large-fixed">Mauris tincidunt tincidunt felis vel tempus. Vestibulum rhoncus blandit justo quis finibus. Phasellus lacus lectus, sollicitudin sed posuere non, ultricies ut quam.</p>\n  </blockquote>\n  <figcaption class="rpl-blockquote__author rpl-type-label-small"><span class="rpl-blockquote__author-name">Duis ligula lacus</span><span class="rpl-blockquote__author-name">Phasellus est turpis, efficitur nec odio imperdiet</span></figcaption>\n</figure>\n\nMauris tincidunt tincidunt felis vel tempus\n<figure><img src="/sites/default/files/tide_demo_content/Melbourne-tram.jpg" class="rpl-img" width="900" alt="Demo: Melbourne tram" srcset="/sites/default/files/tide_demo_content/Melbourne-tram.jpg?width=720, /sites/default/files/tide_demo_content/Melbourne-tram.jpg?width=1440 2x"></figure>\n<p>Phasellus in varius leo. Suspendisse potenti. Donec scelerisque cursus ex varius efficitur. Vivamus pretium nisi sed libero accumsan mattis. Duis convallis, velit eget varius tempus, orci erat aliquam sem, eget porta mauris nisl at mauris.</p>\n\n<figure class="rpl-document">\n  <a class="rpl-document__link rpl-u-focusable-within" aria-label="Demo Sample Document File type: Word. Size: 7.53 KB." href="/sites/default/files/tide_demo_content/sample.docx" target="_blank">\n    <span class="rpl-document__icon rpl-icon rpl-icon--size-l rpl-icon--colour-default rpl-icon--icon-document-lined">\n      <svg role="presentation"><use xlink:href="#icon-document-lined"></use></svg>\n    </span>\n    <div class="rpl-document__content">\n      <span class="rpl-document__name rpl-type-p rpl-type-weight-bold rpl-u-focusable-inline">Demo Sample Document</span>\n      <div class="rpl-document__info rpl-type-label-small">\n        <span class="rpl-file__meta">Word</span>\n        <span class="rpl-file__meta">7.53 KB</span>\n      </div>\n    </div>\n    <span class="rpl-u-visually-hidden">(opens in a new window)</span>\n  </a>\n</figure>\n\n'
   }
 }
 
diff --git a/packages/ripple-tide-landing-page/mapping/components/card-carousel/card-carousel-mapping.test.ts b/packages/ripple-tide-landing-page/mapping/components/card-carousel/card-carousel-mapping.test.ts
index edd9e1ee16..e3d7862ff1 100644
--- a/packages/ripple-tide-landing-page/mapping/components/card-carousel/card-carousel-mapping.test.ts
+++ b/packages/ripple-tide-landing-page/mapping/components/card-carousel/card-carousel-mapping.test.ts
@@ -16,7 +16,7 @@ describe('cardCarouselMapping', () => {
           alt: 'Demo: Aerial shot of new housing development',
           focalPoint: undefined,
           height: 571,
-          src: 'https://develop.content.reference.sdp.vic.gov.au/sites/default/files/tide_demo_content/Aerial-shot-of-new-housing-development.jpg',
+          src: '/sites/default/files/tide_demo_content/Aerial-shot-of-new-housing-development.jpg',
           title: 'Demo: Aerial shot of new housing development',
           width: 1024
         },
@@ -35,7 +35,7 @@ describe('cardCarouselMapping', () => {
           alt: 'Demo: Melbourne tram',
           focalPoint: undefined,
           height: 785,
-          src: 'https://develop.content.reference.sdp.vic.gov.au/sites/default/files/tide_demo_content/Melbourne-tram.jpg',
+          src: '/sites/default/files/tide_demo_content/Melbourne-tram.jpg',
           title: 'Demo: Melbourne tram',
           width: 1413
         },
@@ -72,7 +72,7 @@ describe('cardCarouselMapping', () => {
           alt: 'Demo: Engage Vic Hero',
           focalPoint: undefined,
           height: 500,
-          src: 'https://develop.content.reference.sdp.vic.gov.au/sites/default/files/tide_demo_content/Engage-Vic-photo-hero.jpeg',
+          src: '/sites/default/files/tide_demo_content/Engage-Vic-photo-hero.jpeg',
           title: 'Engage Vic',
           width: 737
         },
@@ -90,7 +90,7 @@ describe('cardCarouselMapping', () => {
           alt: 'Demo: Melbourne tram',
           focalPoint: undefined,
           height: 785,
-          src: 'https://develop.content.reference.sdp.vic.gov.au/sites/default/files/tide_demo_content/Melbourne-tram.jpg',
+          src: '/sites/default/files/tide_demo_content/Melbourne-tram.jpg',
           title: 'Demo: Melbourne tram',
           width: 1413
         },
@@ -117,7 +117,7 @@ describe('cardCarouselMapping', () => {
           alt: 'Demo: Melbourne tram',
           focalPoint: undefined,
           height: 785,
-          src: 'https://develop.content.reference.sdp.vic.gov.au/sites/default/files/tide_demo_content/Melbourne-tram.jpg',
+          src: '/sites/default/files/tide_demo_content/Melbourne-tram.jpg',
           title: 'Demo: Melbourne tram',
           width: 1413
         },
@@ -148,7 +148,7 @@ describe('cardCarouselMapping', () => {
           alt: 'Demo: 2018-19 State Budget',
           focalPoint: undefined,
           height: 270,
-          src: 'https://develop.content.reference.sdp.vic.gov.au/sites/default/files/tide_demo_content/2018-19-State-Budget.jpg',
+          src: '/sites/default/files/tide_demo_content/2018-19-State-Budget.jpg',
           title: 'Demo: 2018-19 State Budget',
           width: 450
         },
@@ -188,7 +188,7 @@ describe('cardCarouselMapping', () => {
           alt: 'Demo: 2018-19 State Budget',
           focalPoint: undefined,
           height: 270,
-          src: 'https://develop.content.reference.sdp.vic.gov.au/sites/default/files/tide_demo_content/2018-19-State-Budget.jpg',
+          src: '/sites/default/files/tide_demo_content/2018-19-State-Budget.jpg',
           title: 'Demo: 2018-19 State Budget',
           width: 450
         },
@@ -206,7 +206,7 @@ describe('cardCarouselMapping', () => {
           alt: 'Demo: 2018-19 State Budget',
           focalPoint: undefined,
           height: 270,
-          src: 'https://develop.content.reference.sdp.vic.gov.au/sites/default/files/tide_demo_content/2018-19-State-Budget.jpg',
+          src: '/sites/default/files/tide_demo_content/2018-19-State-Budget.jpg',
           title: 'Demo: 2018-19 State Budget',
           width: 450
         },
@@ -253,7 +253,7 @@ describe('cardCarouselMapping', () => {
           alt: 'Demo: Melbourne tram',
           focalPoint: undefined,
           height: 785,
-          src: 'https://develop.content.reference.sdp.vic.gov.au/sites/default/files/tide_demo_content/Melbourne-tram.jpg',
+          src: '/sites/default/files/tide_demo_content/Melbourne-tram.jpg',
           title: 'Demo: Melbourne tram',
           width: 1413
         },
@@ -273,7 +273,7 @@ describe('cardCarouselMapping', () => {
           alt: 'Demo: Melbourne tram',
           focalPoint: undefined,
           height: 785,
-          src: 'https://develop.content.reference.sdp.vic.gov.au/sites/default/files/tide_demo_content/Melbourne-tram.jpg',
+          src: '/sites/default/files/tide_demo_content/Melbourne-tram.jpg',
           title: 'Demo: Melbourne tram',
           width: 1413
         },
@@ -293,7 +293,7 @@ describe('cardCarouselMapping', () => {
           alt: 'Demo: Roulette aerial display',
           focalPoint: undefined,
           height: 496,
-          src: 'https://develop.content.reference.sdp.vic.gov.au/sites/default/files/tide_demo_content/roulette-aerial-display-card.jpg',
+          src: '/sites/default/files/tide_demo_content/roulette-aerial-display-card.jpg',
           title: 'Demo: Roulette aerial display',
           width: 818
         },
diff --git a/packages/ripple-tide-landing-page/mapping/components/compact-cards/compact-cards-mapping.test.ts b/packages/ripple-tide-landing-page/mapping/components/compact-cards/compact-cards-mapping.test.ts
index f7cf411712..d9c4720f86 100644
--- a/packages/ripple-tide-landing-page/mapping/components/compact-cards/compact-cards-mapping.test.ts
+++ b/packages/ripple-tide-landing-page/mapping/components/compact-cards/compact-cards-mapping.test.ts
@@ -13,7 +13,7 @@ const result: TideDynamicPageComponent<ITideCompactCards> = {
         title: 'Card one',
         summary: 'Card one summary',
         image: {
-          src: 'https://develop.content.reference.sdp.vic.gov.au/sites/default/files/2023-08/Image2.jpg',
+          src: '/sites/default/files/2023-08/Image2.jpg',
           alt: '',
           focalPoint: undefined,
           height: 667,
diff --git a/packages/ripple-tide-landing-page/mapping/components/complex-image/complex-image-mapping.test.ts b/packages/ripple-tide-landing-page/mapping/components/complex-image/complex-image-mapping.test.ts
index 13cb68f2a4..cc0d10b99a 100644
--- a/packages/ripple-tide-landing-page/mapping/components/complex-image/complex-image-mapping.test.ts
+++ b/packages/ripple-tide-landing-page/mapping/components/complex-image/complex-image-mapping.test.ts
@@ -11,9 +11,9 @@ const result: TideDynamicPageComponent<ITideComplexImage> = {
     sourceCaption: 'Complex Image Source',
     dataContent: '<p>Image Data</p>',
     dataLabel: 'Complex Image Additional data',
-    src: 'https://develop.content.reference.sdp.vic.gov.au/sites/default/files/tide_demo_content/2018-19-State-Budget.jpg',
+    src: '/sites/default/files/tide_demo_content/2018-19-State-Budget.jpg',
     downloadUrl:
-      'https://develop.content.reference.sdp.vic.gov.au/sites/default/files/tide_demo_content/2018-19-State-Budget.jpg',
+      '/sites/default/files/tide_demo_content/2018-19-State-Budget.jpg',
     downloadLabel: 'Complex Image Download',
     type: 'image',
     variant: 'complex',
diff --git a/packages/ripple-tide-landing-page/mapping/components/complex-image/complex-image-mapping.ts b/packages/ripple-tide-landing-page/mapping/components/complex-image/complex-image-mapping.ts
index 6713cc882e..5a968527ef 100644
--- a/packages/ripple-tide-landing-page/mapping/components/complex-image/complex-image-mapping.ts
+++ b/packages/ripple-tide-landing-page/mapping/components/complex-image/complex-image-mapping.ts
@@ -1,4 +1,4 @@
-import { getBody } from '@dpc-sdp/ripple-tide-api'
+import { getBody, getMediaPath } from '@dpc-sdp/ripple-tide-api'
 import { TideDynamicPageComponent } from '@dpc-sdp/ripple-tide-api/types'
 
 export interface ITideComplexImage {
@@ -25,11 +25,13 @@ export const complexImageMapping = (
     props: {
       title: field.field_complex_image_title,
       sourceCaption: field.field_complex_image_source,
-      src: field.field_complex_image_media.field_media_image.url,
+      src: getMediaPath(field.field_complex_image_media.field_media_image),
       dataLabel: field.field_complex_image_data_label,
       dataContent: getBody(field.field_complex_image_data?.processed),
       fullscreenLabel: field.field_complex_image_full_label,
-      downloadUrl: field.field_complex_image_media.field_media_image.url,
+      downloadUrl: getMediaPath(
+        field.field_complex_image_media.field_media_image
+      ),
       downloadLabel: field.field_complex_image_dl_label,
       type: 'image',
       variant: 'complex',
diff --git a/packages/ripple-tide-landing-page/mapping/components/media-gallery/media-gallery-mapping.test.ts b/packages/ripple-tide-landing-page/mapping/components/media-gallery/media-gallery-mapping.test.ts
index 074679b1f1..29e02d8ca2 100644
--- a/packages/ripple-tide-landing-page/mapping/components/media-gallery/media-gallery-mapping.test.ts
+++ b/packages/ripple-tide-landing-page/mapping/components/media-gallery/media-gallery-mapping.test.ts
@@ -17,45 +17,44 @@ describe('mediaGalleryMapping', () => {
             caption: '2018-19 State Budget caption',
             alt: 'Demo: 2018-19 State Budget',
             thumbnail:
-              'https://develop.content.reference.sdp.vic.gov.au/sites/default/files/tide_demo_content/2018-19-State-Budget.jpg',
+              '/sites/default/files/tide_demo_content/2018-19-State-Budget.jpg',
             image:
-              'https://develop.content.reference.sdp.vic.gov.au/sites/default/files/tide_demo_content/2018-19-State-Budget.jpg'
+              '/sites/default/files/tide_demo_content/2018-19-State-Budget.jpg'
           },
           {
             title: 'Demo: Aerial shot of new housing development',
             caption: 'An aerial shot of new housing development caption',
             alt: 'Demo: Aerial shot of new housing development',
             thumbnail:
-              'https://develop.content.reference.sdp.vic.gov.au/sites/default/files/tide_demo_content/Aerial-shot-of-new-housing-development.jpg',
+              '/sites/default/files/tide_demo_content/Aerial-shot-of-new-housing-development.jpg',
             image:
-              'https://develop.content.reference.sdp.vic.gov.au/sites/default/files/tide_demo_content/Aerial-shot-of-new-housing-development.jpg'
+              '/sites/default/files/tide_demo_content/Aerial-shot-of-new-housing-development.jpg'
           },
           {
             title: 'Demo: Bendigo Hospital',
             caption: null,
             alt: 'Demo: Bendigo Hospital',
             thumbnail:
-              'https://develop.content.reference.sdp.vic.gov.au/sites/default/files/tide_demo_content/Bendigo-Hospital.jpg',
-            image:
-              'https://develop.content.reference.sdp.vic.gov.au/sites/default/files/tide_demo_content/Bendigo-Hospital.jpg'
+              '/sites/default/files/tide_demo_content/Bendigo-Hospital.jpg',
+            image: '/sites/default/files/tide_demo_content/Bendigo-Hospital.jpg'
           },
           {
             title: 'Demo: Covid Primary Campaign',
             caption: null,
             alt: 'Demo: Covid Primary Campaign',
             thumbnail:
-              'https://develop.content.reference.sdp.vic.gov.au/sites/default/files/tide_demo_content/covid_primarycampaign.png',
+              '/sites/default/files/tide_demo_content/covid_primarycampaign.png',
             image:
-              'https://develop.content.reference.sdp.vic.gov.au/sites/default/files/tide_demo_content/covid_primarycampaign.png'
+              '/sites/default/files/tide_demo_content/covid_primarycampaign.png'
           },
           {
             title: 'Demo: Engage Vic Hero',
             caption: null,
             alt: 'Demo: Engage Vic Hero',
             thumbnail:
-              'https://develop.content.reference.sdp.vic.gov.au/sites/default/files/tide_demo_content/Engage-Vic-photo-hero.jpeg',
+              '/sites/default/files/tide_demo_content/Engage-Vic-photo-hero.jpeg',
             image:
-              'https://develop.content.reference.sdp.vic.gov.au/sites/default/files/tide_demo_content/Engage-Vic-photo-hero.jpeg'
+              '/sites/default/files/tide_demo_content/Engage-Vic-photo-hero.jpeg'
           }
         ]
       }
diff --git a/packages/ripple-tide-landing-page/mapping/components/media-gallery/media-gallery-mapping.ts b/packages/ripple-tide-landing-page/mapping/components/media-gallery/media-gallery-mapping.ts
index 0012572d71..b3aadd76ab 100644
--- a/packages/ripple-tide-landing-page/mapping/components/media-gallery/media-gallery-mapping.ts
+++ b/packages/ripple-tide-landing-page/mapping/components/media-gallery/media-gallery-mapping.ts
@@ -1,4 +1,5 @@
 import { TideDynamicPageComponent } from '@dpc-sdp/ripple-tide-api/types'
+import { getMediaPath } from '@dpc-sdp/ripple-tide-api'
 
 export interface ITideMediaGallery {
   id: string
@@ -25,9 +26,8 @@ export const mediaGalleryMapping = (
             title: item.name,
             caption: item.field_media_caption,
             alt: item.field_media_image.meta.alt,
-            thumbnail:
-              item.field_media_image?.url || item.field_media_image.uri,
-            image: item.field_media_image?.url || item.field_media_image.uri
+            thumbnail: getMediaPath(item.field_media_image),
+            image: getMediaPath(item.field_media_image)
           }
         }
       )
diff --git a/packages/ripple-tide-landing-page/mapping/components/navigation-card/navigation-card-mapping.test.ts b/packages/ripple-tide-landing-page/mapping/components/navigation-card/navigation-card-mapping.test.ts
index 4446ada096..191960c83d 100644
--- a/packages/ripple-tide-landing-page/mapping/components/navigation-card/navigation-card-mapping.test.ts
+++ b/packages/ripple-tide-landing-page/mapping/components/navigation-card/navigation-card-mapping.test.ts
@@ -79,7 +79,7 @@ describe('navigationCardMapping', () => {
           alt: 'Demo: Melbourne tram',
           focalPoint: undefined,
           height: 785,
-          src: 'https://develop.content.reference.sdp.vic.gov.au/sites/default/files/tide_demo_content/Melbourne-tram.jpg',
+          src: '/sites/default/files/tide_demo_content/Melbourne-tram.jpg',
           title: 'Demo: Melbourne tram',
           width: 1413
         },
diff --git a/packages/ripple-tide-landing-page/mapping/components/promo-card/promo-card-mapping.test.ts b/packages/ripple-tide-landing-page/mapping/components/promo-card/promo-card-mapping.test.ts
index 92f5544545..b498057acd 100644
--- a/packages/ripple-tide-landing-page/mapping/components/promo-card/promo-card-mapping.test.ts
+++ b/packages/ripple-tide-landing-page/mapping/components/promo-card/promo-card-mapping.test.ts
@@ -80,7 +80,7 @@ describe('navigationCardMapping', () => {
           alt: 'Demo: Melbourne tram',
           focalPoint: undefined,
           height: 785,
-          src: 'https://develop.content.reference.sdp.vic.gov.au/sites/default/files/tide_demo_content/Melbourne-tram.jpg',
+          src: '/sites/default/files/tide_demo_content/Melbourne-tram.jpg',
           title: 'Demo: Melbourne tram',
           width: 1413
         },
diff --git a/packages/ripple-tide-landing-page/mapping/components/timeline/timeline-mapping.test.ts b/packages/ripple-tide-landing-page/mapping/components/timeline/timeline-mapping.test.ts
index c7db001ea6..1e3fed0a60 100644
--- a/packages/ripple-tide-landing-page/mapping/components/timeline/timeline-mapping.test.ts
+++ b/packages/ripple-tide-landing-page/mapping/components/timeline/timeline-mapping.test.ts
@@ -375,7 +375,7 @@ describe('timelineMapping', () => {
               alt: 'Demo: Bendigo Hospital',
               focalPoint: undefined,
               height: 959,
-              src: 'https://develop.content.reference.sdp.vic.gov.au/sites/default/files/tide_demo_content/Bendigo-Hospital.jpg',
+              src: '/sites/default/files/tide_demo_content/Bendigo-Hospital.jpg',
               title: 'Demo: Bendigo Hospital.jpg',
               width: 1280
             },
diff --git a/packages/ripple-tide-landing-page/mapping/hero-header/__test__/hero-header-mapping.test.ts b/packages/ripple-tide-landing-page/mapping/hero-header/__test__/hero-header-mapping.test.ts
index fa816a03df..f63c300577 100644
--- a/packages/ripple-tide-landing-page/mapping/hero-header/__test__/hero-header-mapping.test.ts
+++ b/packages/ripple-tide-landing-page/mapping/hero-header/__test__/hero-header-mapping.test.ts
@@ -26,7 +26,7 @@ const result: TideHeroHeader = {
   },
   theme: 'default',
   logoImage: {
-    src: 'https://develop.content.reference.sdp.vic.gov.au/sites/default/files/tide_demo_content/Parliament-of-Victoria.jpg',
+    src: '/sites/default/files/tide_demo_content/Parliament-of-Victoria.jpg',
     alt: 'Demo: Parliament of Victoria',
     title: 'Demo: Parliament of Victoria',
     width: 1650,
@@ -35,14 +35,14 @@ const result: TideHeroHeader = {
   backgroundImage: null,
   backgroundImageCaption: '',
   cornerTop: {
-    src: 'https://develop.content.reference.sdp.vic.gov.au/sites/default/files/tide_demo_content/Aerial-shot-of-new-housing-development.jpg',
+    src: '/sites/default/files/tide_demo_content/Aerial-shot-of-new-housing-development.jpg',
     alt: 'Demo: Aerial shot of new housing development',
     title: 'Demo: Aerial shot of new housing development',
     width: 1024,
     height: 571
   },
   cornerBottom: {
-    src: 'https://develop.content.reference.sdp.vic.gov.au/sites/default/files/tide_demo_content/VicFleet-Police-car-on-road.jpg',
+    src: '/sites/default/files/tide_demo_content/VicFleet-Police-car-on-road.jpg',
     alt: 'Demo: VicFleet - Police car on road',
     title: 'Demo: VicFleet - Police car on road',
     width: 1065,
diff --git a/packages/ripple-tide-landing-page/mapping/primary-campaign/__test__/primary-campaign-mapping.test.ts b/packages/ripple-tide-landing-page/mapping/primary-campaign/__test__/primary-campaign-mapping.test.ts
index 4a762df134..3adcc42fed 100644
--- a/packages/ripple-tide-landing-page/mapping/primary-campaign/__test__/primary-campaign-mapping.test.ts
+++ b/packages/ripple-tide-landing-page/mapping/primary-campaign/__test__/primary-campaign-mapping.test.ts
@@ -22,7 +22,7 @@ describe('primaryCampaignMapping', () => {
         url: 'https://www.vic.gov.au'
       },
       image: {
-        src: 'https://develop.content.reference.sdp.vic.gov.au/sites/default/files/tide_demo_content/Melbourne-skyline-at-dusk.jpg',
+        src: '/sites/default/files/tide_demo_content/Melbourne-skyline-at-dusk.jpg',
         alt: 'Demo: Melbourne skyline at dusk',
         title: 'Demo: Melbourne skyline at dusk',
         width: 2560,
@@ -43,7 +43,7 @@ describe('primaryCampaignMapping', () => {
         url: 'https://www.vic.gov.au'
       },
       image: {
-        src: 'https://develop.content.reference.sdp.vic.gov.au/sites/default/files/tide_demo_content/Melbourne-skyline-at-dusk.jpg',
+        src: '/sites/default/files/tide_demo_content/Melbourne-skyline-at-dusk.jpg',
         alt: 'Demo: Melbourne skyline at dusk',
         title: 'Demo: Melbourne skyline at dusk',
         width: 2560,
diff --git a/packages/ripple-tide-landing-page/mapping/secondary-campaign/__test__/secondary-campaign-mapping.test.ts b/packages/ripple-tide-landing-page/mapping/secondary-campaign/__test__/secondary-campaign-mapping.test.ts
index 4fc4868e3f..3f6550b652 100644
--- a/packages/ripple-tide-landing-page/mapping/secondary-campaign/__test__/secondary-campaign-mapping.test.ts
+++ b/packages/ripple-tide-landing-page/mapping/secondary-campaign/__test__/secondary-campaign-mapping.test.ts
@@ -18,7 +18,7 @@ describe('secondaryCampaignMapping', () => {
         url: 'https://www.vic.gov.au'
       },
       image: {
-        src: 'https://develop.content.reference.sdp.vic.gov.au/sites/default/files/tide_demo_content/Melbourne-tram.jpg',
+        src: '/sites/default/files/tide_demo_content/Melbourne-tram.jpg',
         alt: 'Demo: Melbourne tram',
         title: 'Demo: Melbourne tram',
         width: 1413,
diff --git a/packages/ripple-tide-landing-page/mapping/secondary-campaign/__test__/test-data.ts b/packages/ripple-tide-landing-page/mapping/secondary-campaign/__test__/test-data.ts
index d69409af2f..94c90af0a7 100644
--- a/packages/ripple-tide-landing-page/mapping/secondary-campaign/__test__/test-data.ts
+++ b/packages/ripple-tide-landing-page/mapping/secondary-campaign/__test__/test-data.ts
@@ -370,7 +370,7 @@ export const testData = {
         filename: 'Melbourne-tram.jpg',
         uri: {
           value: 'public://tide_demo_content/Melbourne-tram.jpg',
-          url: 'https://develop.content.reference.sdp.vic.gov.au/sites/default/files/tide_demo_content/Melbourne-tram.jpg'
+          url: '/sites/default/files/tide_demo_content/Melbourne-tram.jpg'
         },
         filemime: 'image/jpeg',
         filesize: 176549,
diff --git a/packages/ripple-tide-landing-page/package.json b/packages/ripple-tide-landing-page/package.json
index fcfb9d8ba9..c240cf4002 100644
--- a/packages/ripple-tide-landing-page/package.json
+++ b/packages/ripple-tide-landing-page/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/ripple-tide-landing-page",
   "description": "Ripple mappings and components for Tide landing-page Content type",
-  "version": "2.11.0",
+  "version": "2.14.0",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./nuxt.config.ts",
diff --git a/packages/ripple-tide-media/mapping/audio-mapping.ts b/packages/ripple-tide-media/mapping/audio-mapping.ts
index b401f08909..849f4a25d4 100644
--- a/packages/ripple-tide-media/mapping/audio-mapping.ts
+++ b/packages/ripple-tide-media/mapping/audio-mapping.ts
@@ -1,12 +1,13 @@
 import type { IRplTideModuleMapping } from '@dpc-sdp/ripple-tide-api/types'
 import { tideMediaBaseMapping, tideMediaBaseIncludes } from './media-mapping'
+import { getMediaPath } from '@dpc-sdp/ripple-tide-api'
 
 const tideMediaAudioMapping: IRplTideModuleMapping = {
   mapping: {
     ...tideMediaBaseMapping,
     media: {
       ...tideMediaBaseMapping.media,
-      url: 'field_media_file.url'
+      url: (src: any) => getMediaPath(src.field_media_file)
     }
   },
   includes: [...tideMediaBaseIncludes, 'field_media_file']
diff --git a/packages/ripple-tide-media/package.json b/packages/ripple-tide-media/package.json
index 51eaa42f9b..9ba05a7d52 100644
--- a/packages/ripple-tide-media/package.json
+++ b/packages/ripple-tide-media/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/ripple-tide-media",
   "description": "Ripple mappings and components for Tide media",
-  "version": "2.11.0",
+  "version": "2.14.0",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./nuxt.config.ts",
diff --git a/packages/ripple-tide-news/components/TideNewsBody.vue b/packages/ripple-tide-news/components/TideNewsBody.vue
index db249dbe11..8adde726a3 100644
--- a/packages/ripple-tide-news/components/TideNewsBody.vue
+++ b/packages/ripple-tide-news/components/TideNewsBody.vue
@@ -49,7 +49,7 @@ const detailsList = computed(() => {
       hideTerm: flags?.hideDetailLabels,
       description: formatDate(props.details?.published, {
         dateStyle: 'full',
-        timeStyle: 'short'
+        timeStyle: flags?.hidePublishedTime ? undefined : 'short'
       })
     })
   }
diff --git a/packages/ripple-tide-news/package.json b/packages/ripple-tide-news/package.json
index d36eff4686..3100084c2f 100644
--- a/packages/ripple-tide-news/package.json
+++ b/packages/ripple-tide-news/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/ripple-tide-news",
   "description": "Ripple mappings and components for Tide News content type",
-  "version": "2.11.0",
+  "version": "2.14.0",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./nuxt.config.ts",
diff --git a/packages/ripple-tide-publication/mapping/publication-page.ts b/packages/ripple-tide-publication/mapping/publication-page.ts
index de6ad8e94a..d8ffc1e92d 100644
--- a/packages/ripple-tide-publication/mapping/publication-page.ts
+++ b/packages/ripple-tide-publication/mapping/publication-page.ts
@@ -1,5 +1,4 @@
-import mime from 'mime-types'
-import { getField, humanizeFilesize } from '@dpc-sdp/ripple-tide-api'
+import { getField, getDocumentFromField } from '@dpc-sdp/ripple-tide-api'
 import {
   tidePageBaseMapping,
   tidePageBaseIncludes
@@ -42,7 +41,7 @@ const tidePublicationPageModule: IRplTideModuleMapping = {
       text: 'publication_navigation_root.meta.title',
       url: 'publication_navigation_root.meta.url',
       id: 'publication_navigation_root.meta.id',
-      documents: (src) =>
+      documents: (src: any) =>
         (
           getField(
             src,
@@ -50,13 +49,7 @@ const tidePublicationPageModule: IRplTideModuleMapping = {
               ? 'field_publication.field_publication.field_node_documents'
               : 'field_publication.field_node_documents'
           ) || []
-        ).map((doc: any) => ({
-          name: doc.name,
-          url: doc.field_media_file.url || doc.field_media_file.uri,
-          size: humanizeFilesize(doc.field_media_file.filesize),
-          extension: mime.extension(doc.field_media_file.filemime),
-          id: doc.id
-        })),
+        ).map((doc: any) => getDocumentFromField(doc)),
       pagination: {
         prev: {
           label: () => 'Previous',
diff --git a/packages/ripple-tide-publication/mapping/publication.ts b/packages/ripple-tide-publication/mapping/publication.ts
index 733cde8a16..2fbc497702 100644
--- a/packages/ripple-tide-publication/mapping/publication.ts
+++ b/packages/ripple-tide-publication/mapping/publication.ts
@@ -1,5 +1,4 @@
-import mime from 'mime-types'
-import { getField, humanizeFilesize } from '@dpc-sdp/ripple-tide-api'
+import { getField, getDocumentFromField } from '@dpc-sdp/ripple-tide-api'
 import {
   tidePageBaseMapping,
   tidePageBaseIncludes
@@ -59,13 +58,9 @@ const tidePublicationModule: IRplTideModuleMapping = {
       url: 'path.url',
       id: 'id',
       documents: (src: string) =>
-        getField(src, 'field_node_documents').map((doc: any) => ({
-          name: doc.name,
-          url: doc.field_media_file.url || doc.field_media_file.uri,
-          size: humanizeFilesize(doc.field_media_file.filesize),
-          extension: mime.extension(doc.field_media_file.filemime),
-          id: doc.id
-        }))
+        getField(src, 'field_node_documents').map((doc: any) =>
+          getDocumentFromField(doc)
+        )
     },
     showLastUpdated: () => true
   },
diff --git a/packages/ripple-tide-publication/package.json b/packages/ripple-tide-publication/package.json
index 85daa74cb7..7353c80897 100644
--- a/packages/ripple-tide-publication/package.json
+++ b/packages/ripple-tide-publication/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/ripple-tide-publication",
   "description": "Ripple mappings and components for Tide Publication Content type",
-  "version": "2.11.0",
+  "version": "2.14.0",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./nuxt.config.ts",
diff --git a/packages/ripple-tide-search/app.config.ts b/packages/ripple-tide-search/app.config.ts
index 986c517cd0..bdd071010f 100644
--- a/packages/ripple-tide-search/app.config.ts
+++ b/packages/ripple-tide-search/app.config.ts
@@ -1,3 +1,5 @@
+import rplAddressSuggestionsFn from './utils/rplAddressSuggestionsFn'
+
 export default defineAppConfig({
   ripple: {
     search: {
@@ -9,7 +11,10 @@ export default defineAppConfig({
         'publication',
         'publication_page',
         'tide_search_listing'
-      ]
+      ],
+      suggestionsFunctions: {
+        rplAddressSuggestionsFn
+      }
     }
   }
 })
diff --git a/packages/ripple-tide-search/components/TideSearchListingPage.vue b/packages/ripple-tide-search/components/TideSearchListingPage.vue
index bac2d6ddda..bbd62df036 100644
--- a/packages/ripple-tide-search/components/TideSearchListingPage.vue
+++ b/packages/ripple-tide-search/components/TideSearchListingPage.vue
@@ -27,7 +27,7 @@ interface TideContentPage extends TidePageBase {
 }
 
 interface Props {
-  id: string
+  id?: string
   title: string
   introText?: string
   autocompleteQuery?: boolean
diff --git a/packages/ripple-tide-search/components/TideSearchPage.vue b/packages/ripple-tide-search/components/TideSearchPage.vue
index 9b74b231d4..7c40b5666c 100644
--- a/packages/ripple-tide-search/components/TideSearchPage.vue
+++ b/packages/ripple-tide-search/components/TideSearchPage.vue
@@ -3,8 +3,7 @@ import { ref, watch } from 'vue'
 import {
   getActiveFilterURL,
   scrollToElementTopWithOffset,
-  useRuntimeConfig,
-  useTideSite
+  useRuntimeConfig
 } from '#imports'
 import useSearchUI from './../composables/useSearchUI'
 import {
@@ -15,14 +14,16 @@ import { FormKit } from '@formkit/vue'
 import { SearchDriverOptions } from '@elastic/search-ui'
 import { useRippleEvent } from '@dpc-sdp/ripple-ui-core'
 import type { rplEventPayload } from '@dpc-sdp/ripple-ui-core'
+import type { TideSiteData } from '@dpc-sdp/ripple-tide-api/types'
 
 interface Props {
-  id: string
+  id?: string
+  site: TideSiteData
   pageTitle: string
   filtersConfig: AppSearchFilterConfigItem[]
   searchDriverOptions: Omit<SearchDriverOptions, 'apiConnector'>
   searchResultsMappingFn: (item: any) => MappedSearchResult<any>
-  scrollToResults: boolean
+  scrollToResults?: boolean
 }
 
 const props = withDefaults(defineProps<Props>(), {
@@ -81,7 +82,6 @@ const emit = defineEmits<{
 const { emitRplEvent } = useRippleEvent('tide-search', emit)
 
 const { public: config } = useRuntimeConfig()
-const site = await useTideSite()
 
 const apiConnectorOptions = {
   // Omit the search key, we'll add it on the server
@@ -316,6 +316,7 @@ watch(
                 </div>
               </div>
               <RplFormActions
+                id="tide-search-page-actions"
                 :label="submitFiltersLabel"
                 resetLabel="Clear search filters"
                 :displayResetButton="true"
diff --git a/packages/ripple-tide-search/components/TideSearchResultTableCell.vue b/packages/ripple-tide-search/components/TideSearchResultTableCell.vue
new file mode 100644
index 0000000000..34f8b95b73
--- /dev/null
+++ b/packages/ripple-tide-search/components/TideSearchResultTableCell.vue
@@ -0,0 +1,15 @@
+<template>
+  <div class="tide-search-result-cell"><slot></slot></div>
+</template>
+
+<style>
+.tide-search-result-cell {
+  display: flex;
+  flex-direction: column;
+  gap: var(--rpl-sp-3);
+
+  address {
+    font-style: normal;
+  }
+}
+</style>
diff --git a/packages/ripple-tide-search/components/TideSearchResultTableHeading.vue b/packages/ripple-tide-search/components/TideSearchResultTableHeading.vue
new file mode 100644
index 0000000000..643fc7d4e0
--- /dev/null
+++ b/packages/ripple-tide-search/components/TideSearchResultTableHeading.vue
@@ -0,0 +1,16 @@
+<template>
+  <h4
+    class="tide-search-result-table-heading"
+  >
+    <slot></slot>
+  </h4>
+</template>
+
+
+<style>
+@import '@dpc-sdp/ripple-ui-core/style/breakpoints';
+
+.tide-search-result-table-heading {
+  font-weight: bold;
+}
+</style>
diff --git a/packages/ripple-tide-search/components/global/TideCustomCollection.vue b/packages/ripple-tide-search/components/global/TideCustomCollection.vue
index fa36a418ed..0d72b50e1a 100644
--- a/packages/ripple-tide-search/components/global/TideCustomCollection.vue
+++ b/packages/ripple-tide-search/components/global/TideCustomCollection.vue
@@ -286,7 +286,12 @@ onMapResultsHook.value = () => {
   const hookFnName = props.mapConfig?.onResultsHook
   const fns: Record<
     string,
-    (map: any, results: any, locationQuery: any) => Promise<any>
+    (
+      map: any,
+      results: any,
+      locationQuery: any,
+      mapDeadSpace?: any
+    ) => Promise<any>
   > = appConfig?.ripple?.search?.mapResultHooks || {}
 
   if (!hookFnName) {
@@ -301,7 +306,12 @@ onMapResultsHook.value = () => {
     )
   }
 
-  hookFn(rplMapRef.value, mapResults.value, locationOrGeolocation.value)
+  hookFn(
+    rplMapRef.value,
+    mapResults.value,
+    locationOrGeolocation.value,
+    deadSpace.value
+  )
 }
 
 const resultsContainer = computed(
@@ -321,6 +331,8 @@ const emitSearchEvent = (event) => {
 }
 
 const handleSearchSubmit = (event) => {
+  geolocationError.value = null
+
   if (props.userFilters && props.userFilters.length) {
     cachedSubmitEvent.value = event
     // Submitting the search term should also 'apply' the filters, but the filters live in a seperate form.
@@ -368,6 +380,7 @@ const handleFilterReset = (event: rplEventPayload) => {
   )
 
   locationQuery.value = null
+  geolocationError.value = null
   resetSearch()
   resetFilters()
   submitSearch()
@@ -552,6 +565,7 @@ const locationOrGeolocation = computed(() => {
           v-bind="locationQueryConfig?.props"
           :label="searchListingConfig.labels?.submit"
           :placeholder="searchListingConfig.labels?.placeholder"
+          :variant="reverseFields ? 'reverse' : 'default'"
           :inputValue="locationQuery"
           :resultsloaded="mapFeatures.length > 0"
           :isGettingLocation="isGettingLocation"
diff --git a/packages/ripple-tide-search/components/global/TideSearchAddressLookup.vue b/packages/ripple-tide-search/components/global/TideSearchAddressLookup.vue
index 627fc531fe..7eba28ed56 100644
--- a/packages/ripple-tide-search/components/global/TideSearchAddressLookup.vue
+++ b/packages/ripple-tide-search/components/global/TideSearchAddressLookup.vue
@@ -13,9 +13,9 @@
       :showNoResults="true"
       :maxSuggestionsDisplayed="8"
       :placeholder="placeholder"
-      :getOptionId="(itm:any) => itm?.id || itm?.name"
-      :getSuggestionVal="(itm:any) => itm?.name || ''"
-      :getOptionLabel="(itm:any) => itm?.name || ''"
+      :getOptionId="(itm: any) => itm?.id || itm?.name"
+      :getSuggestionVal="(itm: any) => itm?.name || ''"
+      :getOptionLabel="(itm: any) => itm?.name || ''"
       :isBusy="isGettingLocation"
       :isFreeText="false"
       :submitOnClear="true"
@@ -43,25 +43,39 @@
 
 <script setup lang="ts">
 import { inject, watch } from 'vue'
-import { ref, getSingleResultValue } from '#imports'
+import { ref } from '#imports'
 import { useDebounceFn } from '@vueuse/core'
 import { transformExtent, fromLonLat } from 'ol/proj'
 import { Extent } from 'ol/extent'
+import { addressResultType } from '../../types'
 // TODO must add analytics events
 // import { useRippleEvent } from '@dpc-sdp/ripple-ui-core'
 
 interface Props {
   inputValue?: any
   resultsloaded?: boolean
+  /**
+   * @deprecated use suggestionsConfig instead to customise suggestions
+   */
   suggestionsIndex?: string
+  /**
+   * @deprecated use suggestionsConfig instead to customise suggestions
+   */
   suggestionsKey?: string
   controlMapZooming?: boolean
   label?: string
   placeholder?: string
   tagsComponent?: string
+  /**
+   * @deprecated use suggestionsConfig instead to customise suggestions
+   */
   mapResultsFnName?: string
   isGettingLocation?: boolean
   userGeolocation: any
+  suggestionsConfig: {
+    function: string
+    args: Record<string, any>
+  }
 }
 
 const props = withDefaults(defineProps<Props>(), {
@@ -80,18 +94,10 @@ const props = withDefaults(defineProps<Props>(), {
 
 const results = ref([])
 
-type addressResultType = {
-  name: string
-  postcode: string
-  bbox: string[]
-  type: 'postcode' | 'locality'
-}
-
 const emit = defineEmits<{
   (e: 'update', payload: addressResultType): void
 }>()
 
-const appConfig = useAppConfig()
 const { rplMapRef, deadSpace } = inject('rplMapInstance')
 
 const pendingZoomAnimation = ref(false)
@@ -104,86 +110,36 @@ async function submitAction(e: any) {
     return
   }
 
-  emit('update', item || null)
+  if (item?.arcGISMagicKey) {
+    const arcGISAddress = await getAddressFromArcGISMagicKey(
+      item.arcGISMagicKey
+    )
+    emit('update', arcGISAddress)
+  } else {
+    emit('update', item || null)
+  }
 
   // Because this was a user initiated action, we want to animate the zoom
   pendingZoomAnimation.value = true
 }
 
 const fetchSuggestions = async (query: string) => {
-  const searchUrl = `/api/tide/app-search/${props.suggestionsIndex}/elasticsearch/_search`
-  const queryDSL = {
-    query: {
-      bool: {
-        should: [
-          {
-            match: {
-              [props.suggestionsKey]: {
-                query,
-                operator: 'and'
-              }
-            }
-          },
-          {
-            prefix: {
-              [props.suggestionsKey]: {
-                value: query,
-                case_insensitive: true
-              }
-            }
-          },
-          {
-            term: {
-              postcode: {
-                value: query
-              }
-            }
-          }
-        ]
-      }
-    }
-  }
-
   try {
-    const response = await $fetch(searchUrl, {
-      method: 'POST',
-      body: {
-        ...queryDSL,
-        size: 20
-      }
-    })
-
-    let mappingFn = (itm: any) => {
-      const center = getSingleResultValue(itm._source.center)?.split(',')
-
-      return {
-        id: itm._id,
-        name: getSingleResultValue(itm._source[props.suggestionsKey]),
-        postcode: getSingleResultValue(itm._source.postcode),
-        bbox: itm._source.bbox,
-        center: center?.length === 2 ? [center[1], center[0]] : undefined
-      }
-    }
-
-    const fns: Record<string, (item: any) => any> =
-      appConfig?.ripple?.search?.locationSuggestionMappingFunctions || {}
-
-    // If no transform function is defined, return an empty array
-    if (props.mapResultsFnName) {
-      const transformFn = fns[props.mapResultsFnName]
-
-      if (typeof transformFn !== 'function') {
-        throw new Error(
-          `Search listing: No matching location transform function called "${props.mapResultsFnName}"`
-        )
-      }
+    if (props.suggestionsConfig?.function) {
+      const suggestionsFn = useAppConfigFunction(
+        props.suggestionsConfig.function,
+        'suggestionsFunctions'
+      )
 
-      mappingFn = transformFn
+      return await suggestionsFn(query, props.suggestionsConfig.args)
     }
 
-    if (response && response.hits.total.value > 0) {
-      return response.hits.hits.map(mappingFn)
-    }
+    return await useLegacySuggestions(
+      query,
+      props.suggestionsIndex,
+      props.suggestionsKey,
+      props.mapResultsFnName
+    )
   } catch (e) {
     console.error(e)
   }
diff --git a/packages/ripple-tide-search/components/global/TideSearchListing/TideSearchListingTableUrl.vue b/packages/ripple-tide-search/components/global/TideSearchListing/TideSearchListingTableUrl.vue
index 8d0d9df6fa..b48e8067b7 100644
--- a/packages/ripple-tide-search/components/global/TideSearchListing/TideSearchListingTableUrl.vue
+++ b/packages/ripple-tide-search/components/global/TideSearchListing/TideSearchListingTableUrl.vue
@@ -1,5 +1,6 @@
 <template>
-  <RplTextLink v-if="value" :url="value">{{ value }}</RplTextLink>
+  <RplTextLink v-if="url" :url="url">{{ value }}</RplTextLink>
+  <span v-else>{{ value }}</span>
 </template>
 
 <script setup lang="ts">
@@ -12,8 +13,21 @@ interface Props {
 
 const props = defineProps<Props>()
 
-const value = computed(() => {
+const url = computed(() => {
   const result = getSearchResultValue(props.item, props.column.objectKey, true)
   return Array.isArray(result) ? result[0] : result
 })
+
+const value = computed(() => {
+  if (props.column?.objectTextKey) {
+    const result = getSearchResultValue(
+      props.item,
+      props.column.objectTextKey,
+      true
+    )
+    return Array.isArray(result) ? result[0] : result
+  }
+
+  return url.value
+})
 </script>
diff --git a/packages/ripple-tide-search/composables/useAppConfigFunction.ts b/packages/ripple-tide-search/composables/useAppConfigFunction.ts
new file mode 100644
index 0000000000..973f56addf
--- /dev/null
+++ b/packages/ripple-tide-search/composables/useAppConfigFunction.ts
@@ -0,0 +1,16 @@
+
+
+export default  (
+  fnName: string, configBucket: string
+) => {
+  const appConfig = useAppConfig()
+  const fn = appConfig?.ripple?.search?.[configBucket]?.[fnName]
+
+  if (typeof fn !== 'function') {
+    throw new Error(
+      `Search listing: No matching function called "${fnName}" in config bucket "${configBucket}"`
+    )
+  }
+
+  return fn
+}
diff --git a/packages/ripple-tide-search/composables/useLegacySuggestions.ts b/packages/ripple-tide-search/composables/useLegacySuggestions.ts
new file mode 100644
index 0000000000..6e199883f7
--- /dev/null
+++ b/packages/ripple-tide-search/composables/useLegacySuggestions.ts
@@ -0,0 +1,71 @@
+export default async (
+  query: string,
+  suggestionsIndex: string = 'vic-postcode-localities',
+  suggestionsKey: string = 'name',
+  mapResultsFnName?: string
+) => {
+  const searchUrl = `/api/tide/app-search/${suggestionsIndex}/elasticsearch/_search`
+  const queryDSL = {
+    query: {
+      bool: {
+        should: [
+          {
+            match: {
+              [suggestionsKey]: {
+                query,
+                operator: 'and'
+              }
+            }
+          },
+          {
+            prefix: {
+              [suggestionsKey]: {
+                value: query,
+                case_insensitive: true
+              }
+            }
+          },
+          {
+            term: {
+              postcode: {
+                value: query
+              }
+            }
+          }
+        ]
+      }
+    }
+  }
+
+  const response = await $fetch(searchUrl, {
+    method: 'POST',
+    body: {
+      ...queryDSL,
+      size: 20
+    }
+  })
+
+  let mappingFn = (itm: any) => {
+    const center = getSingleResultValue(itm._source.center)?.split(',')
+
+    return {
+      id: itm._id,
+      name: getSingleResultValue(itm._source[suggestionsKey]),
+      postcode: getSingleResultValue(itm._source.postcode),
+      bbox: itm._source.bbox,
+      center: center?.length === 2 ? [center[1], center[0]] : undefined
+    }
+  }
+
+  // If no transform function is defined, return an empty array
+  if (mapResultsFnName) {
+    mappingFn = useAppConfigFunction(
+      mapResultsFnName,
+      'locationSuggestionMappingFunctions'
+    )
+  }
+
+  if (response && response.hits.total.value > 0) {
+    return response.hits.hits.map(mappingFn)
+  }
+}
diff --git a/packages/ripple-tide-search/composables/useSearchResult.ts b/packages/ripple-tide-search/composables/useSearchResult.ts
index 9ae64f2418..5f978100f2 100644
--- a/packages/ripple-tide-search/composables/useSearchResult.ts
+++ b/packages/ripple-tide-search/composables/useSearchResult.ts
@@ -1,14 +1,21 @@
 import { computed } from 'vue'
 import { getSearchResultValue, truncateText } from '#imports'
+import { stripMediaBaseUrl } from '@dpc-sdp/ripple-tide-api/utils'
 
 interface ResultOptions {
   summaryMaxLength: number | null
 }
 
 export default (result, options: ResultOptions = { summaryMaxLength: 150 }) => {
-  const { $app_origin } = useNuxtApp()
+  const { $app_origin, $config } = useNuxtApp()
   const title = computed(() => getSearchResultValue(result, 'title'))
   const url = computed(() => {
+    const externalURL = getSearchResultValue(result, 'field_redirect_website')
+
+    if (externalURL) {
+      return externalURL
+    }
+
     return stripSiteId(getSearchResultValue(result, 'url'), $app_origin || '')
   })
   const updated = computed(() => {
@@ -46,7 +53,7 @@ export default (result, options: ResultOptions = { summaryMaxLength: 150 }) => {
 
     if (src) {
       return {
-        src,
+        src: stripMediaBaseUrl(src, $config.public?.tide?.baseUrl),
         alt: ''
       }
     }
diff --git a/packages/ripple-tide-search/package.json b/packages/ripple-tide-search/package.json
index f15aa5572a..d4aa060aef 100644
--- a/packages/ripple-tide-search/package.json
+++ b/packages/ripple-tide-search/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/ripple-tide-search",
   "description": "Ripple search UI and services for connecting to Tide search",
-  "version": "2.11.0",
+  "version": "2.14.0",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./nuxt.config.ts",
diff --git a/packages/ripple-tide-search/pages/search.vue b/packages/ripple-tide-search/pages/search.vue
index e3749fa4f3..896c15a959 100644
--- a/packages/ripple-tide-search/pages/search.vue
+++ b/packages/ripple-tide-search/pages/search.vue
@@ -1,9 +1,35 @@
 <script setup lang="ts">
 import { AppSearchFilterConfigItem, MappedSearchResult } from '../types'
-import { formatDate, useRuntimeConfig, useAppConfig } from '#imports'
+import {
+  formatDate,
+  useRuntimeConfig,
+  useAppConfig,
+  useTideSite
+} from '#imports'
 
 const appConfig = useAppConfig()
 const runtimeConfig = useRuntimeConfig()
+const site = await useTideSite()
+const featureFlags = useFeatureFlags(site?.featureFlags)
+
+const getContentTypes = () => {
+  let contentTypes = appConfig.ripple?.search?.contentTypes
+  const overrideTypes = featureFlags.value?.search?.contentTypes
+
+  if (!overrideTypes) {
+    return contentTypes
+  }
+
+  Object.keys(overrideTypes).forEach((type) => {
+    if (overrideTypes[type] && !contentTypes.includes(type)) {
+      contentTypes.push(type)
+    } else if (!overrideTypes[type] && contentTypes.includes(type)) {
+      contentTypes = contentTypes.filter((t: string) => t !== type)
+    }
+  })
+
+  return contentTypes
+}
 
 const filtersConfig: AppSearchFilterConfigItem[] = [
   {
@@ -25,7 +51,7 @@ const searchDriverOptions = {
       },
       {
         field: 'type',
-        values: appConfig.ripple?.search?.contentTypes
+        values: getContentTypes()
       }
     ],
     search_fields: {
@@ -101,6 +127,7 @@ const searchResultsMappingFn = (item): MappedSearchResult<any> => {
 <template>
   <TideSearchPage
     pageTitle="Search"
+    :site="site"
     :searchDriverOptions="searchDriverOptions"
     :filtersConfig="filtersConfig"
     :searchResultsMappingFn="searchResultsMappingFn"
diff --git a/packages/ripple-tide-search/types.ts b/packages/ripple-tide-search/types.ts
index 847623999f..18de0c966b 100644
--- a/packages/ripple-tide-search/types.ts
+++ b/packages/ripple-tide-search/types.ts
@@ -1,5 +1,14 @@
 import { FilterType } from '@elastic/search-ui'
 import type { TidePageBase, TideSiteData } from '@dpc-sdp/ripple-tide-api/types'
+
+export type addressResultType = {
+  id: string
+  name: string
+  postcode: string
+  bbox: string[]
+  type: 'postcode' | 'locality'
+}
+
 export interface MappedSearchResult<T> {
   id: string
   component: string
diff --git a/packages/ripple-tide-search/utils/getAddressFromArcGISMagicKey.ts b/packages/ripple-tide-search/utils/getAddressFromArcGISMagicKey.ts
new file mode 100644
index 0000000000..42191e888c
--- /dev/null
+++ b/packages/ripple-tide-search/utils/getAddressFromArcGISMagicKey.ts
@@ -0,0 +1,20 @@
+import { addressResultType } from '../types'
+import { capitalCase } from 'change-case'
+
+export default async (arcGISMagicKey: string): addressResultType => {
+  const geocodeServerUrl =
+    'https://corp-geo.mapshare.vic.gov.au/arcgis/rest/services/Geocoder/VMAddressEZIAdd/GeocodeServer'
+  const res = await $fetch(`${geocodeServerUrl}/findAddressCandidates`, {
+    params: {
+      magicKey: arcGISMagicKey,
+      f: 'json'
+    }
+  })
+  const arcGISCandidate = res.candidates[0]
+
+  return {
+    id: arcGISMagicKey.slice(-12),
+    name: capitalCase(arcGISCandidate.address),
+    center: [arcGISCandidate.location.x, arcGISCandidate.location.y]
+  }
+}
diff --git a/packages/ripple-tide-search/utils/rplAddressSuggestionsFn.ts b/packages/ripple-tide-search/utils/rplAddressSuggestionsFn.ts
new file mode 100644
index 0000000000..82e4676492
--- /dev/null
+++ b/packages/ripple-tide-search/utils/rplAddressSuggestionsFn.ts
@@ -0,0 +1,99 @@
+import { capitalCase } from 'change-case'
+
+const getSuburbSuggestions = async (query, args) => {
+  const suggestionsIndex = 'vicpol-postcode-localities'
+
+  const searchUrl = `/api/tide/app-search/${suggestionsIndex}/elasticsearch/_search`
+
+  const queryDSL = {
+    query: {
+      bool: {
+        should: [
+          {
+            match: {
+              name: {
+                query,
+                operator: 'and'
+              }
+            }
+          },
+          {
+            prefix: {
+              name: {
+                value: query,
+                case_insensitive: true
+              }
+            }
+          },
+          {
+            term: {
+              postcode: {
+                value: query
+              }
+            }
+          }
+        ]
+      }
+    }
+  }
+
+  const test = await $fetch(searchUrl, {
+    method: 'POST',
+    body: {
+      ...queryDSL,
+      size: args.maxSuburbSuggestions
+    }
+  })
+
+  return test.hits.hits.map((itm) => {
+    const center = getSingleResultValue(itm._source.center)?.split(',')
+
+    return {
+      id: itm._id,
+      name: getSingleResultValue(itm._source['name']),
+      postcode: getSingleResultValue(itm._source.postcode),
+      bbox: itm._source.bbox,
+      center: center?.length === 2 ? [center[1], center[0]] : undefined
+    }
+  })
+}
+
+const getAddressSuggestions = async (query, args) => {
+  const geocodeServerUrl =
+    'https://corp-geo.mapshare.vic.gov.au/arcgis/rest/services/Geocoder/VMAddressEZIAdd/GeocodeServer'
+
+  const suggestions = await $fetch(`${geocodeServerUrl}/suggest`, {
+    params: {
+      text: query,
+      maxSuggestions: args.maxAddressSuggestions,
+      f: 'json'
+    }
+  })
+
+  return suggestions.suggestions.map((item) => {
+    return {
+      id: item.magicKey,
+      name: capitalCase(item.text),
+      arcGISMagicKey: item.magicKey
+    }
+  })
+}
+
+export default async (query, args) => {
+  const defaultArgs = {
+    maxSuburbSuggestions: 0,
+    maxAddressSuggestions: 10
+  }
+
+  const argsWithDefaults = {
+    ...defaultArgs,
+    ...(args || {})
+  }
+
+  return [
+    ...(args.maxSuburbSuggestions > 0
+      ? await getSuburbSuggestions(query, argsWithDefaults)
+      : []),
+    ...(await getAddressSuggestions(query, argsWithDefaults))
+  ]
+}
diff --git a/packages/ripple-tide-topic/package.json b/packages/ripple-tide-topic/package.json
index b7a1c488c6..1002477949 100644
--- a/packages/ripple-tide-topic/package.json
+++ b/packages/ripple-tide-topic/package.json
@@ -9,7 +9,7 @@
     "./mapping": "./mapping/index.ts",
     "./types": "./types.ts"
   },
-  "version": "2.11.0",
+  "version": "2.14.0",
   "dependencies": {
     "@dpc-sdp/nuxt-ripple": "workspace:*",
     "@dpc-sdp/ripple-tide-api": "workspace:*",
diff --git a/packages/ripple-tide-webform/mapping/webform-conditional-logic.test.ts b/packages/ripple-tide-webform/mapping/webform-conditional-logic.test.ts
index 9aa181e1e3..54aa981d09 100644
--- a/packages/ripple-tide-webform/mapping/webform-conditional-logic.test.ts
+++ b/packages/ripple-tide-webform/mapping/webform-conditional-logic.test.ts
@@ -1,5 +1,11 @@
 import { expect, describe, it } from '@jest/globals'
-import { getConditionals } from './webform-conditional-logic.js'
+import { getConditionals } from './webform-conditional-logic'
+
+const logger = {
+  warn: (message: string, props: { label: string }) => {
+    console.warn(props.label, message)
+  }
+}
 
 describe('getConditionals', () => {
   describe('states', () => {
@@ -18,7 +24,7 @@ describe('getConditionals', () => {
         required: '$isChecked($get(input_a).value, "true")'
       }
 
-      expect(getConditionals(input)).toEqual(expected)
+      expect(getConditionals(input, logger)).toEqual(expected)
     })
 
     it('disabled', () => {
@@ -36,7 +42,7 @@ describe('getConditionals', () => {
         disabled: '$isChecked($get(input_a).value, "true")'
       }
 
-      expect(getConditionals(input)).toEqual(expected)
+      expect(getConditionals(input, logger)).toEqual(expected)
     })
 
     it('enabled', () => {
@@ -54,7 +60,7 @@ describe('getConditionals', () => {
         disabled: '$negate($isChecked($get(input_a).value, "true"))'
       }
 
-      expect(getConditionals(input)).toEqual(expected)
+      expect(getConditionals(input, logger)).toEqual(expected)
     })
 
     it('visible', () => {
@@ -72,7 +78,7 @@ describe('getConditionals', () => {
         if: '$isChecked($get(input_a).value, "true")'
       }
 
-      expect(getConditionals(input)).toEqual(expected)
+      expect(getConditionals(input, logger)).toEqual(expected)
     })
 
     it('invisible', () => {
@@ -90,7 +96,7 @@ describe('getConditionals', () => {
         if: '$negate($isChecked($get(input_a).value, "true"))'
       }
 
-      expect(getConditionals(input)).toEqual(expected)
+      expect(getConditionals(input, logger)).toEqual(expected)
     })
   })
 
@@ -110,7 +116,7 @@ describe('getConditionals', () => {
         required: '$negate($isFilled($get(input_a).value))'
       }
 
-      expect(getConditionals(input)).toEqual(expected)
+      expect(getConditionals(input, logger)).toEqual(expected)
     })
 
     it('filled', () => {
@@ -128,7 +134,7 @@ describe('getConditionals', () => {
         required: '$isFilled($get(input_a).value)'
       }
 
-      expect(getConditionals(input)).toEqual(expected)
+      expect(getConditionals(input, logger)).toEqual(expected)
     })
 
     it('checked', () => {
@@ -146,7 +152,7 @@ describe('getConditionals', () => {
         required: '$isChecked($get(input_a).value, "true")'
       }
 
-      expect(getConditionals(input)).toEqual(expected)
+      expect(getConditionals(input, logger)).toEqual(expected)
     })
 
     it('unchecked', () => {
@@ -164,7 +170,7 @@ describe('getConditionals', () => {
         required: '$negate($isChecked($get(input_a).value, "true"))'
       }
 
-      expect(getConditionals(input)).toEqual(expected)
+      expect(getConditionals(input, logger)).toEqual(expected)
     })
 
     it('value', () => {
@@ -182,7 +188,7 @@ describe('getConditionals', () => {
         required: '$isEqual($get(input_a).value, "abc")'
       }
 
-      expect(getConditionals(input)).toEqual(expected)
+      expect(getConditionals(input, logger)).toEqual(expected)
     })
 
     it('!value', () => {
@@ -200,7 +206,7 @@ describe('getConditionals', () => {
         required: '$negate($isEqual($get(input_a).value, abc))'
       }
 
-      expect(getConditionals(input)).toEqual(expected)
+      expect(getConditionals(input, logger)).toEqual(expected)
     })
 
     it('pattern', () => {
@@ -218,7 +224,7 @@ describe('getConditionals', () => {
         required: '$isPatternMatch($get(input_a).value, "abc")'
       }
 
-      expect(getConditionals(input)).toEqual(expected)
+      expect(getConditionals(input, logger)).toEqual(expected)
     })
 
     it('!pattern', () => {
@@ -236,7 +242,7 @@ describe('getConditionals', () => {
         required: '$negate($isPatternMatch($get(input_a).value, "abc"))'
       }
 
-      expect(getConditionals(input)).toEqual(expected)
+      expect(getConditionals(input, logger)).toEqual(expected)
     })
 
     it('less', () => {
@@ -254,7 +260,7 @@ describe('getConditionals', () => {
         required: '$difference($get(input_a).value, 10) < 0'
       }
 
-      expect(getConditionals(input)).toEqual(expected)
+      expect(getConditionals(input, logger)).toEqual(expected)
     })
 
     it('greater', () => {
@@ -272,7 +278,7 @@ describe('getConditionals', () => {
         required: '$difference($get(input_a).value, 10) > 0'
       }
 
-      expect(getConditionals(input)).toEqual(expected)
+      expect(getConditionals(input, logger)).toEqual(expected)
     })
   })
 
@@ -296,7 +302,7 @@ describe('getConditionals', () => {
           '$isChecked($get(input_a).value, "true") && $isEqual($get(input_b).value, "abc")'
       }
 
-      expect(getConditionals(input)).toEqual(expected)
+      expect(getConditionals(input, logger)).toEqual(expected)
     })
 
     it('OR', () => {
@@ -323,7 +329,7 @@ describe('getConditionals', () => {
           '$isChecked($get(input_a).value, "true") || $isEqual($get(input_b).value, "abc")'
       }
 
-      expect(getConditionals(input)).toEqual(expected)
+      expect(getConditionals(input, logger)).toEqual(expected)
     })
 
     it('XOR', () => {
@@ -350,7 +356,7 @@ describe('getConditionals', () => {
           '$xor($isChecked($get(input_a).value, "true"), $isEqual($get(input_b).value, "abc"))'
       }
 
-      expect(getConditionals(input)).toEqual(expected)
+      expect(getConditionals(input, logger)).toEqual(expected)
     })
   })
 
@@ -370,7 +376,7 @@ describe('getConditionals', () => {
         required: '$isChecked($get(input_a).value, "option_one")'
       }
 
-      expect(getConditionals(input)).toEqual(expected)
+      expect(getConditionals(input, logger)).toEqual(expected)
     })
 
     it('value', () => {
@@ -388,7 +394,7 @@ describe('getConditionals', () => {
         required: '$isEqual($get(input_a).value, "option_one")'
       }
 
-      expect(getConditionals(input)).toEqual(expected)
+      expect(getConditionals(input, logger)).toEqual(expected)
     })
   })
 
@@ -408,6 +414,6 @@ describe('getConditionals', () => {
       required: '$isChecked($get(test_id_input_a).value, "true")'
     }
 
-    expect(getConditionals(input)).toEqual(expected)
+    expect(getConditionals(input, logger)).toEqual(expected)
   })
 })
diff --git a/packages/ripple-tide-webform/mapping/webform-conditional-logic.ts b/packages/ripple-tide-webform/mapping/webform-conditional-logic.ts
index bcf979c0ab..027e5b7a42 100644
--- a/packages/ripple-tide-webform/mapping/webform-conditional-logic.ts
+++ b/packages/ripple-tide-webform/mapping/webform-conditional-logic.ts
@@ -1,5 +1,3 @@
-import { logger } from '@dpc-sdp/ripple-tide-api'
-
 type SupportedStates =
   | 'required'
   | 'disabled'
@@ -23,7 +21,7 @@ interface NormalisedRule {
  * @param {String} rule :input[name=\"check_a\"]
  * @param {String} prefix string to prepend to the name
  */
-const getNameFromSelector = (rule: string, prefix: string): string => {
+const getNameFromSelector = (rule: string, prefix: string | null): string => {
   const start = rule.indexOf('"') + 1
   const end = rule.indexOf('"', start + 1)
   const name = rule.substr(start, end - start)
@@ -35,7 +33,7 @@ const getNameFromSelector = (rule: string, prefix: string): string => {
  * Return the first key of an object
  * @param {Object} obj Object with keys
  */
-const getFirstObjectKey = (obj): string => {
+const getFirstObjectKey = (obj: {}): string => {
   if (!obj) {
     return ''
   }
@@ -50,10 +48,16 @@ const getFirstObjectKey = (obj): string => {
  * @param {String} selector a field selector e.g. ':input[name=\"check_a\"]' or ':input[name=\"check_a[option]\"]'
  * @param {String} prefix used to prepend the fieldName
  */
-function convertSelectorToOperand(ruleObject, selector, prefix): Operand {
+function convertSelectorToOperand(
+  ruleObject: [],
+  selector: any,
+  prefix: string | null
+): Operand {
   let fieldName = getNameFromSelector(selector, prefix)
   const triggerType = getFirstObjectKey(ruleObject[selector])
-  let triggerValue = triggerType ? ruleObject[selector][triggerType] : null
+  let triggerValue: string | null = triggerType
+    ? ruleObject[selector][triggerType]
+    : null
 
   // Check for nested selectors, i.e. checkbox lists and multi selects
   const arrayRegex = /\[(.*?)]/
@@ -73,7 +77,11 @@ function convertSelectorToOperand(ruleObject, selector, prefix): Operand {
  * @param {Object} rulesObject webform rules object
  * @param {String} prefix optional prefix to scope rules to a form
  */
-const normaliseRule = (rulesObject, prefix = null): NormalisedRule => {
+const normaliseRule = (
+  rulesObject: any,
+  prefix: string | null = null,
+  logger: { warn: Function }
+): NormalisedRule => {
   const rulesType = Array.isArray(rulesObject) ? 'array' : typeof rulesObject
   let operator: LogicOperator = 'and'
   const operands: Operand[] = []
@@ -81,7 +89,7 @@ const normaliseRule = (rulesObject, prefix = null): NormalisedRule => {
   switch (rulesType) {
     case 'array':
       // Used for 'or' / 'xor' operators.
-      rulesObject.forEach((item) => {
+      rulesObject.forEach((item: any) => {
         if (typeof item === 'object') {
           const selector = getFirstObjectKey(item)
           operands.push(convertSelectorToOperand(item, selector, prefix))
@@ -162,7 +170,10 @@ const toFormkitExpression = (rule: NormalisedRule): string => {
  * @param {Object} field
  */
 export const getConditionals = (
-  field
+  field: {
+    [key: string]: any
+  },
+  logger: { warn: Function }
 ): {
   [key: string]: string
 } => {
@@ -170,7 +181,7 @@ export const getConditionals = (
 
   return (Object.keys(states || {}) as SupportedStates[]).reduce(
     (result, state: SupportedStates) => {
-      const rule = normaliseRule(states[state], field?.formId)
+      const rule = normaliseRule(states[state], field?.formId, logger)
       const expression = toFormkitExpression(rule)
 
       switch (state) {
diff --git a/packages/ripple-tide-webform/mapping/webform-utils.ts b/packages/ripple-tide-webform/mapping/webform-utils.ts
index 9ed334dcfe..4647233cfe 100644
--- a/packages/ripple-tide-webform/mapping/webform-utils.ts
+++ b/packages/ripple-tide-webform/mapping/webform-utils.ts
@@ -1,8 +1,14 @@
-import { getConditionals } from './webform-conditional-logic.js'
-import { getValidation } from './webform-validation.js'
+import { getConditionals } from './webform-conditional-logic'
+import { getValidation } from './webform-validation'
 
-export const getValidationAndConditionals = (field) => {
-  const conditionals = getConditionals(field)
+const logger = {
+  warn: (message: string, props: { label: string }) => {
+    console.warn(props.label, message)
+  }
+}
+
+export const getValidationAndConditionals = (field: {}) => {
+  const conditionals = getConditionals(field, logger)
 
   const requiredCondition = conditionals.required
   const validation = getValidation(field, requiredCondition)
@@ -13,9 +19,9 @@ export const getValidationAndConditionals = (field) => {
   }
 }
 
-export const getInputIcons = (
-  field
-): { prefixIcon?: string; suffixIcon?: string } => {
+export const getInputIcons = (field: {
+  [key: string]: string | undefined
+}): { prefixIcon?: string; suffixIcon?: string } => {
   if (field['#field_prefix']) {
     return {
       prefixIcon: `icon-${field['#field_prefix']}`
@@ -24,9 +30,9 @@ export const getInputIcons = (
   return {}
 }
 
-export const getMinMaxFields = (
-  field
-): { minlength?: string; maxlength?: string } => {
+export const getMinMaxFields = (field: {
+  [key: string]: string | undefined
+}): { minlength?: string; maxlength?: string } => {
   let minlength = field['#minlength']
   let maxlength = field['#maxlength']
 
@@ -39,9 +45,9 @@ export const getMinMaxFields = (
   return { minlength, maxlength }
 }
 
-export const getCounterFields = (
-  field
-): { counter?: string; counterMin?: string; counterMax?: string } => {
+export const getCounterFields = (field: {
+  [key: string]: string | undefined
+}): { counter?: string; counterMin?: string; counterMax?: string } => {
   return {
     counter: field['#counter_type'],
     counterMin: field['#counter_minimum'],
diff --git a/packages/ripple-tide-webform/mapping/webforms-mapping.ts b/packages/ripple-tide-webform/mapping/webforms-mapping.ts
index 3a3740d6f1..3ffaec95eb 100644
--- a/packages/ripple-tide-webform/mapping/webforms-mapping.ts
+++ b/packages/ripple-tide-webform/mapping/webforms-mapping.ts
@@ -1,9 +1,22 @@
 import { getBody, TidePageApi } from '@dpc-sdp/ripple-tide-api'
 import { FormKitSchemaNode } from '@formkit/core'
-import { getInputIcons, getValidationAndConditionals } from './webform-utils'
+import {
+  getInputIcons,
+  getValidationAndConditionals
+} from './../server/webform-utils'
 import { getAdvancedAddressMapping } from './webforms-address'
 import type { TideWebformElement, ApiWebForm } from './../types'
 
+interface CustomInputsConfig {
+  [key: string]: {
+    [key: string]: any
+    mapping: Function
+  }
+}
+
+const appConfig = useAppConfig().ripple as CustomInputsConfig
+const customInputs: CustomInputsConfig = appConfig.customInputs || {}
+
 export const getFormSchemaFromMapping = async (
   webform: ApiWebForm,
   tidePageApi: TidePageApi
@@ -319,12 +332,20 @@ export const getFormSchemaFromMapping = async (
         }
         break
       default:
-        mappedField = {
-          $el: 'div',
-          attrs: {
-            class: 'rpl-form__outer rpl-form__input--unsupported'
-          },
-          children: [`"${field['#type']}" is not yet supported`]
+        if (Object.keys(customInputs).includes(field['#type'])) {
+          mappedField = customInputs[field['#type']].mapping(
+            fieldID,
+            field,
+            fieldKey
+          )
+        } else {
+          mappedField = {
+            $el: 'div',
+            attrs: {
+              class: 'rpl-form__outer rpl-form__input--unsupported'
+            },
+            children: [`"${field['#type']}" is not yet supported`]
+          }
         }
     }
 
diff --git a/packages/ripple-tide-webform/package.json b/packages/ripple-tide-webform/package.json
index 8bb8e87e81..ed8ffc581f 100644
--- a/packages/ripple-tide-webform/package.json
+++ b/packages/ripple-tide-webform/package.json
@@ -1,13 +1,15 @@
 {
   "name": "@dpc-sdp/ripple-tide-webform",
   "description": "Ripple mappings and components for Tide webforms",
-  "version": "2.11.0",
+  "version": "2.14.0",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./nuxt.config.ts",
   "exports": {
     ".": "./nuxt.config.ts",
     "./mapping": "./mapping/index.ts",
+    "./mapping/utils": "./mapping/webform-utils.ts",
+    "./server/utils": "./server/webform-utils.ts",
     "./types": "./types.ts"
   },
   "dependencies": {
diff --git a/packages/ripple-tide-webform/server/webform-utils.ts b/packages/ripple-tide-webform/server/webform-utils.ts
new file mode 100644
index 0000000000..f2d5ea3ff3
--- /dev/null
+++ b/packages/ripple-tide-webform/server/webform-utils.ts
@@ -0,0 +1,22 @@
+// @ts-expect-error ts7016 monorepo ref
+import { logger } from '@dpc-sdp/ripple-tide-api'
+import { getConditionals } from './../mapping/webform-conditional-logic'
+import { getValidation } from './../mapping/webform-validation'
+
+export const getValidationAndConditionals = (field: {}) => {
+  const conditionals = getConditionals(field, logger)
+
+  const requiredCondition = conditionals.required
+  const validation = getValidation(field, requiredCondition)
+
+  return {
+    ...conditionals,
+    ...validation
+  }
+}
+
+export {
+  getInputIcons,
+  getMinMaxFields,
+  getCounterFields
+} from './../mapping/webform-utils'
diff --git a/packages/ripple-ui-core/package.json b/packages/ripple-ui-core/package.json
index 736ff02e17..086857c7ea 100644
--- a/packages/ripple-ui-core/package.json
+++ b/packages/ripple-ui-core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/ripple-ui-core",
   "description": "Ripple UI Core component library",
-  "version": "2.11.0",
+  "version": "2.14.0",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "files": [
diff --git a/packages/ripple-ui-core/src/components/accordion/RplAccordion.cy.ts b/packages/ripple-ui-core/src/components/accordion/RplAccordion.cy.ts
index 20133b58ed..11b64969fb 100644
--- a/packages/ripple-ui-core/src/components/accordion/RplAccordion.cy.ts
+++ b/packages/ripple-ui-core/src/components/accordion/RplAccordion.cy.ts
@@ -9,34 +9,52 @@ const baseProps = {
 
 describe('RplAccordion', () => {
   it('mounts', () => {
-    cy.mount(RplAccordion, {
-      props: {
-        ...baseProps
-      }
-    })
+    cy.mount(RplAccordion, { props: { ...baseProps } })
+
     cy.get('.rpl-accordion__toggle-all').should('contains.text', 'Open all')
   })
 
-  it('opens all accordions when open all clicked', () => {
-    cy.mount(RplAccordion, {
-      props: {
-        ...baseProps
-      }
-    })
-    cy.get('.rpl-accordion__toggle-all').click()
-    cy.get('.rpl-accordion__toggle-all').should('contains.text', 'Close all')
+  it('allows individual accordion items to be toggled', () => {
+    cy.mount(RplAccordion, { props: { ...baseProps } })
+
+    cy.get('.rpl-accordion__item').first().as('item')
+
+    cy.get('@item').find('.rpl-accordion__item-toggle').click()
+    cy.get('@item')
+      .find('.rpl-accordion__item-toggle')
+      .should('have.attr', 'aria-expanded', 'true')
+
+    cy.get('@item')
+      .find('.rpl-accordion__item-content-inner')
+      .should('be.visible')
   })
-  it('shows open all when it has been closed again', () => {
-    cy.mount(RplAccordion, {
-      props: {
-        ...baseProps
-      }
-    })
-    cy.get('.rpl-accordion__toggle-all').click()
+
+  it('toggles all accordions when open/close all button is clicked', () => {
+    cy.mount(RplAccordion, { props: { ...baseProps } })
+
+    cy.get('.rpl-accordion__toggle-all').contains('Open all').click()
+    cy.get('.rpl-accordion__item-content-inner:visible').should(
+      'have.length',
+      3
+    )
+
+    cy.get('.rpl-accordion__toggle-all').contains('Close all').click()
+    cy.get('.rpl-accordion__item-content-inner:visible').should(
+      'have.length',
+      0
+    )
+  })
+
+  it('toggles the open/close all text when all items have been individually toggled', () => {
+    cy.mount(RplAccordion, { props: { ...baseProps } })
+
+    cy.get('.rpl-accordion__item-toggle').click({ multiple: true })
     cy.get('.rpl-accordion__toggle-all').should('contains.text', 'Close all')
-    cy.get('.rpl-accordion__toggle-all').click()
+
+    cy.get('.rpl-accordion__item-toggle').click({ multiple: true })
     cy.get('.rpl-accordion__toggle-all').should('contains.text', 'Open all')
   })
+
   it('shows numbered accordions', () => {
     cy.mount(RplAccordion, {
       props: {
diff --git a/packages/ripple-ui-core/src/components/card-carousel/RplCardCarousel.cy.ts b/packages/ripple-ui-core/src/components/card-carousel/RplCardCarousel.cy.ts
new file mode 100644
index 0000000000..c90ab46641
--- /dev/null
+++ b/packages/ripple-ui-core/src/components/card-carousel/RplCardCarousel.cy.ts
@@ -0,0 +1,32 @@
+import RplCardCarousel from './RplCardCarousel.vue'
+
+const items = [
+  {
+    type: 'promo',
+    title: 'First card',
+    url: '#'
+  },
+  {
+    type: 'promo',
+    title: 'Second card',
+    url: '#'
+  }
+]
+
+const props = { items }
+
+describe('RplMediaGallery', () => {
+  it('mounts', () => {
+    cy.mount(RplCardCarousel, { props })
+  })
+
+  it('navigates to through cards with pagination', () => {
+    cy.mount(RplCardCarousel, { props })
+
+    cy.get('[aria-label="Go to next item"]').click()
+    cy.contains('.swiper-slide-active', items[1].title)
+
+    cy.get('[aria-label="Go to previous item"]').click()
+    cy.contains('.swiper-slide-active', items[0].title)
+  })
+})
diff --git a/packages/ripple-ui-core/src/components/content/RplContent.stories.mdx b/packages/ripple-ui-core/src/components/content/RplContent.stories.mdx
index 35a83c1626..f76a160567 100644
--- a/packages/ripple-ui-core/src/components/content/RplContent.stories.mdx
+++ b/packages/ripple-ui-core/src/components/content/RplContent.stories.mdx
@@ -150,8 +150,7 @@ export const SingleTemplate = (args) => ({
       html: `
       <figure class="rpl-document">
         <a
-         tabindex="-1"
-         class="rpl-document__link"
+         class="rpl-document__link rpl-u-focusable-within"
          aria-label="Example file File type: PDF. Size: 1.5 mb."
          href="http://vic.gov.au/"
          target="_blank">
@@ -159,7 +158,7 @@ export const SingleTemplate = (args) => ({
             <svg role="presentation"><use xlink:href="#icon-document-lined"></use></svg>
           </span>
           <div class="rpl-document__content">
-            <span class="rpl-document__name rpl-type-p rpl-type-weight-bold rpl-u-focusable-inline" tabindex="0">This is an example of a document title</span>
+            <span class="rpl-document__name rpl-type-p rpl-type-weight-bold rpl-u-focusable-inline"">This is an example of a document title</span>
             <div class="rpl-document__info rpl-type-label-small">
               <span class="rpl-file__meta">PDF</span>
               <span class="rpl-file__meta">1.5 mb</span>
diff --git a/packages/ripple-ui-core/src/components/description-list/constants.ts b/packages/ripple-ui-core/src/components/description-list/constants.ts
index cbb8b3be60..fa4c9b6a47 100644
--- a/packages/ripple-ui-core/src/components/description-list/constants.ts
+++ b/packages/ripple-ui-core/src/components/description-list/constants.ts
@@ -9,4 +9,4 @@ export type IRplDescriptionListItem = {
   iconColour?: (typeof RplColorThemes)[number]
 }
 
-export type IRplDescriptionListVariant = 'default' | 'icon'
+export type IRplDescriptionListVariant = 'default' | 'icon' | 'compact'
diff --git a/packages/ripple-ui-core/src/components/document/RplDocument.vue b/packages/ripple-ui-core/src/components/document/RplDocument.vue
index 46713b104c..a1035cb097 100644
--- a/packages/ripple-ui-core/src/components/document/RplDocument.vue
+++ b/packages/ripple-ui-core/src/components/document/RplDocument.vue
@@ -6,13 +6,14 @@ import {
 import { useSlotContent } from '../../composables/useSlotContent'
 
 interface Props {
-  url: string
+  url?: string
   openInNewWindow?: boolean
   download?: boolean
   globalEvents?: boolean
 }
 
 const props = withDefaults(defineProps<Props>(), {
+  url: undefined,
   openInNewWindow: false,
   download: undefined,
   globalEvents: true
@@ -26,15 +27,17 @@ const slotContent = useSlotContent('name')
 const { emitRplEvent } = useRippleEvent('rpl-document', emit)
 
 const onClick = () => {
-  emitRplEvent(
-    'download',
-    {
-      action: 'download',
-      text: slotContent,
-      value: props.url
-    },
-    { global: props.globalEvents }
-  )
+  if (props.url) {
+    emitRplEvent(
+      'download',
+      {
+        action: 'download',
+        text: slotContent,
+        value: props.url
+      },
+      { global: props.globalEvents }
+    )
+  }
 }
 </script>
 
@@ -42,7 +45,8 @@ const onClick = () => {
   <figure
     :class="{ 'rpl-document': true, 'rpl-document--centered': !$slots.info }"
   >
-    <a
+    <component
+      :is="url ? 'a' : 'div'"
       class="rpl-document__link rpl-u-focusable-within"
       :href="url"
       :download="download"
@@ -66,7 +70,7 @@ const onClick = () => {
       <span v-if="openInNewWindow" class="rpl-u-visually-hidden">
         (opens in a new window)
       </span>
-    </a>
+    </component>
     <figcaption
       v-if="$slots.caption"
       class="rpl-document__caption rpl-type-p-small"
diff --git a/packages/ripple-ui-core/src/components/file/RplFile.vue b/packages/ripple-ui-core/src/components/file/RplFile.vue
index 3f99afadc3..1e7d8d106d 100644
--- a/packages/ripple-ui-core/src/components/file/RplFile.vue
+++ b/packages/ripple-ui-core/src/components/file/RplFile.vue
@@ -6,21 +6,26 @@ import {
   useRippleEvent,
   rplEventPayload
 } from '../../composables/useRippleEvent'
+import { RplIconSizes } from '../icon/constants'
 
 interface Props {
-  name: string
-  url: string
+  name?: string
+  url?: string
   extension?: string
   size?: string
   updated?: string
   caption?: string
+  iconSize?: (typeof RplIconSizes)[number]
 }
 
 const props = withDefaults(defineProps<Props>(), {
+  name: undefined,
+  url: undefined,
   extension: undefined,
   size: undefined,
   updated: undefined,
-  caption: undefined
+  caption: undefined,
+  iconSize: 'l'
 })
 
 const emit = defineEmits<{
@@ -47,11 +52,16 @@ const hasInfo = computed(() => props.extension || props.size || props.updated)
 </script>
 
 <template>
-  <RplDocument :url="url" :global-events="false" @download="onDownload">
+  <RplDocument
+    :url="url"
+    :global-events="false"
+    :class="`rpl-file--icon-${iconSize}`"
+    @download="onDownload"
+  >
     <template #icon>
-      <RplIcon name="icon-document-lined" size="l" colour="default" />
+      <RplIcon name="icon-document-lined" :size="iconSize" colour="default" />
     </template>
-    <template #name>
+    <template v-if="name" #name>
       {{ name }}
     </template>
     <template v-if="hasInfo" #info>
diff --git a/packages/ripple-ui-core/src/components/footer/RplFooter.cy.ts b/packages/ripple-ui-core/src/components/footer/RplFooter.cy.ts
index 7b3da17f41..06d0eabc2d 100644
--- a/packages/ripple-ui-core/src/components/footer/RplFooter.cy.ts
+++ b/packages/ripple-ui-core/src/components/footer/RplFooter.cy.ts
@@ -11,17 +11,22 @@ describe('RplFooter', () => {
     cy.mount(RplFooter, { props })
   })
 
-  it('allows menus to be opened on small screens', () => {
-    cy.viewport(bpMin.s, 1000).mount(RplFooter, { props })
+  it('allows menus to be toggled on small screens', () => {
+    cy.viewport(bpMin.s, 1000)
+    cy.mount(RplFooter, { props })
 
     cy.get('.rpl-footer-nav-section__header-inner-button').first().as('button')
 
-    cy.get('@button').click()
-
     cy.get('@button')
       .invoke('attr', 'aria-controls')
       .then((id) => {
-        cy.get(`#${id}`).should('be.visible')
+        cy.get(`#${id}`).as('menu')
       })
+
+    cy.get('@button').click()
+    cy.get('@menu').should('be.visible')
+
+    cy.get('@button').click()
+    cy.get('@menu').should('be.hidden')
   })
 })
diff --git a/packages/ripple-ui-core/src/components/media-embed/RplMediaEmbed.cy.ts b/packages/ripple-ui-core/src/components/media-embed/RplMediaEmbed.cy.ts
index 4a813555a4..1ff20e78b5 100644
--- a/packages/ripple-ui-core/src/components/media-embed/RplMediaEmbed.cy.ts
+++ b/packages/ripple-ui-core/src/components/media-embed/RplMediaEmbed.cy.ts
@@ -33,6 +33,9 @@ describe('RplMediaEmbed', () => {
     cy.mount(RplMediaEmbed, { props })
 
     cy.get('.rpl-media-embed__fullscreen-button').click()
-    cy.document().get('.rpl-media-embed__modal').should('be.visible')
+    cy.get('.rpl-media-embed__modal').should('be.visible')
+
+    cy.get('.rpl-media-embed__modal button').click()
+    cy.get('.rpl-media-embed__modal').should('not.exist')
   })
 })
diff --git a/packages/ripple-ui-core/src/components/media-embed/RplMediaEmbed.stories.mdx b/packages/ripple-ui-core/src/components/media-embed/RplMediaEmbed.stories.mdx
index ad20d469dd..bed4f81bf7 100644
--- a/packages/ripple-ui-core/src/components/media-embed/RplMediaEmbed.stories.mdx
+++ b/packages/ripple-ui-core/src/components/media-embed/RplMediaEmbed.stories.mdx
@@ -121,7 +121,7 @@ export const dataContent = `
       caption: 'Optional media caption content section',
       sourceCaption: 'Optional media source information content section',
       dataContent: dataContent,
-      downloadUrl: '/img/image-landscape-l.jpg'
+      downloadUrl: 'img/image-landscape-l.jpg'
     }}
   >
     {SingleTemplate.bind()}
diff --git a/packages/ripple-ui-core/src/components/media-embed/RplMediaEmbed.vue b/packages/ripple-ui-core/src/components/media-embed/RplMediaEmbed.vue
index ce5d46da21..fb7df56982 100644
--- a/packages/ripple-ui-core/src/components/media-embed/RplMediaEmbed.vue
+++ b/packages/ripple-ui-core/src/components/media-embed/RplMediaEmbed.vue
@@ -128,7 +128,7 @@ const fullscreenContentLabel = computed(() => {
   return props.fullscreenLabel || `View '${props.title}' fullscreen`
 })
 const downloadContentLabel = computed(() => {
-  return props.downloadLabel || `Download' ${props.title}'`
+  return props.downloadLabel || `Download '${props.title}'`
 })
 
 const toggleFullscreen = (event) => {
@@ -138,7 +138,7 @@ const toggleFullscreen = (event) => {
     'viewFullscreen',
     {
       action: isFullScreenOpen.value ? 'enter' : 'exit',
-      text: event?.label || fullscreenContentLabel.value,
+      text: event?.text || fullscreenContentLabel.value,
       label: props.title,
       type: props.type
     },
@@ -292,16 +292,16 @@ const handleDownload = () => {
 
       <!-- Download link -->
       <li v-if="downloadUrl">
-        <RplTextLink
+        <a
           class="rpl-media-embed__download-link rpl-media-embed__action rpl-u-focusable-inline rpl-type-p"
-          :url="downloadUrl"
+          :href="downloadUrl"
           download
           @click="handleDownload"
         >
           <RplIcon name="icon-download" class="rpl-u-screen-only" />{{
             downloadContentLabel
           }}
-        </RplTextLink>
+        </a>
       </li>
     </ul>
 
diff --git a/packages/ripple-ui-core/src/components/media-gallery/RplMediaGallery.cy.ts b/packages/ripple-ui-core/src/components/media-gallery/RplMediaGallery.cy.ts
index ed827d83f6..aa6ed62227 100644
--- a/packages/ripple-ui-core/src/components/media-gallery/RplMediaGallery.cy.ts
+++ b/packages/ripple-ui-core/src/components/media-gallery/RplMediaGallery.cy.ts
@@ -36,7 +36,7 @@ describe('RplMediaGallery', () => {
     cy.document().get('.rpl-media-gallery__modal').should('be.visible')
   })
 
-  it('navigates to next item via pagination', () => {
+  it('navigates to through items with pagination', () => {
     cy.mount(RplMediaGallery, { props })
 
     cy.get('[aria-label="Go to next item"]').click()
@@ -47,6 +47,15 @@ describe('RplMediaGallery', () => {
     cy.get('.rpl-media-gallery__primary-images .swiper-slide-active .rpl-image')
       .should('have.attr', 'src')
       .and('equal', items[1].thumbnail)
+
+    cy.get('[aria-label="Go to previous item"]').click()
+    cy.get('.rpl-media-gallery__primary-content .swiper-slide-active').should(
+      'contain',
+      items[0].title
+    )
+    cy.get('.rpl-media-gallery__primary-images .swiper-slide-active .rpl-image')
+      .should('have.attr', 'src')
+      .and('equal', items[0].thumbnail)
   })
 
   it('displays the item navigated too fullscreen', () => {
@@ -58,11 +67,46 @@ describe('RplMediaGallery', () => {
       .find(' .rpl-media-gallery__button')
       .click()
 
-    cy.document()
-      .get('.rpl-media-gallery__modal-content .swiper-slide-active')
-      .should('contain', items[1].title)
+    cy.get('.rpl-media-gallery__modal').should('be.visible')
+
+    cy.get('.rpl-media-gallery__modal-content .swiper-slide-active').should(
+      'contain',
+      items[1].title
+    )
     cy.get('.rpl-media-gallery__modal-images .swiper-slide-active .rpl-image')
       .should('have.attr', 'src')
       .and('equal', items[1].thumbnail)
   })
+
+  it('allows navigating through items in fullscreen gallery', () => {
+    cy.mount(RplMediaGallery, { props })
+
+    cy.get('.rpl-media-gallery__primary-content .rpl-media-gallery__button')
+      .first()
+      .click()
+
+    cy.get('.rpl-media-gallery__modal').as('modal')
+
+    cy.get('@modal').find('[aria-label="Go to next item"]').click()
+
+    cy.get('@modal').contains(
+      '.rpl-media-gallery__modal-content .swiper-slide-active',
+      items[1].title
+    )
+    cy.get('@modal')
+      .find('.swiper-slide-active .rpl-image')
+      .should('have.attr', 'src')
+      .and('equal', items[1].image)
+
+    cy.get('@modal').find('[aria-label="Go to previous item"]').click()
+
+    cy.get('@modal').contains(
+      '.rpl-media-gallery__modal-content .swiper-slide-active',
+      items[0].title
+    )
+    cy.get('@modal')
+      .find('.swiper-slide-active .rpl-image')
+      .should('have.attr', 'src')
+      .and('equal', items[0].image)
+  })
 })
diff --git a/packages/ripple-ui-core/src/components/primary-nav/RplPrimaryNav.cy.ts b/packages/ripple-ui-core/src/components/primary-nav/RplPrimaryNav.cy.ts
index 0744cadc67..c9966c78d8 100644
--- a/packages/ripple-ui-core/src/components/primary-nav/RplPrimaryNav.cy.ts
+++ b/packages/ripple-ui-core/src/components/primary-nav/RplPrimaryNav.cy.ts
@@ -76,5 +76,18 @@ describe('RplPrimaryNav', () => {
       cy.get(levelToggle(2)).first().click()
       cy.get(level(3)).should('not.exist')
     })
+
+    it('toggles the display of the search form', () => {
+      cy.contains('.rpl-primary-nav__nav-bar-action--toggle', 'Search').click()
+
+      cy.get('.rpl-primary-nav__search-form').as('form')
+
+      cy.get('form').should('be.visible')
+      cy.get('form').find('.rpl-search-bar__input').should('have.focus')
+
+      cy.contains('.rpl-primary-nav__nav-bar-action--toggle', 'Close').click()
+
+      cy.get('.rpl-primary-nav__search-form').should('not.exist')
+    })
   })
 })
diff --git a/packages/ripple-ui-core/src/components/primary-nav/components/nav-bar/RplPrimaryNavBar.css b/packages/ripple-ui-core/src/components/primary-nav/components/nav-bar/RplPrimaryNavBar.css
index 102c5d15e5..d340789899 100644
--- a/packages/ripple-ui-core/src/components/primary-nav/components/nav-bar/RplPrimaryNavBar.css
+++ b/packages/ripple-ui-core/src/components/primary-nav/components/nav-bar/RplPrimaryNavBar.css
@@ -125,6 +125,13 @@
       text-decoration-thickness: 2px;
     }
   }
+
+  &.rpl-primary-nav__nav-bar-actions-list--nowrap {
+    a,
+    button {
+      max-width: none;
+    }
+  }
 }
 
 .rpl-primary-nav__nav-bar-mobile-menu-toggle-container {
diff --git a/packages/ripple-ui-core/src/components/primary-nav/components/nav-bar/RplPrimaryNavBar.vue b/packages/ripple-ui-core/src/components/primary-nav/components/nav-bar/RplPrimaryNavBar.vue
index 16f239358e..ed6241d140 100644
--- a/packages/ripple-ui-core/src/components/primary-nav/components/nav-bar/RplPrimaryNavBar.vue
+++ b/packages/ripple-ui-core/src/components/primary-nav/components/nav-bar/RplPrimaryNavBar.vue
@@ -15,9 +15,13 @@ import {
 import VicGovLogo from './../../../../assets/logos/logo-vic-gov.svg?component'
 import type { IRplFeatureFlags } from '@dpc-sdp/ripple-tide-api/types'
 
-const { disablePrimaryLogo }: IRplFeatureFlags = inject('featureFlags', {
-  disablePrimaryLogo: false
-})
+const { disablePrimaryLogo, primaryNavNowrap }: IRplFeatureFlags = inject(
+  'featureFlags',
+  {
+    disablePrimaryLogo: false,
+    primaryNavNowrap: false
+  }
+)
 
 interface Props {
   primaryLogo: IRplPrimaryNavLogo
@@ -130,7 +134,12 @@ const handleToggleItem = (level: number, item: IRplPrimaryNavItem) => {
       </RplLink>
     </div>
 
-    <ul class="rpl-primary-nav__nav-bar-actions-list">
+    <ul
+      :class="[
+        'rpl-primary-nav__nav-bar-actions-list',
+        { 'rpl-primary-nav__nav-bar-actions-list--nowrap': primaryNavNowrap }
+      ]"
+    >
       <!-- Mobile menu toggle -->
       <li class="rpl-primary-nav__nav-bar-mobile-menu-toggle-container">
         <RplPrimaryNavBarAction
diff --git a/packages/ripple-ui-core/src/components/result-listing/RplResultListing.stories.mdx b/packages/ripple-ui-core/src/components/result-listing/RplResultListing.stories.mdx
index fb95469823..b95d71f21a 100644
--- a/packages/ripple-ui-core/src/components/result-listing/RplResultListing.stories.mdx
+++ b/packages/ripple-ui-core/src/components/result-listing/RplResultListing.stories.mdx
@@ -10,9 +10,10 @@ import RplSearchResult from './RplSearchResult.vue'
 import { a11yStoryCheck } from './../../../stories/interactions.js'
 import RplList from '../list/RplList.vue'
 import RplIcon from '../icon/RplIcon.vue'
+import RplFile from '../file/RplFile.vue'
 
 export const SingleTemplate = (args) => ({
-  components: { RplResultListing, RplResultListingItem, RplSearchResult, RplList, RplIcon },
+  components: { RplResultListing, RplResultListingItem, RplSearchResult, RplList, RplIcon, RplFile },
   setup() {
     return { args }
   },
@@ -129,6 +130,29 @@ This is an example showing the result listing with extra details
   </Story>
 </Canvas>
 
+## With details (file)
+
+This is an example showing results with custom details
+
+<Canvas>
+  <Story
+    name='With details (file)'
+    play={a11yStoryCheck}
+    args={{
+      updated: null,
+      showUrl: false,
+      details: `<RplFile
+        size="1.5mb"
+        extension="pdf"
+        updated="July 17, 2022"
+        icon-size="s"
+      />`
+    }}
+  >
+    {SingleTemplate.bind()}
+  </Story>
+</Canvas>
+
 ## With custom date label
 
 This is an example showing that the date label can be customised
diff --git a/packages/ripple-ui-core/src/components/result-listing/RplSearchResult.css b/packages/ripple-ui-core/src/components/result-listing/RplSearchResult.css
index 64a4b876c3..e2666277ba 100644
--- a/packages/ripple-ui-core/src/components/result-listing/RplSearchResult.css
+++ b/packages/ripple-ui-core/src/components/result-listing/RplSearchResult.css
@@ -70,6 +70,10 @@
     gap: var(--rpl-sp-2);
     align-items: center;
   }
+
+  .rpl-document {
+    padding-bottom: var(--rpl-sp-1);
+  }
 }
 
 .rpl-search-result__body {
diff --git a/packages/ripple-ui-core/src/components/result-listing/RplSearchResult.vue b/packages/ripple-ui-core/src/components/result-listing/RplSearchResult.vue
index 40f142a280..8f80f69fbe 100644
--- a/packages/ripple-ui-core/src/components/result-listing/RplSearchResult.vue
+++ b/packages/ripple-ui-core/src/components/result-listing/RplSearchResult.vue
@@ -13,12 +13,14 @@ interface Props {
   content?: string
   updated?: string
   dateLabel?: string
+  showUrl?: boolean
 }
 
 const props = withDefaults(defineProps<Props>(), {
   content: undefined,
   updated: undefined,
-  dateLabel: 'Updated'
+  dateLabel: 'Updated',
+  showUrl: true
 })
 
 const emit = defineEmits<{
@@ -51,12 +53,17 @@ const handleClick = () => {
     </div>
     <div ref="container" class="rpl-search-result__heading">
       <h2 class="rpl-search-result__title rpl-type-h3">
-        <RplTextLink ref="trigger" :url="url" class="rpl-u-link-visited" @click="handleClick">
+        <RplTextLink
+          ref="trigger"
+          :url="url"
+          class="rpl-u-link-visited"
+          @click="handleClick"
+        >
           {{ title }}
         </RplTextLink>
       </h2>
       <div
-        v-if="url"
+        v-if="url && showUrl"
         aria-hidden="true"
         class="rpl-search-result__url rpl-type-p-small rpl-u-screen-only"
       >
diff --git a/packages/ripple-ui-core/src/components/search-bar/RplSearchBar.cy.ts b/packages/ripple-ui-core/src/components/search-bar/RplSearchBar.cy.ts
index 69c18937c6..06e00278ad 100644
--- a/packages/ripple-ui-core/src/components/search-bar/RplSearchBar.cy.ts
+++ b/packages/ripple-ui-core/src/components/search-bar/RplSearchBar.cy.ts
@@ -30,6 +30,7 @@ describe('RplSearchBar', () => {
     cy.get('input#1234').click()
     cy.get('[data-option-id="rip"]').should('contain.text', `test - rip`)
   })
+
   it('updates', () => {
     const onChangeSpy = cy.spy().as('onChangeSpy')
     cy.mount(RplSearchBar, {
diff --git a/packages/ripple-ui-core/src/components/slider/RplSlider.vue b/packages/ripple-ui-core/src/components/slider/RplSlider.vue
index 623ecc5280..6ff3ec65ea 100644
--- a/packages/ripple-ui-core/src/components/slider/RplSlider.vue
+++ b/packages/ripple-ui-core/src/components/slider/RplSlider.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed, ref, useSlots, watch } from 'vue'
+import { computed, ref, useSlots, watch, onMounted } from 'vue'
 import RplPagination from '../pagination/RplPagination.vue'
 import { bpMin } from '../../lib/breakpoints'
 import { RplSlidesPerView } from './constants'
@@ -44,6 +44,7 @@ const emit = defineEmits<{
   (e: 'change', payload: rplEventPayload & { action: 'prev' | 'next' }): void
 }>()
 
+const mounted = ref(false)
 const container = ref()
 const swiper = ref()
 const activePage = ref(1)
@@ -118,6 +119,8 @@ watch(
   (slide) => swiper.value.$el.swiper.slideTo(slide)
 )
 
+onMounted(() => (mounted.value = true))
+
 const paginationClick = ({ action, text, value }) => {
   paginate.value = true
   swiper.value.$el.swiper.slideTo(value - 1)
@@ -206,7 +209,7 @@ const slideChangeNotice = computed(() => {
       </SwiperSlide>
     </Swiper>
     <div
-      v-if="changeNotice"
+      v-if="mounted && changeNotice"
       aria-live="polite"
       aria-atomic="true"
       class="rpl-u-visually-hidden"
diff --git a/packages/ripple-ui-core/src/components/tabs/RplTabs.cy.ts b/packages/ripple-ui-core/src/components/tabs/RplTabs.cy.ts
index 0cec05e3ff..d692f176de 100644
--- a/packages/ripple-ui-core/src/components/tabs/RplTabs.cy.ts
+++ b/packages/ripple-ui-core/src/components/tabs/RplTabs.cy.ts
@@ -21,10 +21,13 @@ describe('RplTabs', () => {
 
   it.only('switches tabs when clicked', () => {
     const onChangeSpy = cy.spy().as('onChangeSpy')
+
     cy.mount(RplTabs, {
       props: { ...baseProps, activeTab: 'one', [`onToggleTab`]: onChangeSpy }
     })
+
     cy.get('.rpl-tab').contains('Two').click()
+
     cy.get('@onChangeSpy').should('have.been.calledWith', {
       action: 'select',
       id: 'two',
diff --git a/packages/ripple-ui-core/src/styles/components/_document.css b/packages/ripple-ui-core/src/styles/components/_document.css
index 54573b770c..f4a782cea6 100644
--- a/packages/ripple-ui-core/src/styles/components/_document.css
+++ b/packages/ripple-ui-core/src/styles/components/_document.css
@@ -20,6 +20,12 @@
   }
 }
 
+.rpl-document__content {
+  display: flex;
+  flex-direction: column;
+  gap: var(--rpl-sp-2);
+}
+
 .rpl-document__name {
   display: inline;
   text-decoration: underline;
@@ -27,7 +33,6 @@
 
 .rpl-document__info {
   color: var(--rpl-clr-neutral-600);
-  margin-top: var(--rpl-sp-2);
   line-height: var(--rpl-type-lh-1);
 }
 
diff --git a/packages/ripple-ui-core/src/styles/components/_file.css b/packages/ripple-ui-core/src/styles/components/_file.css
index 63d6fe170b..7522fb2ee0 100644
--- a/packages/ripple-ui-core/src/styles/components/_file.css
+++ b/packages/ripple-ui-core/src/styles/components/_file.css
@@ -9,3 +9,13 @@
 .rpl-file__updated {
   margin-top: var(--rpl-sp-1);
 }
+
+.rpl-file--icon-s {
+  .rpl-document__icon {
+    margin-right: var(--rpl-sp-2);
+  }
+
+  .rpl-icon {
+    vertical-align: top;
+  }
+}
diff --git a/packages/ripple-ui-core/src/styles/components/_table.css b/packages/ripple-ui-core/src/styles/components/_table.css
index 41c40526e7..88f6fe541e 100644
--- a/packages/ripple-ui-core/src/styles/components/_table.css
+++ b/packages/ripple-ui-core/src/styles/components/_table.css
@@ -57,6 +57,10 @@
   th,
   td {
     vertical-align: top;
+
+    > *:first-child {
+      margin-top: 0;
+    }
   }
 
   caption {
@@ -76,7 +80,6 @@
   caption,
   th,
   td {
-    text-align: left;
     padding: var(--rpl-sp-4) var(--rpl-sp-3);
 
     &:first-child {
@@ -88,6 +91,11 @@
     }
   }
 
+  caption:not([align]),
+  th:not([align]) {
+    text-align: left;
+  }
+
   tbody {
     tr:nth-child(odd) {
       background-color: var(--local-table-row-background);
@@ -140,3 +148,10 @@
     }
   }
 }
+
+[dir='rtl'] .rpl-table {
+  caption:not([align]),
+  th:not([align]) {
+    text-align: right;
+  }
+}
diff --git a/packages/ripple-ui-core/src/styles/utilities/_lists.css b/packages/ripple-ui-core/src/styles/utilities/_lists.css
index e9d27c8f74..989acb2256 100644
--- a/packages/ripple-ui-core/src/styles/utilities/_lists.css
+++ b/packages/ripple-ui-core/src/styles/utilities/_lists.css
@@ -12,25 +12,29 @@
   line-height: var(--rpl-type-lh-4);
   letter-spacing: var(--rpl-type-ls-1);
   margin-left: var(--rpl-sp-4);
-  padding-left: var(--rpl-sp-4);
+  padding-left: var(--rpl-sp-5);
 
   @media (--rpl-bp-l) {
     margin-left: var(--rpl-sp-5);
   }
 
-  &[type='i'] {
+  &.rpl-type-list-ol--decimal {
+    list-style-type: decimal;
+  }
+
+  &.rpl-type-list-ol--lower-roman {
     list-style-type: lower-roman;
   }
 
-  &[type='I'] {
+  &.rpl-type-list-ol--upper-roman {
     list-style-type: upper-roman;
   }
 
-  &[type='a'] {
+  &.rpl-type-list-ol--lower-latin {
     list-style-type: lower-latin;
   }
 
-  &[type='A'] {
+  &.rpl-type-list-ol--upper-latin {
     list-style-type: upper-latin;
   }
 
@@ -80,18 +84,22 @@
   line-height: var(--rpl-type-lh-4);
   letter-spacing: var(--rpl-type-ls-1);
   margin-left: var(--rpl-sp-4);
-  padding-left: var(--rpl-sp-4);
+  padding-left: var(--rpl-sp-5);
   list-style-type: disc;
 
   @media (--rpl-bp-l) {
     margin-left: var(--rpl-sp-5);
   }
 
-  &[type='circle'] {
+  &.rpl-type-list-ul--disc {
+    list-style-type: disc;
+  }
+
+  &.rpl-type-list-ul--circle {
     list-style-type: circle;
   }
 
-  &[type='square'] {
+  &.rpl-type-list-ul--square {
     list-style-type: square;
   }
 
diff --git a/packages/ripple-ui-core/src/styles/utilities/_typography.css b/packages/ripple-ui-core/src/styles/utilities/_typography.css
index dc4d5e1d65..c308e1623c 100644
--- a/packages/ripple-ui-core/src/styles/utilities/_typography.css
+++ b/packages/ripple-ui-core/src/styles/utilities/_typography.css
@@ -305,3 +305,15 @@ html {
 .rpl-u-hyphenate {
   hyphens: auto;
 }
+
+.rpl-u-text-left {
+  text-align: left;
+}
+
+.rpl-u-text-center {
+  text-align: center;
+}
+
+.rpl-u-text-right {
+  text-align: right;
+}
diff --git a/packages/ripple-ui-forms/package.json b/packages/ripple-ui-forms/package.json
index fec4f0e813..1423f093d3 100644
--- a/packages/ripple-ui-forms/package.json
+++ b/packages/ripple-ui-forms/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/ripple-ui-forms",
   "description": "A form component library built with Formkit",
-  "version": "2.11.0",
+  "version": "2.14.0",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "./dist/rpl-forms.umd.js",
diff --git a/packages/ripple-ui-forms/src/components/RplForm/RplForm.vue b/packages/ripple-ui-forms/src/components/RplForm/RplForm.vue
index 9f60da7603..0f6e993b36 100644
--- a/packages/ripple-ui-forms/src/components/RplForm/RplForm.vue
+++ b/packages/ripple-ui-forms/src/components/RplForm/RplForm.vue
@@ -5,7 +5,8 @@ import {
   FormKitSchemaCondition,
   FormKitSchemaNode,
   FormKitConfig,
-  FormKitNode
+  FormKitNode,
+  FormKitPlugin
 } from '@formkit/core'
 import { getValidationMessages } from '@formkit/validation'
 import rplFormInputs from '../../plugin'
@@ -26,6 +27,7 @@ interface Props {
     title: string
     message: string
   }
+  customInputs?: FormKitPlugin
 }
 
 interface CachedError {
@@ -53,7 +55,8 @@ const props = withDefaults(defineProps<Props>(), {
     status: 'idle',
     title: '',
     message: ''
-  })
+  }),
+  customInputs: () => {}
 })
 
 const emit = defineEmits<{
@@ -230,14 +233,22 @@ const data = reactive({
     return matches && matches.length > 0
   }
 })
+
+const plugins = computed(
+  () =>
+    [rplFormInputs, props.customInputs ? props.customInputs : false].filter(
+      Boolean
+    ) as FormKitPlugin[]
+)
 </script>
 
 <template>
   <FormKit
     :id="id"
     v-slot="{ value }"
+    :name="id"
     type="form"
-    :plugins="[rplFormInputs]"
+    :plugins="plugins"
     form-class="rpl-form"
     :config="rplFormConfig"
     :actions="false"
diff --git a/packages/ripple-ui-forms/src/index.ts b/packages/ripple-ui-forms/src/index.ts
index 5cea67eb66..aca39f7c56 100644
--- a/packages/ripple-ui-forms/src/index.ts
+++ b/packages/ripple-ui-forms/src/index.ts
@@ -1,8 +1,13 @@
-// @ts-expect-error vue SFC
 export { default as RplForm } from './components/RplForm/RplForm.vue'
-// @ts-expect-error vue SFC
 export { default as RplFormElement } from './components/RplFormElement/RplFormElement.vue'
-// @ts-expect-error vue SFC
 export { default as RplFormAlert } from './components/RplFormAlert/RplFormAlert.vue'
-
 export { default as registerRplFormPlugin } from './register.js'
+
+export { default as useFormkitFriendlyEventEmitter } from './composables/useFormkitFriendlyEventEmitter'
+export { sanitisePIIField, sanitisePIIFields } from './lib/sanitisePII'
+export {
+  createRplFormInput,
+  defaultRplFormInputProps,
+  inputLibrary,
+  rplFeatures
+} from './inputs/input-utils'
diff --git a/packages/ripple-ui-maps/package.json b/packages/ripple-ui-maps/package.json
index 9e0f35101d..6cfdd9adcd 100644
--- a/packages/ripple-ui-maps/package.json
+++ b/packages/ripple-ui-maps/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/ripple-ui-maps",
   "description": "Ripple UI Core component library",
-  "version": "2.11.0",
+  "version": "2.14.0",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "files": [
diff --git a/packages/ripple-ui-maps/src/components/geolocation/RplMapGeolocateButton.vue b/packages/ripple-ui-maps/src/components/geolocation/RplMapGeolocateButton.vue
index d98e52107d..61f51ce14e 100644
--- a/packages/ripple-ui-maps/src/components/geolocation/RplMapGeolocateButton.vue
+++ b/packages/ripple-ui-maps/src/components/geolocation/RplMapGeolocateButton.vue
@@ -21,7 +21,6 @@
   </div>
 </template>
 <script setup lang="ts">
-import { defineEmits } from 'vue'
 import { RplIcon } from '@dpc-sdp/ripple-ui-core/vue'
 
 interface Props {
diff --git a/packages/ripple-ui-maps/src/components/map/RplMap.stories.mdx b/packages/ripple-ui-maps/src/components/map/RplMap.stories.mdx
index 18ea14bed2..2f56e3be05 100644
--- a/packages/ripple-ui-maps/src/components/map/RplMap.stories.mdx
+++ b/packages/ripple-ui-maps/src/components/map/RplMap.stories.mdx
@@ -139,4 +139,26 @@ export const Template = (args) => ({
   >
     {Template.bind()}
   </Story>
+  <Story
+    name='Clustering Nearer'
+    args={{
+      id: '123',
+      features:featureData,
+      provider: 'mapbox',
+      clusteringDistance: 25
+    }}
+  >
+    {Template.bind()}
+  </Story>
+  <Story
+    name='Clustering Disabled'
+    args={{
+      id: '123',
+      features:featureData,
+      provider: 'mapbox',
+      clusteringDistance: 0
+    }}
+  >
+    {Template.bind()}
+  </Story>
 </Canvas>
diff --git a/packages/ripple-ui-maps/src/components/map/RplMap.vue b/packages/ripple-ui-maps/src/components/map/RplMap.vue
index 6416f4cdff..f6e21d8f90 100644
--- a/packages/ripple-ui-maps/src/components/map/RplMap.vue
+++ b/packages/ripple-ui-maps/src/components/map/RplMap.vue
@@ -1,3 +1,9 @@
+<script lang="ts">
+const primaryColor = getComputedStyle(
+  document.documentElement
+).getPropertyValue('--rpl-clr-primary')
+</script>
+
 <script setup lang="ts">
 import { RplIcon } from '@dpc-sdp/ripple-ui-core/vue'
 import type { IRplMapFeature } from './../../types'
@@ -44,6 +50,7 @@ interface Props {
   hasSidePanel?: boolean
   noresults?: boolean
   getFeatureTitle?: (feature: any) => string
+  clusteringDistance?: number
 }
 
 const props = withDefaults(defineProps<Props>(), {
@@ -57,7 +64,7 @@ const props = withDefaults(defineProps<Props>(), {
   initialCenter: () => [144.9631, -36.8136], // melbourne CBD
   homeViewExtent: () => [144.9631, -36.8136], // melbourne CBD
   pinStyle: (feature) => {
-    let color = feature.color || 'red'
+    let color = feature.color || primaryColor || 'red'
     const ic = new Icon({
       src: markerIconDefaultSrc,
       color,
@@ -69,7 +76,8 @@ const props = withDefaults(defineProps<Props>(), {
     return ic
   },
   noresults: false,
-  getFeatureTitle: (feature: any) => (feature ? feature.title : '')
+  getFeatureTitle: (feature: any) => (feature ? feature.title : ''),
+  clusteringDistance: 100
 })
 
 const zoom = ref(props.initialZoom)
@@ -359,7 +367,7 @@ const noResultsRef = ref(null)
           <ol-animated-clusterlayer
             title="clusterLayer"
             :animationDuration="300"
-            :distance="100"
+            :distance="clusteringDistance"
             :zIndex="4"
           >
             <ol-source-vector :features="mapFeatures"> </ol-source-vector>
diff --git a/packages/ripple-ui-maps/src/components/map/utils.ts b/packages/ripple-ui-maps/src/components/map/utils.ts
index 5429b8a8e2..9ca53f7316 100644
--- a/packages/ripple-ui-maps/src/components/map/utils.ts
+++ b/packages/ripple-ui-maps/src/components/map/utils.ts
@@ -153,7 +153,7 @@ export const centerMap = (
   }
 
   const view = map.getView()
-  const resolution = view.getResolution()
+  const resolution = view.getResolutionForZoom(zoom || view.getZoom())
   const offsetCoord = [
     position[0] + offset.x * resolution,
     position[1] + offset.y * resolution
diff --git a/packages/stylelint-config-ripple/package.json b/packages/stylelint-config-ripple/package.json
index 02d353f5be..872f23c14a 100644
--- a/packages/stylelint-config-ripple/package.json
+++ b/packages/stylelint-config-ripple/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dpc-sdp/stylelint-config-ripple",
   "description": "ESLint config for Ripple projects",
-  "version": "2.11.0",
+  "version": "2.14.0",
   "license": "Apache-2.0",
   "repository": "https://github.com/dpc-sdp/ripple-framework",
   "main": "index.js",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9b480db49a..ca1b0530d1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -212,33 +212,9 @@ importers:
       '@dpc-sdp/nuxt-ripple-preview':
         specifier: workspace:*
         version: link:../../packages/nuxt-ripple-preview
-      '@dpc-sdp/ripple-tide-event':
-        specifier: workspace:*
-        version: link:../../packages/ripple-tide-event
-      '@dpc-sdp/ripple-tide-grant':
-        specifier: workspace:*
-        version: link:../../packages/ripple-tide-grant
-      '@dpc-sdp/ripple-tide-landing-page':
-        specifier: workspace:*
-        version: link:../../packages/ripple-tide-landing-page
-      '@dpc-sdp/ripple-tide-media':
-        specifier: workspace:*
-        version: link:../../packages/ripple-tide-media
-      '@dpc-sdp/ripple-tide-news':
+      '@dpc-sdp/ripple-sdp-core':
         specifier: workspace:*
-        version: link:../../packages/ripple-tide-news
-      '@dpc-sdp/ripple-tide-publication':
-        specifier: workspace:*
-        version: link:../../packages/ripple-tide-publication
-      '@dpc-sdp/ripple-tide-search':
-        specifier: workspace:*
-        version: link:../../packages/ripple-tide-search
-      '@dpc-sdp/ripple-tide-topic':
-        specifier: workspace:*
-        version: link:../../packages/ripple-tide-topic
-      '@dpc-sdp/ripple-tide-webform':
-        specifier: workspace:*
-        version: link:../../packages/ripple-tide-webform
+        version: link:../../packages/ripple-sdp-core
       '@dpc-sdp/ripple-ui-maps':
         specifier: workspace:*
         version: link:../../packages/ripple-ui-maps
@@ -262,6 +238,15 @@ importers:
         specifier: 3.11.2
         version: 3.11.2(@parcel/watcher@2.4.1)(@types/node@18.15.10)(@unocss/reset@0.59.3)(axios@1.6.8)(change-case@4.1.2)(encoding@0.1.13)(eslint@8.45.0)(floating-vue@5.2.2(@nuxt/kit@3.11.2(rollup@4.14.3))(vue@3.4.23(typescript@5.1.3)))(ioredis@5.3.2)(meow@10.1.5)(optionator@0.9.3)(rollup@4.14.3)(stylelint@15.10.2)(terser@5.18.0)(typescript@5.1.3)(unocss@0.59.3(postcss@8.4.38)(rollup@4.14.3)(vite@5.2.11(@types/node@18.15.10)(terser@5.18.0)))(vite@5.2.11(@types/node@18.15.10)(terser@5.18.0))
 
+  examples/nuxt-app/layers/ripple-ui-forms-ext:
+    dependencies:
+      '@dpc-sdp/ripple-tide-webform':
+        specifier: workspace:*
+        version: link:../../../../packages/ripple-tide-webform
+      '@dpc-sdp/ripple-ui-forms':
+        specifier: workspace:*
+        version: link:../../../../packages/ripple-ui-forms
+
   examples/vue-app:
     dependencies:
       '@dpc-sdp/ripple-ui-core':
@@ -475,6 +460,36 @@ importers:
         specifier: ^4.0.2
         version: 4.0.2
 
+  packages/ripple-sdp-core:
+    dependencies:
+      '@dpc-sdp/ripple-tide-event':
+        specifier: workspace:*
+        version: link:../ripple-tide-event
+      '@dpc-sdp/ripple-tide-grant':
+        specifier: workspace:*
+        version: link:../ripple-tide-grant
+      '@dpc-sdp/ripple-tide-landing-page':
+        specifier: workspace:*
+        version: link:../ripple-tide-landing-page
+      '@dpc-sdp/ripple-tide-media':
+        specifier: workspace:*
+        version: link:../ripple-tide-media
+      '@dpc-sdp/ripple-tide-news':
+        specifier: workspace:*
+        version: link:../ripple-tide-news
+      '@dpc-sdp/ripple-tide-publication':
+        specifier: workspace:*
+        version: link:../ripple-tide-publication
+      '@dpc-sdp/ripple-tide-search':
+        specifier: workspace:*
+        version: link:../ripple-tide-search
+      '@dpc-sdp/ripple-tide-topic':
+        specifier: workspace:*
+        version: link:../ripple-tide-topic
+      '@dpc-sdp/ripple-tide-webform':
+        specifier: workspace:*
+        version: link:../ripple-tide-webform
+
   packages/ripple-storybook:
     dependencies:
       '@dpc-sdp/ripple-ui-core':
@@ -581,8 +596,8 @@ importers:
         specifier: ^4.1.2
         version: 4.1.2
       cheerio:
-        specifier: ^1.0.0-rc.10
-        version: 1.0.0-rc.12
+        specifier: ^1.0.0
+        version: 1.0.0
       h3:
         specifier: ^1.9.0
         version: 1.10.1
@@ -621,7 +636,7 @@ importers:
         specifier: 3.11.2
         version: 3.11.2(rollup@4.14.3)
       '@types/cheerio':
-        specifier: ^0.22.31
+        specifier: ^0.22.35
         version: 0.22.35
       axios-mock-adapter:
         specifier: ^1.21.3
@@ -1296,6 +1311,7 @@ packages:
   '@babel/parser@7.21.3':
     resolution: {integrity: sha512-lobG0d7aOfQRXh8AyklEAgZGvA4FShxo6xQbUrrT/cNBPUdIDojlokwJsQyCC/eKia7ifqM0yP+2DRZ4WKw2RQ==}
     engines: {node: '>=6.0.0'}
+    hasBin: true
 
   '@babel/parser@7.23.0':
     resolution: {integrity: sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==}
@@ -1937,6 +1953,7 @@ packages:
   '@commitlint/cli@17.5.0':
     resolution: {integrity: sha512-yNW3+M7UM1ioK28LKTrryIVB5qGpXlEv8+rJQiWPMZNayy9/1XR5+lL8qBTNlgopYtZWWnIm5RETcAN29ZTL/A==}
     engines: {node: '>=v14'}
+    hasBin: true
 
   '@commitlint/config-conventional@17.4.4':
     resolution: {integrity: sha512-u6ztvxqzi6NuhrcEDR7a+z0yrh11elY66nRrQIpqsqW6sZmpxYkDLtpRH8jRML+mmxYQ8s4qqF06Q/IQx5aJeQ==}
@@ -3526,6 +3543,7 @@ packages:
   '@lerna-lite/cli@1.17.0':
     resolution: {integrity: sha512-kNqrEtUs1oIDHgOBGwHkRZGl/E7VTW+2wX89akQtpmfW7oV6qPdpjBirN9Hv9cVYW7UJzE2Hrk273WVZGoK7Jw==}
     engines: {node: '>=14.17.0', npm: '>=8.0.0'}
+    hasBin: true
 
   '@lerna-lite/core@1.17.0':
     resolution: {integrity: sha512-lxiEHXOzDF8RYFWjc8IqIr6G4w0JUB174SJD/h2DI/eXN9wjv8tEZjzhOkTTSs45Aoe1qY7BbaeApEulpoYmcA==}
@@ -3561,6 +3579,7 @@ packages:
 
   '@microsoft/api-extractor@7.34.3':
     resolution: {integrity: sha512-vXpU+i/MMinVzDxbLo3of1Sx/IS5bwOZl4XrX8YyqNBXFvovEer5ex0wckWumkBErDZtLOMp3zhZfYL3W7h3cg==}
+    hasBin: true
 
   '@microsoft/tsdoc-config@0.16.2':
     resolution: {integrity: sha512-OGiIzzoBLgWWR0UdRJX98oYO+XKGf7tiK4Zk6tQ/E4IJqGCe7dvkTvgDZV5cFJUzLGDOjeAXrnZoA6QkVySuxw==}
@@ -3615,6 +3634,7 @@ packages:
   '@npmcli/arborist@6.2.5':
     resolution: {integrity: sha512-+GPm+9WrDnl9q+LvuMB2W+roVinHTGDdYWOtYzRfpAnuiqaATFbH14skpXjlJ7LvyUcyd1oJhuGq6XXJLGFNng==}
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+    hasBin: true
 
   '@npmcli/fs@2.1.2':
     resolution: {integrity: sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==}
@@ -3635,6 +3655,7 @@ packages:
   '@npmcli/installed-package-contents@2.0.1':
     resolution: {integrity: sha512-GIykAFdOVK31Q1/zAtT5MbxqQL2vyl9mvFJv+OGu01zxbhL3p0xc8gJjdNGX1mWmUT43aEKVO2L6V/2j4TOsAA==}
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+    hasBin: true
 
   '@npmcli/installed-package-contents@2.0.2':
     resolution: {integrity: sha512-xACzLPhnfD51GKvTOOuNX2/V4G4mz9/1I2MfDoye9kBM3RYe5g2YbscsaGoTlaWqkxeiapBWyseULVKpSVHtKQ==}
@@ -5683,6 +5704,13 @@ packages:
       vite: '>=5.1.7'
       vue: ^3.2.25
 
+  '@vitejs/plugin-vue@5.0.5':
+    resolution: {integrity: sha512-LOjm7XeIimLBZyzinBQ6OSm3UBCNVCpLkxGC0oWmm2YPzVZoxMsdvNVimLTBzpAnR9hl/yn1SHGuRfe6/Td9rQ==}
+    engines: {node: ^18.0.0 || >=20.0.0}
+    peerDependencies:
+      vite: '>=5.1.7'
+      vue: ^3.2.25
+
   '@volar/language-core@1.3.0-alpha.0':
     resolution: {integrity: sha512-W3uMzecHPcbwddPu4SJpUcPakRBK/y/BP+U0U6NiPpUX1tONLC4yCawt+QBJqtgJ+sfD6ztf5PyvPL3hQRqfOA==}
 
@@ -5998,9 +6026,11 @@ packages:
   '@yarnpkg/shell@2.4.1':
     resolution: {integrity: sha512-oNNJkH8ZI5uwu0dMkJf737yMSY1WXn9gp55DqSA5wAOhKvV5DJTXFETxkVgBQhO6Bow9tMGSpvowTMD/oAW/9g==}
     engines: {node: '>=10.19.0'}
+    hasBin: true
 
   JSONStream@1.3.5:
     resolution: {integrity: sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==}
+    hasBin: true
 
   abab@2.0.6:
     resolution: {integrity: sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==}
@@ -6060,6 +6090,7 @@ packages:
   acorn@8.8.2:
     resolution: {integrity: sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==}
     engines: {node: '>=0.4.0'}
+    hasBin: true
 
   add-stream@1.0.0:
     resolution: {integrity: sha512-qQLMr+8o0WC4FZGQTcJiKBVC59JylcPSrTtk6usvmIDFUOCKegapy1VHQwRbFMOFyb/inzUVqHs+eMYKDM1YeQ==}
@@ -6623,6 +6654,7 @@ packages:
   browserslist@4.21.5:
     resolution: {integrity: sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==}
     engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
+    hasBin: true
 
   browserslist@4.22.2:
     resolution: {integrity: sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A==}
@@ -6886,9 +6918,9 @@ packages:
   cheerio-select@2.1.0:
     resolution: {integrity: sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g==}
 
-  cheerio@1.0.0-rc.12:
-    resolution: {integrity: sha512-VqR8m68vM46BNnuZ5NtnGBKIE/DfN0cRIzg9n40EIq9NOv90ayxLBXA8fXC5gquFRGJSTRqBq25Jt2ECLR431Q==}
-    engines: {node: '>= 6'}
+  cheerio@1.0.0:
+    resolution: {integrity: sha512-quS9HgjQpdaXOvsZz82Oz7uxtXiy6UIsIQcpBj7HRw2M63Skasm9qlDocAM7jNuaxdhpPU7c4kJN+gA5MCu4ww==}
+    engines: {node: '>=18.17'}
 
   chokidar@3.5.3:
     resolution: {integrity: sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==}
@@ -6907,6 +6939,7 @@ packages:
 
   chromatic@6.17.2:
     resolution: {integrity: sha512-rtrkywh1CuDDuuiRWXpdiX38aEGN3sGCATsgdh3X/EUBjQjgQtEbSzcMusC3cqz3K9dFKcWwKpFm3jaw9gNymA==}
+    hasBin: true
 
   chrome-trace-event@1.0.3:
     resolution: {integrity: sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==}
@@ -7256,6 +7289,7 @@ packages:
   conventional-changelog-writer@5.0.1:
     resolution: {integrity: sha512-5WsuKUfxW7suLblAbFnxAcrvf6r+0b7GvNaWUwUIk0bXMnENP/PEieGKVUQrjPqwPT4o3EPAASBXiY6iHooLOQ==}
     engines: {node: '>=10'}
+    hasBin: true
 
   conventional-commits-filter@2.0.7:
     resolution: {integrity: sha512-ASS9SamOP4TbCClsRHxIHXRfcGCnIoQqkvAzCSbZzTFLfcTqJVugB0agRgsEELsqaeWgsXv513eS116wnlSSPA==}
@@ -7264,10 +7298,12 @@ packages:
   conventional-commits-parser@3.2.4:
     resolution: {integrity: sha512-nK7sAtfi+QXbxHCYfhpZsfRtaitZLIA6889kFIouLvz6repszQDgxBu7wf2WbU+Dco7sAnNCJYERCwt54WPC2Q==}
     engines: {node: '>=10'}
+    hasBin: true
 
   conventional-recommended-bump@6.1.0:
     resolution: {integrity: sha512-uiApbSiNGM/kkdL9GTOLAqC4hbptObFo4wW2QRyHsKciGAfQuLU1ShZ1BIVI/+K2BE/W1AWYQMCXAsv4dyKPaw==}
     engines: {node: '>=10'}
+    hasBin: true
 
   convert-gitmoji@0.1.3:
     resolution: {integrity: sha512-t5yxPyI8h8KPvRwrS/sRrfIpT2gJbmBAY0TFokyUBy3PM44RuFRpZwHdACz+GTSPLRLo3s4qsscOMLjHiXBwzw==}
@@ -7304,6 +7340,7 @@ packages:
 
   copyfiles@2.4.1:
     resolution: {integrity: sha512-fereAvAvxDrQDOXybk3Qu3dPbOoKoysFMWtkY3mv5BsL8//OSZVL5DCLYqgRfY5cWirgRzlC+WSrxp6Bo3eNZg==}
+    hasBin: true
 
   core-js-compat@3.31.0:
     resolution: {integrity: sha512-hM7YCu1cU6Opx7MXNu0NuumM0ezNeAeRKadixyiQELWY3vT3De9S4J5ZBMraWV2vZnrE1Cirl0GtFtDtMUXzPw==}
@@ -7776,6 +7813,7 @@ packages:
   degit@2.8.4:
     resolution: {integrity: sha512-vqYuzmSA5I50J882jd+AbAhQtgK6bdKUJIex1JNfEUPENCgYsxugzKVZlFyMwV4i06MmnV47/Iqi5Io86zf3Ng==}
     engines: {node: '>=8.0.0'}
+    hasBin: true
 
   del@6.1.1:
     resolution: {integrity: sha512-ua8BhapfP0JUJKC/zV9yHHDW/rDoDxP4Zhn3AkA6/xT6gY7jYXJiaeyBZznYVujhZZET+UgcbZiQ7sN3WqcImg==}
@@ -7955,6 +7993,9 @@ packages:
   domutils@3.0.1:
     resolution: {integrity: sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q==}
 
+  domutils@3.1.0:
+    resolution: {integrity: sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==}
+
   dot-case@2.1.1:
     resolution: {integrity: sha512-HnM6ZlFqcajLsyudHq7LeeLDr2rFAVYtDv/hV5qchQEidSck8j9OPUsXY9KwJv/lHMtYlX4DjRQqwFYa+0r8Ug==}
 
@@ -8010,6 +8051,7 @@ packages:
   ejs@3.1.8:
     resolution: {integrity: sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ==}
     engines: {node: '>=0.10.0'}
+    hasBin: true
 
   electron-to-chromium@1.4.288:
     resolution: {integrity: sha512-8s9aJf3YiokIrR+HOQzNOGmEHFXVUQzXM/JaViVvKdCkNUjS+lEa/uT7xw3nDVG/IgfxiIwUGkwJ6AR1pTpYsQ==}
@@ -8047,6 +8089,9 @@ packages:
     resolution: {integrity: sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==}
     engines: {node: '>= 0.8'}
 
+  encoding-sniffer@0.2.0:
+    resolution: {integrity: sha512-ju7Wq1kg04I3HtiYIOrUrdfdDvkyO9s5XM8QAj/bN61Yo/Vb4vgJxy5vi4Yxk01gWHbrofpPtpxM8bKger9jhg==}
+
   encoding@0.1.13:
     resolution: {integrity: sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==}
 
@@ -8099,6 +8144,7 @@ packages:
 
   errno@0.1.8:
     resolution: {integrity: sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==}
+    hasBin: true
 
   error-ex@1.3.2:
     resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==}
@@ -8324,6 +8370,7 @@ packages:
   escodegen@2.0.0:
     resolution: {integrity: sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==}
     engines: {node: '>=6.0'}
+    hasBin: true
 
   escodegen@2.1.0:
     resolution: {integrity: sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==}
@@ -8943,6 +8990,7 @@ packages:
   get-pkg-repo@4.2.1:
     resolution: {integrity: sha512-2+QbHjFRfGB74v/pYWjd5OhU3TDIC2Gv/YKUTk/tCvAz0pkn/Mz6P3uByuBimLOcPvN2jYdScl3xGFSrx0jEcA==}
     engines: {node: '>=6.9.0'}
+    hasBin: true
 
   get-port-please@3.0.1:
     resolution: {integrity: sha512-R5pcVO8Z1+pVDu8Ml3xaJCEkBiiy1VQN9za0YqH8GIi1nIqD4IzQhzY6dDzMRtdS1lyiGlucRzm8IN8wtLIXng==}
@@ -9006,6 +9054,7 @@ packages:
   git-raw-commits@2.0.11:
     resolution: {integrity: sha512-VnctFhw+xfj8Va1xtfEqCUD2XDrbAPSJx+hSrE5K7fGdjZruW7XV+QOrN7LF/RJyvspRiD2I0asWsxFp0ya26A==}
     engines: {node: '>=10'}
+    hasBin: true
 
   git-remote-origin-url@2.0.0:
     resolution: {integrity: sha512-eU+GGrZgccNJcsDH5LkXR3PB9M958hxc7sbA8DFJjrv9j4L2P/eZfKhM+QD6wyzpiv+b1BpK0XrYCxkovtjSLw==}
@@ -9014,6 +9063,7 @@ packages:
   git-semver-tags@4.1.1:
     resolution: {integrity: sha512-OWyMt5zBe7xFs8vglMmhM9lRQzCWL3WjHtxNNfJTMngGym7pC1kh8sP6jevfydJ6LP3ZvGxfb6ABYgPUM0mtsA==}
     engines: {node: '>=10'}
+    hasBin: true
 
   git-up@7.0.0:
     resolution: {integrity: sha512-ONdIrbBCFusq1Oy0sC71F5azx8bVkvtZtMJAsv+a6lz5YAmbNnLD6HAB4gptHZVLPR8S2/kVN6Gab7lryq5+lQ==}
@@ -9282,6 +9332,7 @@ packages:
 
   he@1.2.0:
     resolution: {integrity: sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==}
+    hasBin: true
 
   header-case@1.0.1:
     resolution: {integrity: sha512-i0q9mkOeSuhXw6bGgiQCCBgY/jlZuV/7dZXyZ9c6LcBrqwvT8eT719E9uxE5LiZftdl+z81Ugbg/VvXV4OJOeQ==}
@@ -9350,6 +9401,9 @@ packages:
   htmlparser2@8.0.1:
     resolution: {integrity: sha512-4lVbmc1diZC7GUJQtRQ5yBAeUCL1exyMwmForWkRLnwyzWBFxN633SALPMGYaWZvKe9j1pRZJpauvmxENSp/EA==}
 
+  htmlparser2@9.1.0:
+    resolution: {integrity: sha512-5zfg6mHUoaer/97TxnGpxmbR7zJtPwIYFMZ/H5ucTlPZhKvtum05yiPK3Mgai3a0DyVxv7qYqoweaEd2nrYQzQ==}
+
   http-cache-semantics@4.1.1:
     resolution: {integrity: sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==}
 
@@ -9447,9 +9501,11 @@ packages:
   husky@8.0.3:
     resolution: {integrity: sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg==}
     engines: {node: '>=14'}
+    hasBin: true
 
   hygen@6.2.11:
     resolution: {integrity: sha512-t6/zLI2XozP5gvV74nnl8LZSbwpVNFUkUs/O9DwuOdiiBbws5k4AQNVwKZ9FGzcKjdJ5EBBYkVzlcUHkLyY0FQ==}
+    hasBin: true
 
   iconv-lite@0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
@@ -9496,6 +9552,7 @@ packages:
   image-size@0.5.5:
     resolution: {integrity: sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==}
     engines: {node: '>=0.10.0'}
+    hasBin: true
 
   import-fresh@3.3.0:
     resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==}
@@ -9999,6 +10056,7 @@ packages:
   jake@10.8.5:
     resolution: {integrity: sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==}
     engines: {node: '>=10'}
+    hasBin: true
 
   jest-axe@7.0.1:
     resolution: {integrity: sha512-1JoEla6gL4rcsTxEWm+VBcWMwOhP3f9w4dH7/YW3H41nU08Dds3gUFqxgdAq/pzBNPpauC3QPr/BuO+0W8eamg==}
@@ -10333,6 +10391,7 @@ packages:
 
   js-yaml@4.1.0:
     resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==}
+    hasBin: true
 
   jsbn@0.1.1:
     resolution: {integrity: sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==}
@@ -11264,6 +11323,7 @@ packages:
   mkdirp@1.0.4:
     resolution: {integrity: sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==}
     engines: {node: '>=10'}
+    hasBin: true
 
   mkdirp@2.1.6:
     resolution: {integrity: sha512-+hEnITedc8LAtIP9u3HJDFIdcLV2vXP33sqLLIzkv1Db1zO/1OxbvYf0Y1OC/S/Qo5dxHXepofhmxL02PsKe+A==}
@@ -11340,6 +11400,7 @@ packages:
   nanoid@4.0.2:
     resolution: {integrity: sha512-7ZtY5KTCNheRGfEFxnedV5zFiORN1+Y1N6zvPTnHQd8ENUvfaDBeuJDZb2bN/oXwXxu3qkTXDzy57W5vAmDTBw==}
     engines: {node: ^14 || ^16 || >=18}
+    hasBin: true
 
   nanomatch@1.2.13:
     resolution: {integrity: sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==}
@@ -11493,6 +11554,7 @@ packages:
   nopt@7.0.0:
     resolution: {integrity: sha512-e6Qw1rcrGoSxEH0hQ4GBSdUjkMOtXGhGFXdNT/3ZR0S37eR9DMj5za3dEDWE6o1T3/DP8ZOsPP4MIiky0c3QeA==}
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+    hasBin: true
 
   normalize-package-data@2.5.0:
     resolution: {integrity: sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==}
@@ -11927,6 +11989,7 @@ packages:
   pacote@15.1.1:
     resolution: {integrity: sha512-eeqEe77QrA6auZxNHIp+1TzHQ0HBKf5V6c8zcaYZ134EJe1lCi+fjXATkNiEEfbG+e50nu02GLvUtmZcGOYabQ==}
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+    hasBin: true
 
   pacote@15.2.0:
     resolution: {integrity: sha512-rJVZeIwHTUta23sIZgEIM62WYwbmGbThdbnkt81ravBplQv+HjyroqnLRNH2+sLJHcGZmLRmhPwACqhfTcOmnA==}
@@ -12006,6 +12069,9 @@ packages:
   parse5-htmlparser2-tree-adapter@7.0.0:
     resolution: {integrity: sha512-B77tOZrqqfUfnVcOrUvfdLbz4pu4RopLD/4vmu3HUPswwTA8OH0EMW9BlWR2B0RCoiZRAHEUu7IxeP1Pd1UU+g==}
 
+  parse5-parser-stream@7.1.2:
+    resolution: {integrity: sha512-JyeQc9iwFLn5TbvvqACIF/VXG6abODeB3Fwmv/TGdLk2LfbWkaySGY72at4+Ty7EkPZj854u4CrICqNk2qIbow==}
+
   parse5@7.1.2:
     resolution: {integrity: sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==}
 
@@ -13702,6 +13768,7 @@ packages:
   sigstore@1.1.1:
     resolution: {integrity: sha512-4hR3tPP1y59YWlaoAgAWFVZ7srTjNWOrrpkQXWu05qP0BvwFYyt3K3l848+IHo+mKhkOzGcNDf7ktASXLEPC+A==}
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+    hasBin: true
 
   sigstore@1.7.0:
     resolution: {integrity: sha512-KP7QULhWdlu3hlp+jw2EvgWKlOGOY9McLj/jrchLjHNlNPK0KWIwF919cbmOp6QiKXLmPijR2qH/5KYWlbtG9Q==}
@@ -13798,6 +13865,7 @@ packages:
   snyk-nodejs-lockfile-parser@1.48.0:
     resolution: {integrity: sha512-kq4gVwL5V0SUatDxyyzbptKkaX4Ew9N3ZDNR5r7sqBRparY+U+xGuYBhTaJdweBUD+jkvs7rKO1JV1h0Z8c2ew==}
     engines: {node: '>=10'}
+    hasBin: true
 
   socket.io-client@4.7.2:
     resolution: {integrity: sha512-vtA0uD4ibrYD793SOIAwlo8cj6haOeMHrGvwPxJsxH7CeIksqJ+3Zc06RvWTIFgiSqx4A3sOnTXpfAEE2Zyz6w==}
@@ -14109,10 +14177,12 @@ packages:
   strong-log-transformer@2.1.0:
     resolution: {integrity: sha512-B3Hgul+z0L9a236FAUC9iZsL+nVHgoCJnqCbN588DjYxvGXaXaaFbfmQ/JhvKjZwsOukuR72XbHv71Qkug0HxA==}
     engines: {node: '>=4'}
+    hasBin: true
 
   style-dictionary@3.7.2:
     resolution: {integrity: sha512-Nd/qrPj1ikYX+sL/8PofMgfaJLRvGgT96Ty3dJLGNqtZmecVr3Xs+OZivMQEYmSCTiap/UyeV5SqwmAgn3/KKA==}
     engines: {node: '>=12.0.0'}
+    hasBin: true
 
   style-search@0.1.0:
     resolution: {integrity: sha512-Dj1Okke1C3uKKwQcetra4jSuk0DqbzbYtXipzFlFMZtowbF1x7BKJwB9AayVMyFARvU8EDrZdcax4At/452cAg==}
@@ -14523,6 +14593,7 @@ packages:
   ts-json-schema-generator@1.2.0:
     resolution: {integrity: sha512-tUMeO3ZvA12d3HHh7T/AK8W5hmUhDRNtqWRHSMN3ZRbUFt+UmV0oX8k1RK4SA+a+BKNHpmW2v06MS49e8Fi3Yg==}
     engines: {node: '>=10.0.0'}
+    hasBin: true
 
   ts-map@1.0.3:
     resolution: {integrity: sha512-vDWbsl26LIcPGmDpoVzjEP6+hvHZkBkLW7JpvwbCv/5IYPJlsbzCVXY3wsCeAxAUeTclNOUZxnLdGh3VBD/J6w==}
@@ -14669,18 +14740,22 @@ packages:
 
   typescript-json-schema@0.55.0:
     resolution: {integrity: sha512-BXaivYecUdiXWWNiUqXgY6A9cMWerwmhtO+lQE7tDZGs7Mf38sORDeQZugfYOZOHPZ9ulsD+w0LWjFDOQoXcwg==}
+    hasBin: true
 
   typescript@4.8.4:
     resolution: {integrity: sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==}
     engines: {node: '>=4.2.0'}
+    hasBin: true
 
   typescript@4.9.5:
     resolution: {integrity: sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==}
     engines: {node: '>=4.2.0'}
+    hasBin: true
 
   typescript@5.0.2:
     resolution: {integrity: sha512-wVORMBGO/FAs/++blGNeAVdbNKtIh1rbBL2EyQ1+J9lClJ93KiiKe8PmFIVdXhHcyv44SL9oglmfeSsndo0jRw==}
     engines: {node: '>=12.20'}
+    hasBin: true
 
   typescript@5.1.3:
     resolution: {integrity: sha512-XH627E9vkeqhlZFQuL+UsyAXEnibT0kWR2FWONlr4sTjvxyJYnyefgrkyECLzM5NenmKzRAy2rR/OlYLA1HkZw==}
@@ -14732,6 +14807,10 @@ packages:
     resolution: {integrity: sha512-wh1pHJHnUeQV5Xa8/kyQhO7WFa8M34l026L5P/+2TYiakvGy5Rdc8jWZVyG7ieht/0WgJLEd3kcU5gKx+6GC8w==}
     engines: {node: '>=14.0'}
 
+  undici@6.19.7:
+    resolution: {integrity: sha512-HR3W/bMGPSr90i8AAp2C4DM3wChFdJPLrWYpIS++LxS8K+W535qftjt+4MyjNYHeWabMj1nvtmLIi7l++iq91A==}
+    engines: {node: '>=18.17'}
+
   unenv@1.9.0:
     resolution: {integrity: sha512-QKnFNznRxmbOF1hDgzpqrlIf6NC5sbZ2OJ+5Wl3OX8uM+LUJXbj4TXvLJCtwbPTmbMHCLIz6JLKNinNsMShK9g==}
 
@@ -15332,8 +15411,8 @@ packages:
     peerDependencies:
       typescript: '*'
 
-  vue-component-type-helpers@2.0.21:
-    resolution: {integrity: sha512-3NaicyZ7N4B6cft4bfb7dOnPbE9CjLcx+6wZWAg5zwszfO4qXRh+U52dN5r5ZZfc6iMaxKCEcoH9CmxxoFZHLg==}
+  vue-component-type-helpers@2.0.29:
+    resolution: {integrity: sha512-58i+ZhUAUpwQ+9h5Hck0D+jr1qbYl4voRt5KffBx8qzELViQ4XdT/Tuo+mzq8u63teAG8K0lLaOiL5ofqW38rg==}
 
   vue-demi@0.14.6:
     resolution: {integrity: sha512-8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w==}
@@ -15503,10 +15582,18 @@ packages:
     resolution: {integrity: sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==}
     engines: {node: '>=12'}
 
+  whatwg-encoding@3.1.1:
+    resolution: {integrity: sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==}
+    engines: {node: '>=18'}
+
   whatwg-mimetype@3.0.0:
     resolution: {integrity: sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==}
     engines: {node: '>=12'}
 
+  whatwg-mimetype@4.0.0:
+    resolution: {integrity: sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==}
+    engines: {node: '>=18'}
+
   whatwg-url@11.0.0:
     resolution: {integrity: sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==}
     engines: {node: '>=12'}
@@ -15781,6 +15868,7 @@ packages:
   z-schema@5.0.5:
     resolution: {integrity: sha512-D7eujBWkLa3p2sIpJA0d1pr7es+a7m0vFAnZLlCEKq/Ij2k0MLi9Br2UPxoxdYystm5K1yeBGzub0FlYUEWj2Q==}
     engines: {node: '>=8.0.0'}
+    hasBin: true
 
   zhead@2.2.4:
     resolution: {integrity: sha512-8F0OI5dpWIA5IGG5NHUg9staDwz/ZPxZtvGVf01j7vHqSyZ0raHY+78atOVxRqb73AotX22uV1pXt3gYSstGag==}
@@ -20208,7 +20296,7 @@ snapshots:
     dependencies:
       '@nuxt/kit': 3.10.2(rollup@4.9.1)
       '@rollup/plugin-replace': 5.0.5(rollup@4.9.1)
-      '@vitejs/plugin-vue': 5.0.4(patch_hash=isqbuc2kkxkzmwgmxoscqh5w4q)(vite@5.2.11(@types/node@18.15.10)(terser@5.18.0))(vue@3.4.23(typescript@5.1.3))
+      '@vitejs/plugin-vue': 5.0.5(vite@5.2.11(@types/node@18.15.10)(terser@5.18.0))(vue@3.4.23(typescript@5.1.3))
       '@vitejs/plugin-vue-jsx': 3.1.0(vite@5.2.11(@types/node@18.15.10)(terser@5.18.0))(vue@3.4.23(typescript@5.1.3))
       autoprefixer: 10.4.17(postcss@8.4.38)
       clear: 0.1.0
@@ -20265,7 +20353,7 @@ snapshots:
     dependencies:
       '@nuxt/kit': 3.11.2(rollup@4.14.3)
       '@rollup/plugin-replace': 5.0.5(rollup@4.14.3)
-      '@vitejs/plugin-vue': 5.0.4(patch_hash=isqbuc2kkxkzmwgmxoscqh5w4q)(vite@5.2.11(@types/node@18.15.10)(terser@5.18.0))(vue@3.4.23(typescript@5.1.3))
+      '@vitejs/plugin-vue': 5.0.5(vite@5.2.11(@types/node@18.15.10)(terser@5.18.0))(vue@3.4.23(typescript@5.1.3))
       '@vitejs/plugin-vue-jsx': 3.1.0(vite@5.2.11(@types/node@18.15.10)(terser@5.18.0))(vue@3.4.23(typescript@5.1.3))
       autoprefixer: 10.4.19(postcss@8.4.38)
       clear: 0.1.0
@@ -22027,7 +22115,7 @@ snapshots:
       ts-dedent: 2.2.0
       type-fest: 2.19.0
       vue: 3.4.23(typescript@5.1.3)
-      vue-component-type-helpers: 2.0.21
+      vue-component-type-helpers: 2.0.29
     transitivePeerDependencies:
       - encoding
       - supports-color
@@ -23021,6 +23109,11 @@ snapshots:
       vite: 5.2.11(@types/node@18.15.10)(terser@5.18.0)
       vue: 3.4.23(typescript@5.1.3)
 
+  '@vitejs/plugin-vue@5.0.5(vite@5.2.11(@types/node@18.15.10)(terser@5.18.0))(vue@3.4.23(typescript@5.1.3))':
+    dependencies:
+      vite: 5.2.11(@types/node@18.15.10)(terser@5.18.0)
+      vue: 3.4.23(typescript@5.1.3)
+
   '@volar/language-core@1.3.0-alpha.0':
     dependencies:
       '@volar/source-map': 1.3.0-alpha.0
@@ -24778,17 +24871,21 @@ snapshots:
       css-what: 6.1.0
       domelementtype: 2.3.0
       domhandler: 5.0.3
-      domutils: 3.0.1
+      domutils: 3.1.0
 
-  cheerio@1.0.0-rc.12:
+  cheerio@1.0.0:
     dependencies:
       cheerio-select: 2.1.0
       dom-serializer: 2.0.0
       domhandler: 5.0.3
-      domutils: 3.0.1
-      htmlparser2: 8.0.1
+      domutils: 3.1.0
+      encoding-sniffer: 0.2.0
+      htmlparser2: 9.1.0
       parse5: 7.1.2(patch_hash=we4prwxijorghvcqg5y46szn5m)
       parse5-htmlparser2-tree-adapter: 7.0.0(patch_hash=pbfyvtlxq7sl6kts5un2uoamka)
+      parse5-parser-stream: 7.1.2
+      undici: 6.19.7
+      whatwg-mimetype: 4.0.0
 
   chokidar@3.5.3:
     dependencies:
@@ -25412,7 +25509,7 @@ snapshots:
       boolbase: 1.0.0
       css-what: 6.1.0
       domhandler: 5.0.3
-      domutils: 3.0.1
+      domutils: 3.1.0
       nth-check: 2.1.1
 
   css-tree@1.0.0-alpha.37:
@@ -25974,6 +26071,12 @@ snapshots:
       domelementtype: 2.3.0
       domhandler: 5.0.3
 
+  domutils@3.1.0:
+    dependencies:
+      dom-serializer: 2.0.0
+      domelementtype: 2.3.0
+      domhandler: 5.0.3
+
   dot-case@2.1.1:
     dependencies:
       no-case: 2.3.2
@@ -26049,6 +26152,11 @@ snapshots:
 
   encodeurl@1.0.2: {}
 
+  encoding-sniffer@0.2.0:
+    dependencies:
+      iconv-lite: 0.6.3
+      whatwg-encoding: 3.1.1
+
   encoding@0.1.13:
     dependencies:
       iconv-lite: 0.6.3
@@ -27863,6 +27971,13 @@ snapshots:
       domutils: 3.0.1
       entities: 4.5.0
 
+  htmlparser2@9.1.0:
+    dependencies:
+      domelementtype: 2.3.0
+      domhandler: 5.0.3
+      domutils: 3.1.0
+      entities: 4.5.0
+
   http-cache-semantics@4.1.1: {}
 
   http-encoding@1.5.1:
@@ -30140,7 +30255,7 @@ snapshots:
   metaparser@1.0.7:
     dependencies:
       async: 3.2.4
-      cheerio: 1.0.0-rc.12
+      cheerio: 1.0.0
       mkdirp: 2.1.6
       underscore: 1.13.6
 
@@ -31908,6 +32023,10 @@ snapshots:
       domhandler: 5.0.3
       parse5: 7.1.2(patch_hash=we4prwxijorghvcqg5y46szn5m)
 
+  parse5-parser-stream@7.1.2:
+    dependencies:
+      parse5: 7.1.2(patch_hash=we4prwxijorghvcqg5y46szn5m)
+
   parse5@7.1.2(patch_hash=we4prwxijorghvcqg5y46szn5m):
     dependencies:
       entities: 4.5.0
@@ -35075,6 +35194,8 @@ snapshots:
     dependencies:
       '@fastify/busboy': 2.1.0
 
+  undici@6.19.7: {}
+
   unenv@1.9.0:
     dependencies:
       consola: 3.2.3
@@ -35846,7 +35967,7 @@ snapshots:
       typesafe-path: 0.2.2
       typescript: 5.1.3
 
-  vue-component-type-helpers@2.0.21: {}
+  vue-component-type-helpers@2.0.29: {}
 
   vue-demi@0.14.6(vue@3.4.23(typescript@5.1.3)):
     dependencies:
@@ -36064,8 +36185,14 @@ snapshots:
     dependencies:
       iconv-lite: 0.6.3
 
+  whatwg-encoding@3.1.1:
+    dependencies:
+      iconv-lite: 0.6.3
+
   whatwg-mimetype@3.0.0: {}
 
+  whatwg-mimetype@4.0.0: {}
+
   whatwg-url@11.0.0:
     dependencies:
       tr46: 3.0.0