From 621886d8b2b83d404782dc8e930f8ec0b21ed266 Mon Sep 17 00:00:00 2001
From: Paul Robert Lloyd <me+git@paulrobertlloyd.com>
Date: Fri, 8 Dec 2023 22:06:24 +0000
Subject: [PATCH] Upgrade to govuk-frontend v5

---
 components/header/_crown.svg      |  8 --------
 components/header/_govuk.svg      |  4 ++++
 components/header/_header.scss    | 15 +++++++++------
 components/header/_royal-arms.svg |  3 ---
 components/header/_x-govuk.svg    |  5 +++--
 components/header/template.njk    | 23 +++++++++--------------
 docs/options.md                   | 15 ++++++++-------
 eleventy.config.js                |  3 +--
 index.js                          |  2 +-
 layouts/base.njk                  |  2 +-
 lib/govuk.scss                    |  3 +--
 lib/nunjucks.js                   |  2 +-
 package-lock.json                 | 19 ++++++++++++++-----
 package.json                      |  4 ++--
 14 files changed, 54 insertions(+), 54 deletions(-)
 delete mode 100644 components/header/_crown.svg
 create mode 100644 components/header/_govuk.svg
 delete mode 100644 components/header/_royal-arms.svg

diff --git a/components/header/_crown.svg b/components/header/_crown.svg
deleted file mode 100644
index e861155d..00000000
--- a/components/header/_crown.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--[if gt IE 8]><!-->
-<svg class="govuk-header__logotype-crown" aria-hidden="true" focusable="false" height="30" width="36" viewBox="0 0 132 97" xmlns="http://www.w3.org/2000/svg">
-  <path fill="currentColor" fill-rule="evenodd" d="M25 30.2c3.5 1.5 7.7-.2 9.1-3.7 1.5-3.6-.2-7.8-3.9-9.2-3.6-1.4-7.6.3-9.1 3.9-1.4 3.5.3 7.5 3.9 9zM9 39.5c3.6 1.5 7.8-.2 9.2-3.7 1.5-3.6-.2-7.8-3.9-9.1-3.6-1.5-7.6.2-9.1 3.8-1.4 3.5.3 7.5 3.8 9zM4.4 57.2c3.5 1.5 7.7-.2 9.1-3.8 1.5-3.6-.2-7.7-3.9-9.1-3.5-1.5-7.6.3-9.1 3.8-1.4 3.5.3 7.6 3.9 9.1zm38.3-21.4c3.5 1.5 7.7-.2 9.1-3.8 1.5-3.6-.2-7.7-3.9-9.1-3.6-1.5-7.6.3-9.1 3.8-1.3 3.6.4 7.7 3.9 9.1zm64.4-5.6c-3.6 1.5-7.8-.2-9.1-3.7-1.5-3.6.2-7.8 3.8-9.2 3.6-1.4 7.7.3 9.2 3.9 1.3 3.5-.4 7.5-3.9 9zm15.9 9.3c-3.6 1.5-7.7-.2-9.1-3.7-1.5-3.6.2-7.8 3.7-9.1 3.6-1.5 7.7.2 9.2 3.8 1.5 3.5-.3 7.5-3.8 9zm4.7 17.7c-3.6 1.5-7.8-.2-9.2-3.8-1.5-3.6.2-7.7 3.9-9.1 3.6-1.5 7.7.3 9.2 3.8 1.3 3.5-.4 7.6-3.9 9.1zM89.3 35.8c-3.6 1.5-7.8-.2-9.2-3.8-1.4-3.6.2-7.7 3.9-9.1 3.6-1.5 7.7.3 9.2 3.8 1.4 3.6-.3 7.7-3.9 9.1zM69.7 17.7l8.9 4.7V9.3l-8.9 2.8c-.2-.3-.5-.6-.9-.9L72.4 0H59.6l3.5 11.2c-.3.3-.6.5-.9.9l-8.8-2.8v13.1l8.8-4.7c.3.3.6.7.9.9l-5 15.4v.1c-.2.8-.4 1.6-.4 2.4 0 4.1 3.1 7.5 7 8.1h.2c.3 0 .7.1 1 .1.4 0 .7 0 1-.1h.2c4-.6 7.1-4.1 7.1-8.1 0-.8-.1-1.7-.4-2.4V34l-5.1-15.4c.4-.2.7-.6 1-.9zM66 92.8c16.9 0 32.8 1.1 47.1 3.2 4-16.9 8.9-26.7 14-33.5l-9.6-3.4c1 4.9 1.1 7.2 0 10.2-1.5-1.4-3-4.3-4.2-8.7L108.6 76c2.8-2 5-3.2 7.5-3.3-4.4 9.4-10 11.9-13.6 11.2-4.3-.8-6.3-4.6-5.6-7.9 1-4.7 5.7-5.9 8-.5 4.3-8.7-3-11.4-7.6-8.8 7.1-7.2 7.9-13.5 2.1-21.1-8 6.1-8.1 12.3-4.5 20.8-4.7-5.4-12.1-2.5-9.5 6.2 3.4-5.2 7.9-2 7.2 3.1-.6 4.3-6.4 7.8-13.5 7.2-10.3-.9-10.9-8-11.2-13.8 2.5-.5 7.1 1.8 11 7.3L80.2 60c-4.1 4.4-8 5.3-12.3 5.4 1.4-4.4 8-11.6 8-11.6H55.5s6.4 7.2 7.9 11.6c-4.2-.1-8-1-12.3-5.4l1.4 16.4c3.9-5.5 8.5-7.7 10.9-7.3-.3 5.8-.9 12.8-11.1 13.8-7.2.6-12.9-2.9-13.5-7.2-.7-5 3.8-8.3 7.1-3.1 2.7-8.7-4.6-11.6-9.4-6.2 3.7-8.5 3.6-14.7-4.6-20.8-5.8 7.6-5 13.9 2.2 21.1-4.7-2.6-11.9.1-7.7 8.8 2.3-5.5 7.1-4.2 8.1.5.7 3.3-1.3 7.1-5.7 7.9-3.5.7-9-1.8-13.5-11.2 2.5.1 4.7 1.3 7.5 3.3l-4.7-15.4c-1.2 4.4-2.7 7.2-4.3 8.7-1.1-3-.9-5.3 0-10.2l-9.5 3.4c5 6.9 9.9 16.7 14 33.5 14.8-2.1 30.8-3.2 47.7-3.2z"></path>
-</svg>
-<!--<![endif]-->
-<!--[if IE 8]>
-<img src="{{ params.assetsPath | default('/assets/images') }}/govuk-logotype-crown.png" class="govuk-header__logotype-crown-fallback-image" width="36" height="32">
-<![endif]-->
diff --git a/components/header/_govuk.svg b/components/header/_govuk.svg
new file mode 100644
index 00000000..1b1a9145
--- /dev/null
+++ b/components/header/_govuk.svg
@@ -0,0 +1,4 @@
+<svg class="govuk-header__logotype" xmlns="http://www.w3.org/2000/svg" focusable="false" role="img" width="152" height="30" viewBox="0 0 152 30" aria-label="GOV.UK">
+  <title>GOV.UK</title>
+  <path d="M6.7 12.2c1 .4 2.1-.1 2.5-1s-.1-2.1-1-2.5c-1-.4-2.1.1-2.5 1-.4 1 0 2.1 1 2.5m-4.3 2.5c1 .4 2.1-.1 2.5-1s-.1-2.1-1-2.5c-1-.4-2.1.1-2.5 1-.5 1 0 2.1 1 2.5m-1.3 4.8c1 .4 2.1-.1 2.5-1 .4-1-.1-2.1-1-2.5-1-.4-2.1.1-2.5 1-.4 1 0 2.1 1 2.5m10.4-5.8c1 .4 2.1-.1 2.5-1s-.1-2.1-1-2.5c-1-.4-2.1.1-2.5 1s0 2.1 1 2.5m17.4-1.5c-1 .4-2.1-.1-2.5-1s.1-2.1 1-2.5c1-.4 2.1.1 2.5 1 .5 1 0 2.1-1 2.5m4.3 2.5c-1 .4-2.1-.1-2.5-1s.1-2.1 1-2.5c1-.4 2.1.1 2.5 1 .5 1 0 2.1-1 2.5m1.3 4.8c-1 .4-2.1-.1-2.5-1-.4-1 .1-2.1 1-2.5 1-.4 2.1.1 2.5 1 .4 1 0 2.1-1 2.5m-10.4-5.8c-1 .4-2.1-.1-2.5-1s.1-2.1 1-2.5c1-.4 2.1.1 2.5 1s0 2.1-1 2.5m-5.3-4.9 2.4 1.3V6.5l-2.4.8c-.1-.1-.1-.2-.2-.2s1-3 1-3h-3.4l1 3c-.1.1-.2.1-.2.2-.1.1-2.4-.7-2.4-.7v3.5L17 8.8c-.1.1 0 .2.1.3l-1.4 4.2c-.1.2-.1.4-.1.7 0 1.1.8 2.1 1.9 2.2h.6C19.2 16 20 15.1 20 14c0-.2 0-.4-.1-.7l-1.4-4.2c.2-.1.3-.2.3-.3m-1 20.3c4.6 0 8.9.3 12.8.9 1.1-4.6 2.4-7.2 3.8-9.1l-2.6-.9c.3 1.3.3 1.9 0 2.8-.4-.4-.8-1.2-1.1-2.4l-1.2 4.2c.8-.5 1.4-.9 2-.9-1.2 2.6-2.7 3.2-3.6 3-1.2-.2-1.7-1.3-1.5-2.2.3-1.3 1.6-1.6 2.2-.1 1.2-2.4-.8-3.1-2.1-2.4 1.9-1.9 2.2-3.6.6-5.7-2.2 1.7-2.2 3.3-1.2 5.6-1.3-1.5-3.3-.7-2.5 1.7.9-1.4 2.1-.5 2 .8-.2 1.2-1.7 2.1-3.7 2-2.8-.2-3-2.2-3-3.7.7-.1 1.9.5 3 2l.4-4.4c-1.1 1.2-2.2 1.4-3.3 1.4.4-1.2 2.1-3.1 2.1-3.1h-5.5s1.8 2 2.1 3.1c-1.1 0-2.2-.3-3.3-1.4l.4 4.4c1.1-1.5 2.3-2.1 3-2-.1 1.6-.2 3.5-3 3.7-1.9.2-3.5-.8-3.7-2-.2-1.3 1-2.2 1.9-.8.7-2.4-1.3-3.1-2.6-1.7 1-2.3 1-4-1.2-5.6-1.6 2.1-1.3 3.8.6 5.7-1.3-.7-3.2 0-2.1 2.4.6-1.5 1.9-1.1 2.2.1.2.9-.4 1.9-1.5 2.2-1 .2-2.5-.5-3.7-3 .7 0 1.3.4 2 .9L5 20.4c-.3 1.2-.7 1.9-1.2 2.4-.3-.8-.2-1.5 0-2.8l-2.6.9C2.7 22.8 4 25.4 5.1 30c3.8-.5 8.2-.9 12.7-.9m30.5-11.5c0 .9.1 1.7.3 2.5.2.8.6 1.5 1 2.2.5.6 1 1.1 1.7 1.5.7.4 1.5.6 2.5.6.9 0 1.7-.1 2.3-.4s1.1-.7 1.5-1.1c.4-.4.6-.9.8-1.5.1-.5.2-1 .2-1.5v-.2h-5.3v-3.2h9.4V28H59v-2.5c-.3.4-.6.8-1 1.1-.4.3-.8.6-1.3.9-.5.2-1 .4-1.6.6s-1.2.2-1.8.2c-1.5 0-2.9-.3-4-.8-1.2-.6-2.2-1.3-3-2.3-.8-1-1.4-2.1-1.8-3.4-.3-1.4-.5-2.8-.5-4.3s.2-2.9.7-4.2c.5-1.3 1.1-2.4 2-3.4.9-1 1.9-1.7 3.1-2.3 1.2-.6 2.6-.8 4.1-.8 1 0 1.9.1 2.8.3.9.2 1.7.6 2.4 1s1.4.9 1.9 1.5c.6.6 1 1.3 1.4 2l-3.7 2.1c-.2-.4-.5-.9-.8-1.2-.3-.4-.6-.7-1-1-.4-.3-.8-.5-1.3-.7-.5-.2-1.1-.2-1.7-.2-1 0-1.8.2-2.5.6-.7.4-1.3.9-1.7 1.5-.5.6-.8 1.4-1 2.2-.3.8-.4 1.9-.4 2.7zm36.4-4.3c-.4-1.3-1.1-2.4-2-3.4-.9-1-1.9-1.7-3.1-2.3-1.2-.6-2.6-.8-4.2-.8s-2.9.3-4.2.8c-1.1.6-2.2 1.4-3 2.3-.9 1-1.5 2.1-2 3.4-.4 1.3-.7 2.7-.7 4.2s.2 2.9.7 4.2c.4 1.3 1.1 2.4 2 3.4.9 1 1.9 1.7 3.1 2.3 1.2.6 2.6.8 4.2.8 1.5 0 2.9-.3 4.2-.8 1.2-.6 2.3-1.3 3.1-2.3.9-1 1.5-2.1 2-3.4.4-1.3.7-2.7.7-4.2-.1-1.5-.3-2.9-.8-4.2zM81 17.6c0 1-.1 1.9-.4 2.7-.2.8-.6 1.6-1.1 2.2-.5.6-1.1 1.1-1.7 1.4-.7.3-1.5.5-2.4.5-.9 0-1.7-.2-2.4-.5s-1.3-.8-1.7-1.4c-.5-.6-.8-1.3-1.1-2.2-.2-.8-.4-1.7-.4-2.7v-.1c0-1 .1-1.9.4-2.7.2-.8.6-1.6 1.1-2.2.5-.6 1.1-1.1 1.7-1.4.7-.3 1.5-.5 2.4-.5.9 0 1.7.2 2.4.5s1.3.8 1.7 1.4c.5.6.8 1.3 1.1 2.2.2.8.4 1.7.4 2.7v.1zM92.9 28 87 7h4.7l4 15.7h.1l4-15.7h4.7l-5.9 21h-5.7zm28.8-3.6c.6 0 1.2-.1 1.7-.3.5-.2 1-.4 1.4-.8.4-.4.7-.8.9-1.4.2-.6.3-1.2.3-2v-13h4.1v13.6c0 1.2-.2 2.2-.6 3.1s-1 1.7-1.8 2.4c-.7.7-1.6 1.2-2.7 1.5-1 .4-2.2.5-3.4.5-1.2 0-2.4-.2-3.4-.5-1-.4-1.9-.9-2.7-1.5-.8-.7-1.3-1.5-1.8-2.4-.4-.9-.6-2-.6-3.1V6.9h4.2v13c0 .8.1 1.4.3 2 .2.6.5 1 .9 1.4.4.4.8.6 1.4.8.6.2 1.1.3 1.8.3zm13-17.4h4.2v9.1l7.4-9.1h5.2l-7.2 8.4L152 28h-4.9l-5.5-9.4-2.7 3V28h-4.2V7zm-27.6 16.1c-1.5 0-2.7 1.2-2.7 2.7s1.2 2.7 2.7 2.7 2.7-1.2 2.7-2.7-1.2-2.7-2.7-2.7z"></path>
+</svg>
diff --git a/components/header/_header.scss b/components/header/_header.scss
index cb15c1c5..124c566a 100644
--- a/components/header/_header.scss
+++ b/components/header/_header.scss
@@ -14,11 +14,14 @@
     }
   }
 
-  // Height of crown is 30px.
-  // Visually adjust placement to accept larger icons with a height of 35px
-  .app-header__logotype--large {
-    margin-bottom: -10px;
-    position: relative;
-    top: -3px;
+  // Visually adjust placement of X-GOVUK logo which has a height of 35px
+  .x-govuk-header__logotype {
+    margin-bottom: -5px;
+  }
+
+  // Visually adjust placement of logotype text
+  .app-header__logotype {
+    font-weight: bold;
+    top: 0;
   }
 }
diff --git a/components/header/_royal-arms.svg b/components/header/_royal-arms.svg
deleted file mode 100644
index f93c2a7a..00000000
--- a/components/header/_royal-arms.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg class="app-header__logotype-royal-arms app-header__logotype--large" aria-hidden="true" focusable="false" height="35" width="42" viewBox="0 0 360 300" xmlns="http://www.w3.org/2000/svg">
-  <path fill="currentColor" fill-rule="evenodd" d="M235 224c11 0 23 8 37 17l2 1 1 1 1 1 1 1c14 9 28 17 39 14h2l-1 2-11 7c-4 4-9 7-14 7-4 0-9-1-15-5-6-2-11-6-16-10l-2-1-1-1-2-1-1-1c-9-5-17-10-25-11l3 3c3 3 6 5 6 10l-3 9-2 4-3 8-1 4c0 2-2 7-9 10-9 5-23 7-44 7s-35-2-44-7c-7-3-9-8-9-10l-1-4-3-8-1-3-3-10c0-5 2-7 5-10l3-3c-9 1-18 7-27 12l-1 1-2 1-1 1c-5 4-10 8-16 10-6 4-11 5-15 5-5 0-10-3-14-7l-11-7-1-2h2c10 3 23-4 36-13h1l4-3 1-1 2-1c14-9 26-17 37-17 4 0 7 1 10 3 4 2 7 5 8 9l6 10 3 7-3 6-7 4-2 1c-2 1-4 2-4 4 5 3 12 5 19 6l28 2 28-2c7-1 14-3 19-6l-4-3-2-1c-3-2-6-3-7-5l-3-6 3-7 6-10c1-4 4-7 8-10l10-2Zm-66 9 17 2v12a6 6 0 0 1 8 6c0 3-2 5-3 7l-3-3c-2 0-1 10-6 10v2a4 4 0 1 1-9-2c-5 0-4-10-6-10l-3 3c-1-2-3-4-3-7a6 6 0 0 1 8-6Zm9 33c-2 0-3 1-3 3a3 3 0 1 0 3-3Zm-1-27c-2 2-5 5-5 8s4 4 4 7l-2 1-2-2c-1-2-1-5-5-5-3 0-4 3-4 5l1 4c1-2 2-2 3-2 2 0 2 2 3 4v1c1 3 1 5 4 5 2 0 3-1 3-3l-1-3 1-1 2 1-1 3c0 2 1 3 3 3 3 0 3-2 4-5s1-5 3-5c1 0 2 0 3 2l1-4c0-2-1-5-4-5-5 0-4 7-7 7l-2-1c0-3 4-4 4-7s-3-6-6-8ZM253 9l36 35 1-8c4 2 8 6 9 10 11 0 14 7 17 5 0 1-1 3-5 4 13 3 10 12 17 13-1 1-3 2-5 1 8 12 0 19 6 25-3 0-6-2-8-5 2 9-1 15 0 18-2 1-4-1-5-5v1l-2 4v1l3 2-1 1-1 1-8 8-1 1h-1c-3 4-5 7-5 11s5 11 11 19v-3l1-3 4-2 6 3 2 5-2 4-4 1-4-1h1c4 6 8 11 9 15 4 8 8 13 13 13s9-4 9-10c0-10-6-15-12-21l-1-1h-1c-6-6-13-13-13-25 0-11 9-16 15-16 4 0 6 1 8 3h3c6 0 7 4 8 9v2c1 4 2 7 7 8-5 2-11-1-14-9 1 15 16 12 14 23v1-1c-1-7-23-7-24-22v-1c0-3 1-6 3-7l-5-2c-4 0-11 5-11 13 0 20 27 23 27 45 0 5-1 9-5 12 3 0 6-1 7-3-2 9-11 9-14 5a14 14 0 0 1-3 0c2 4 4 7 8 7-8 6-18-2-16-11l-5-9c-1-2-2-1-2 2 0 7-6 13-6 18 0 6 6 11 7 11 2 0 4-3 5-2l1 6v15l4-4c2-2 4-2 6-2l3 2a5 5 0 0 1 1 4l-4 5-5 2a5 5 0 0 1-4-3v5c0 5-2 7-4 8 0 0-1-2-3-2l-3 2c0 2 3 2 3 5s-7 8-12 7l3-11-4 7c-1 4-3 4-5 3 2-2 5-10 9-13 4-2 6-3 7-9 1-7-1-10-1-16 0-5-2-5-3-5h-2c-5 0-23-12-23-24v-3c-8-1-13 2-13 9l2 7c2 2 3 3 0 4l-29 12c-3 1-3 0-5-2-1-1-2-2-4-1s1 3 1 4c0 2-1 6-12 6l3-5v-3l-2 3-4 4h-3l9-9c2-3 5-4 10-5 6-1 26-3 26-10s-8-7-8-16 4-18 27-18c-2-5-8-9-13-11-12-3-16-11-17-19l-9-1c-7 0-11-2-12-1s-2 2-1 3l6 9 4 3-2 3 2 1 1-1h6l6 8-9-2v1l6 2v4l-10-6c-4-1-6-2-7-6-2-4-7-14-10-17v-4l2-3 4-2h9l1-1-2-3h-1v-1h-1l-7-9v-1l-3-2-3 1-1 1a65 65 0 0 0-4-4l3-3h1l3-2h3l3 1 7 6 1 1 1-1 3-1 4 1 1 5v2l5 5c1-6 4-12 8-18h1l-1-1v-1a898 898 0 0 0 4-12l1-1 7 2 8-5 2-2h2c5-4 10-7 10-12 0-2-1-5-3-6l1 5c0 2-4 7-10 7-3 0-5-3-7-3l-2 1c0 4-2 7-4 7v-4l-2 3c0 3-2 6-5 7l1-6h-2l-1 1-2-2-2-1c0-1 2-3 4-3 2-1 6-3 5-4-1-2-7 1-10 3s-3 1-3 0v-2c-2-4-1-5 1-6l14-9 2-4 6-2 1-1-31-38V8l2 1ZM102 36c2 4 2 7 1 11 4 1 6 4 10 3-3 4-6 3-9 3h-2c11 3 13 14 19 15-4 3-7 1-10-1l-1-1-6-2c15 7 15 16 19 16-4 5-8-1-14-2 12 7 13 14 12 19 3 2 2 5 2 9l8-2-2 2c-6 7-11 13-14 22l-7-7c-2-2-4-1-5-1l20 22c3 3 3 6 4 8v3c0 3 5 6 4 8v4l1 2c0 2-2 4-5 4 2-4 0-6-3-6 1 7-5 8-7 7 2-1 3-4 2-7-2 2-4 4-6 4-3 0-4-1-5-3 2 1 5-1 5-2s-3-2-3-4c0-5 5-3 5-7 0-2-1-3-2-3s-3 1-3 3c-3-2 0-7-1-11 0 4-2 5-3 6l-2 2c-2-2 0-6-2-11l-2 5-2 3c-5-3-14-2-18 2l6 3v1c8 4 14 9 14 17 0 9-13 12-13 17 0 6 14 18 21 18 2 0 3-3 5-3h5c2 1 3 2 3 4 3 0 7 5 3 9 0-2-3-6-7-3 2 3 1 7-4 8 1-2 2-5-1-5h-2l-4 1h-2c-3 0-3 0-4-2l-5-4c-1 0-2 3 0 5-7 0-8-5-9-9 0-2-1-5-3-6v8c-4-3-7-7-7-10-1-3-1-5-3-6l-2-3 3-2c2-1 5-3 5-9 0-4-1-11-8-15 1 10 1 17-4 25-5 9-14 15-20 17-5 2-12 4-12 11 0 12 6 20 11 20 4 0 3-4 8-4 3 0 5 1 6 3 3-1 6 1 6 3 0 3-1 5-3 5 1-3-3-4-4-3-2 0 0 2 0 4s-1 4-5 5c1-1 1-3-1-3s-3 4-6 4c-5 0-6-2-11-1-3 0-3 2-2 3-6 0-5-7-4-8 2-2 3-3 1-4s-5 0-6 3c-5-9 2-9 0-20-1 5-4 8-6 9 1-2-2-6-2-10 0-8 6-11 6-14 0-1-2-3 0-5 1-1 3 1 5 1 6 0 11-8 12-18 1-11 5-19 10-27l1-4c-5 6-9 15-15 20 1 7-13 15-21 9 2 0 7-1 9-5l-3-1c-5 3-13-1-13-6 2 2 5 3 7 2l-3-9c0-21 33-35 33-52 0-6-4-9-8-9l-6 3c1 1 3 3 3 5 0 19-31 17-34 30-1-9 4-12 9-14l1-1h1v-1c4-2 8-5 9-10-4 6-11 10-15 8 10 0 7-21 18-21l4 1c3-2 7-4 10-4 5 0 12 3 12 12 0 10-7 18-15 26l-1 1-1 1-1 1c-7 7-15 15-15 24 0 6 4 9 9 9 12 0 19-20 31-37 8-11 13-33 18-44l-5 8-1 1c-2 4-4 7-8 8 4-4 1-14 4-21v-8l-3 10v2c-1 5-3 9-6 10 2-3-1-8-1-13 0-9 5-10 6-19-5 2-3 14-12 14 3-3 3-6 3-9v-1c0-3 1-6 4-10-4-1-7-5-7-8l9-3c-2-2 0-4 2-6 1 1 2 3 3 2a74 74 0 0 1 26-11l1-3c2 0 5 0 5 3 2-2 5-3 8-3Zm33 132a56 56 0 0 0 12 26l4 5 3-1 6 3c2 2 2 4 2 6v1l31 11 17 2h-1a42 42 0 0 1-22 11l-19-3-17-6c-2 1-5 2-7 0-3-1-5-5-5-7v-1l-6-6a72 72 0 0 1-17-35c5 2 8 0 9-1l1 2c5 0 9-4 9-7Zm170 53 6-1c4 1 6 4 6 7 0 2-1 3-3 4l-5 1c-2 0-3-1-5-3l-1-4 2-4Zm5 1-4 1-1 2c0 2 1 4 4 4 2 1 5 0 5-2v-1c0-2-2-3-4-4Zm-127-1a4 4 0 1 0 0 7 4 4 0 0 0 0-7Zm149-1-3 3v3c2 1 4 2 7 0l2-3v-3l-2-1-4 1Zm-167-6a4 4 0 0 0 0 8 4 4 0 0 0 0-8Zm184-10a9 9 0 1 1 0 18 9 9 0 0 1 0-18Zm-195-4c-4 0-8 4-9 5h-3l1 2v1l-3 8 4 5h5l-2-1h-1v-1l-2-2 1-4h1v-2l1 1 4 1 1-1c0-1 0-3-2-4l-1-1 1-1 2-2c2-1 3-2 5 0l1 1 2 1-2-4-4-2Zm195 6a7 7 0 1 0-1 13 7 7 0 0 0 1-13Zm-51-1 4 2 2 5-2 5-4 2-4-2-2-5 2-5 4-2ZM185 54c-3 2-5 5-6 8 2 0 5-2 7-5v12c-1-3-5-4-7-5 0 7 7 8 10 8 4 0 7-1 7-3 1-3-1-3-2-3-1-1-2 1-2 3-2-2-3-9 1-9 3 0 4 3 5 7 1-3 3-7 6-6 4 1 2 8-1 9 1-1 1-4-1-4s-3 2-3 3c0 2 3 4 6 5 5 1 9-2 10-4-2-1-4-1-6 1l3-9c0 2 2 4 4 6 1-2 1-6-1-9l-1-1 9 4c-4 4-9 14-11 23l2 5c0 4-2 7-5 8a64 64 0 0 1 21 22l-2 1-2 3-1 4 1 3 4 8 1 1 2 5 2 4c1 3 3 5 5 6v4a78 78 0 0 1-18 50l-8 8h-1l-3 1h-1a69 69 0 0 1-20-4 16 16 0 0 1 3-8l2-1c5-3 10-6 13-11 4-4 7-10 10-16 2-5 3-11 3-17v-1h-41v46l10 1c-2 1-3 3-3 6l-14-5c1-2 3-2 5-2v-46h-42l-1-5c-2-3-3-4-3-8l-4-7-3-4v-1l-4-4a71 71 0 0 1 26-33c-3-1-5-4-5-8 0-2 1-4 3-5-3-8-8-18-12-23l9-4c-3 4-3 8-2 10l5-6 3 9c-3-2-5-2-7-1 1 2 5 5 10 4 3-1 6-3 6-5 0-1-1-3-3-3s-2 3-1 4c-3-1-5-8-1-9 2-1 5 3 6 6 1-4 2-7 5-7 4 0 3 7 1 9 0-2-1-4-2-3-1 0-3 0-2 3 0 2 3 3 7 3 3 0 9-1 10-8-2 1-6 3-7 5V57c2 3 5 4 7 5-1-3-3-6-6-8h15Zm113 153-2 1-2 3 1 4 3 1 2-1 1-3c0-3-1-5-3-5Zm-131-43c3 0 4 2 4 4v1h1l1 1-1 1h-1l-1 22h1v2l-2 1c1 3-2 4-4 4-1 0-2-1-2-3l2-2 1 1-2 1 2 1 1-2c0-2-2-2-3-1-13-4-20-16-19-26h-1l1-2-1 1-2-2a2 2 0 0 1 3 0l1-1 8 2c6 0 11-3 13-3Zm22 24h1l1 1v1h1l-1 1-1 2h9l4-1c0-1-9 1-9-2l2-1 6-1-3 1h7c-2-1-6 2-9 1l-1-1-1 1 4 1 5 1c0 1-2 2-5 1l-1 1 1 1v1h1l-1 1c0-1 0 0 0 0s-1 0 0 0h-1v1h-1v1h-1 1l-1-1h1l-1-1v1-1l-1 1v-1h1v-1h-1 3v-1h-4l1 2v2h-2c0 1 0 0 0 0h-1v1-1h-1 1-1c0 1 0 0 0 0v-1h-1l1-1 2 1-1-2 1-1-3 1v2l-1 1v-1l-2 1v-1h-1l-1 1v-1l-1 1v-1h-1v1h-1v-1h1v-1h-2 2l-1-1h1l1 1 2-1h1l-1-1-1-2h-1l-1-1h1l-1-1c0-1 0 0 0 0v-1l-1 1v-1h1v-1h-1 1l1 1v-2 2l1 1 2 2v-2h-1l1-1 1-1v-1h1Zm-40-17c-1 11 7 19 15 22l-15-22Zm150 15v6c2 2 5 1 6-1 2-2 2-5 0-6-2-2-4-1-6 1Zm-111 4h1l-1 1h1-1v1h1v-1h1l-1-1h-1Zm2 0v1l1-1h-1Zm-35-20h-4l14 20 1-3v-1l-11-16Zm33 19v1l1-1h-1Zm3-14h1v1h1v2l-1 1 11 1 4-1-2-1c-2 0-9 2-9-1l3-1h1l5-1-3 1h7c-2-1-6 2-9 1h-3l4 1h4l3 1-5 1v1h5v1h-1 1l-1 1v2h-1 1-1v-1l-1 1v1-1h-1l1-1h-1v-1h2v-1h-5v2h-1l-1 1h-3v-1h1l-1-1v1l1-1h2-1v-2l-1 1h-3l-1 1h-1l-2 2v-1l-1 2-1-1v-1l-1 1v-1l-1 1v-1 1-1l-1 1v-1l-1 1v1l-1-1h1-1l1-1-1-1h-1v1l1-1h1l-1-1h2v1h2l1-1v-1h-2v-1 1l-1-1-1-1h1v-1h-1c-1 0 0 0 0 0l1-1h-1v-1h1v1-1h1v3h2v-1l1-1h-1l1-1v-1h2Zm-32-6-2 1h-1l10 14 1-3v-1l-8-11Zm31 8h1l-1 1h1-1v1h1v-2h-1Zm1 0h1v1-1h-1Zm-23-11-7 2 6 10a1958 1958 0 0 0 1-7c-1 0-2 0-1-1l1-1h1l-1-3Zm22 10v1h1l-1-1Zm120-7v6c2 2 5 1 6-1 2-2 2-5 0-6-2-2-4-1-6 1Zm-125-6v3l2 1h1v-3l1-1v-1l1 1 1-1 1 1 1 1v1l-1 2h19l-3-1c-2 0-12 2-12-1 0-2 2-2 5-2a52 52 0 0 0 1 0h6l-3 1h3v-1l4 1c-2-1-6 2-10 1v-1h-2l-3 1h11c3 0 4 1 4 2l-5 1h3l1 1h1-1v1h1-1v3h-1v-1 1h-1v-1h-1v-1 1-1h2v-2l-2 1h-4v1l1 1h-2v1h-2 1-1v-1l-1 1v-1c-1-1 0 0 0 0v-1 1-1h-1 1v-1c1 0 1 2 2 1h1-1l-1-2-4 1-3 1h-1l-1 1-2 1 1-1-2 1v-1h-2l-1 1 1-1-1 1v-1l-1 1v-1l-1 1v1-1l-1-1 1-1h-2 1v-1l1 1-1-1h1l-1-1 1 1h1v1l2-1h2l-1-1h-1l-2-2v1-1s-1 0 0 0h-1c-1 0-2 0-1-1h1v-1h-1l-1-1h1v-1l-1-1 1 1 1 1v-2l1 1Zm5 2h1l-1 1h1-1v1h1v-1h1v-1h-2Zm1-1v1l1-1h-1Zm-1-1v1h1l-1-1Zm-11-54v49h41a51 51 0 0 0-13-35c-3-4-8-8-13-10-5-3-10-4-15-4Zm-2 0c-5 0-11 1-16 4-5 2-10 6-13 11-4 4-7 9-10 15l-3 18v1h42v-49Zm9 7h-1l10 4a39 39 0 0 1 9 10l3-1-2 2c4 6 7 13 8 21v-2c2 0 2 2 2 2l-1 1v2l-1-1-1 1c-1 1-2 0-2-1l2-1h-14v3l-1-2v-1h-12l2 1-2 1-1-1-2 1 1-2-1-1 1-2 1 2v-18h-3l2-1h1v-16l-1 2-1-2 1-1-1-2 2 1 1-1s2 0 1 2Zm-41 29v3l2 1h1v-1l1-1-1-1 1-1v-1l1 1c0-1 0-1 0 0l1-1 1 1h1v1l1 1h-1l-1 2h19l-3-1c-2 0-12 2-12-1 0-2 3-2 6-2h6l-3 1c2 0 5-2 7 0-3-1-6 2-10 1v-1l-5 1h11c3 0 4 1 4 2l-5 1h3l1 1v1h1-1v3h-1v-1 1h-1v-1h-1v-1 1-1h2v-1l-1-1-1 1h-4v1l1 1h-2v1h-2 1-1v-1l-1 1v-1c-1-1 0 0 0 0v-1 1-1h-1 1v-1c1 0 1 2 2 1h1-1l-1-2c-5 0-3 3-7 2h-1l-1 1-1 1v-1l-1 1v-1l-2 1-1-1h-1l-1 1 1-1-1 1v-1l-1 1v-1l-1 1v1-1h-1v-1h1v-1h-2 1v-1l1 1-1-1h1l-1-1 1 1h1v1l2-1h2v-1h-1l-2-2v1-1h-1l-1-1h1v-1h-1v-1h1l-1-1v-1 1h1v1-2l1 1Zm169 2-1 2 2 4 3 2 2-1h1l1-2-2-4-4-2-2 1Zm-128-29v2l-1-1v12l1 1v1l2 1-2 1v1l-1 1v14l2-1-1 2h9v-1h2v-2l1 2h2v1h10v-2l1 1c-1-6-3-12-6-17h-1l-1-1h-1l1-2-2-1 1-1-8-7-8-4Zm9 7v1h2v2c1 0 2 3 1 4v1l1 4 3 4 1 1h1l1-1-4-4c-2-2-2-4-1-5v1l2 4 1 1 3 3-2 2h-1l-1-1-1-1c0 3 3 4 4 3h1v1h1l-1 1h1l-1 1-1 1 1 1v1h-1v-1h-1v1l-1-1v-1h-1v-1h2v-2l-2 1-3-4-3 2 1 2v1h-5v1l-1-1h-1v-1h1l-1-1h5l-2-2 3-2h3l-2-1c-1-1-2-1-2-3l-1 1h-1l-1 1h-2v1h-1v1h-1v-2l-1 1h-1v-1h2-1v-1l1-1v1h1l1-1 2-2-3-3v-1h-1v-3h-1l1-1v-1h1v3l2 1 1 2 1 1c0-2 2-2 2-3l-2-1h-1l2-1h-2l-1-1 1-1h2l1-1Zm-45 22h1l-1 1h1-1v1h1v-1h1v-1h-2Zm1-1v1l1-1h-1Zm-1-1v1h1l-1-1Zm100-13 6 1 4 4v4l-4 3-6-1c-3-1-5-5-4-8l4-3Zm-101 0v1l1 2 1 1h1v-3l1-1v-1h3l1 1v1h1l-1 1-1 2h17l-3-1c-3 0-11 2-11-1 0-2 2-2 4-2h6-3c3 1 5-1 8 1h-11l-3 1h10c2 0 3 1 3 2l-4 1 3 1c0-1 0 0 0 0h1v5l-1-1v-1l-1 1v1-1h-1l1-1h-2l1-1h1l1-1h-6v2h-1l-1 1h-2l1 1-1-1c-1 0 0 0 0 0h-1l1-1h-1v-1l-1 1 1-1c1-1 1 1 2 1l1-1h-1v-2l-1 1h-3l-2 1h-1l-2 2v-1c-1 1-2 0-2 2v-1h-1v-1l-1 1v-1 1l-1-1v1l-1-1-1 1v1-1h-1l1-1-1-1-1 1 1-1h1v-1h-1 2v1l2-1h2v-1h-1l-1-1h-1v-1 1-1c-1 1-2 0-2-1h1v-1h-1v-1h1l-1-1v-1l1 1 1 1v-1c-1 0 0 0 0 0v-1 1Zm105 3-4-1-2 2c-1 1 1 3 3 5h4l2-1v-3c0-1-1-2-3-2Zm-67 3h-1 1Zm-33-5h1l-1 1h1-1v1h1v-2h-1Zm1 0h1v1-1h-1Zm-1-1v1h1l-1-1Zm33-3 1 1c-1 1-1 0-1-1Zm-13-14c-3 1-3 3-7 4h-1v1c0 2 8 0 8 3 0 1-1 2-4 2-1 0-1 0 0 0h2l1 1v4h-1v-1h-1v1-1s0-1 0 0l-1-1h2v-2h-2v1h-2l1 2h-3v1h-1 1-1v-1h-1l1 1-1-1 1-1h-2l1-1c1 0 1 2 2 1h1l-1-1v-1h-1l-2 1-1 1h-2l-1 1-2 1v-1h-1l-1 1v-1h-2v1l-1-1 1-1h-2l1-1 1 1-1-1v-1h1v1h4l2-1-1-1v1-1h-1l-1-1h1v-1h-1l1-1h-1v-1h1v1h1c-1 0 0 0 0 0v-1 3h1l1-1-1-1 1-1 1-1v-1 1l1-1 1 1h1v1h1l-1 1-1 2h6l4-1c0-2-8 0-8-3l1-1v-1l3-2-1 1c2 0 2-2 6-2Zm13 13v1-1Zm0 0h-1 1Zm1-2v1h-1v-1h1Zm-1 0h-1 1Zm-26-5h1-1l1 1h-1v1h1v-1h1l-1-1h-1Zm2 0v1l1-1h-1Zm-2-1v1l1-1h-1Zm111-34-2 6v1l-1 1-1 4 38 22 4-4 1-1 4-4-4-3v5l-2-3v-1l-2 4 3 1c-2 3-5 1-6 0-3-1-4-2-3-4 1-1 4-1 4 2 2-1 2-3 2-4l-4-1c3-2 5-4 4-8-3 1-5 3-6 6l-2-2c-2 0-3 1-3 3 2-1 4 1 3 3-1 1-3 1-5-1-3-1-3-4-2-6l2 4 3-5h-4c1-1 2-3 4-3h1l-6-3-1 5-1-3-3 5 4-1c-2 2-4 3-7 2-2-2-3-3-2-4 0-2 3-2 3 1 2-1 3-3 2-4l-4-1c3-2 4-5 3-8-4 1-5 4-5 7l-2-2c-2 0-3 1-3 3 2-1 4 1 3 3-1 1-2 1-5-1-1 0-4-2-3-5l3 2 2-4h-4l4-2-4-2Zm-26 21-1 3c0 2 1 4 3 4h2l1-4-1-3-2-1-2 1Zm9-14c1-2 3-2 5-2l3 2 1 4-3 4c-3 3-6 3-8 0-2-2-1-6 2-8Zm4 0-3 1-2 4v1c1 2 4 2 5 0l2-3v-2l-2-1Zm-81-11h-1c-12 0-33 1-33 9 0 2 1 4 5 6 5-4 15-8 28-8 14 0 24 4 29 8 4-2 5-4 5-6 0-8-21-9-33-9ZM87 59l-11 5c-2 0-3 1-3 2l1 3c1 1 1-2 3-3 2 0 2 2 0 4 3-1 6-2 7 1 1 2 0 3-2 5l1 5c1 2 4 5 8 4 4-2 3-6 2-8l-3-4c-2 0-4-1-4-3-1-2 2-3 4-5-3-1-4-2-2-3h4c1-1-1-2-2-2l-3-1Zm68-10 4 7c0 3-2 5-3 8-1-3-4-4-4-7s1-5 3-8Zm44 0c2 3 3 5 3 8s-3 4-4 7c-1-3-3-5-3-8l4-7ZM74 54l-13 4c5 1 5 4 8 4 4 0 6-5 5-8Zm150 1c2 0 3 1 3 3s-1 3-3 3-3-1-3-3 1-3 3-3Zm-93 0c2 0 3 1 3 3s-1 3-3 3-3-1-3-3 1-3 3-3Zm149-1c-3 0-4 2-4 4l-1 2 12-3-7-3Zm-55-6c2 0 3 1 3 3s-1 3-3 3-3-1-3-3 1-3 3-3Zm-96 0c2 0 3 1 3 3s-1 3-3 3-3-1-3-3 1-3 3-3Zm-35-3-12 5c2 3 6 5 9 3 2-2 0-4 3-8Zm78-7 3 1v13h-3V38Zm10 0v14h-3V39l3-1ZM77 24c3 2 3 3 2 6 1-1 3-1 3 2-1-1-2 0-2 1l2 2c2 0 3-2 3-5l-2 2v-5l2 2-1-3h3v11l-14 4-6 3-1 1-6 3-8-8 2-2 2 3v-3l3 4h-3c3 2 5 2 6 1v-3c-1-1-2-1-2 1-2-2-1-3 1-3-3-2-4-3-3-6 3 1 4 2 4 5 0-2 3-2 3 1-2-1-2 0-2 2h5c3-1 2-3 2-5l-3 3-2-4h4l-3-3 5-2-1 4c2 0 3-1 3-3l2 5-4-1c1 2 2 4 5 3 2-1 3-2 3-4h-3c-2-2 0-3 2-2-2-3-2-4-1-7Zm53 17c2 0 3 1 3 3s-1 3-3 3-3-1-3-3 1-3 3-3Zm94 0c2 0 3 1 3 3s-1 3-3 3-3-1-3-3 1-3 3-3Zm-91-7c2 0 3 1 3 3s-1 3-3 3-3-1-3-3 1-3 3-3Zm88 0c2 0 3 1 3 3s-1 3-3 3-3-1-3-3 1-3 3-3Zm-35-1c2 0 3 1 3 3s-1 3-3 3-3-1-3-3 1-3 3-3Zm-17 0c2 0 3 1 3 3s-1 3-3 3-3-1-3-3 1-3 3-3ZM52 34l2 2-2 2-2-2 2-2Zm141-4c2 0 3 1 3 3s-1 3-3 3-3-1-3-3 1-3 3-3Zm-31 0c2 0 3 1 3 3s-1 3-3 3-3-1-3-3 1-3 3-3Zm24-2c-1 4-5 7-9 7s-8-3-9-7h18Zm-47 1c2 0 3 1 3 3s-1 3-3 3-3-1-3-3 1-3 3-3Zm76 0c2 0 3 1 3 3s-1 3-3 3-3-1-3-3 1-3 3-3Zm-61-1c2 0 3 1 3 3s-1 3-3 3-3-1-3-3 1-3 3-3Zm46 0c2 0 3 1 3 3s-1 3-3 3-3-1-3-3 1-3 3-3Zm8-1c2 0 3 1 3 3s-1 3-3 3-3-1-3-3 1-3 3-3Zm-61 0c2 0 3 1 3 3s-1 3-3 3-3-1-3-3 1-3 3-3Zm-96 1 2 2-2 2-2-2 2-2Zm3-4 2 2-2 2-2-2 2-2Zm6-1 2 2-2 2-2-2 2-2Zm5-9v4l3-2 1 3h-4l4 3 1 2c0 2-1 3-3 3-1 0-3-1-3-3v-4l-2 2-2-3 3-1-2-3 4-1Zm114 3c4 1 7 4 7 8h-7Zm-4 0v8h-7c1-4 4-7 7-8Zm-87 4v3h-3v-3h3Zm-14-2v3h-3v-3h3Zm7-3h3v3h-3v-3Zm-3-1v3h-3v-3h3ZM182 0l-4 7c3 0 5-2 7-4v10c-2-2-4-4-7-4 0 2 2 4 4 6h-10c2-2 4-4 4-6-3 0-5 2-7 4V3c2 2 4 4 7 4l-4-7Z"/>
-</svg>
diff --git a/components/header/_x-govuk.svg b/components/header/_x-govuk.svg
index b2ad9a58..3bc06411 100644
--- a/components/header/_x-govuk.svg
+++ b/components/header/_x-govuk.svg
@@ -1,3 +1,4 @@
-<svg class="app-header__logotype--large" aria-hidden="true" focusable="false" height="35" width="35" viewBox="0 0 300 300" xmlns="http://www.w3.org/2000/svg">
-  <path fill="currentColor" d="M180 251v1c-17 7-26 12-26 16s19 6 19-5c4 18-11 21-20 13 4 7 6 18-4 23-11-5-9-16-5-23-10 8-24 4-20-12v-1c0 11 18 9 19 5 0-4-9-9-26-16v-1c11 3 21 4 32 4 10 0 20-1 31-4Zm61-52 1 1c-6 18-8 29-5 34 6-6 11-14 11-24l19 9c-11 5-20 10-27 17 5 2 15-1 21-4l-32 32c3-6 6-16 4-21-7 6-12 16-16 27l-10-19c11 0 18-5 24-11-5-3-16-2-34 5v-1c10-6 18-12 25-19 8-8 14-15 19-26Zm-186 0c6 10 12 18 20 25 7 8 15 14 25 20h-1c-17-6-29-7-33-4 6 5 13 11 24 11l-10 19c-4-12-10-21-16-28-2 5 1 16 3 21l-31-31c5 2 16 5 21 3-7-6-16-12-28-16l19-10c0 11 6 18 11 24 3-5 2-16-4-33Zm152-5a15 15 0 0 1 10 25 15 15 0 0 1-25-10 15 15 0 0 1 15-15Zm-115 0a15 15 0 0 1 11 25 15 15 0 0 1-25-10 15 15 0 0 1 14-15Zm88-27a15 15 0 0 1 10 25 15 15 0 0 1-25-10 15 15 0 0 1 15-15Zm-63 0a15 15 0 0 1 10 25 15 15 0 0 1-25-10 15 15 0 0 1 15-15Zm133-48c7 17 12 26 16 26s6-19-5-19c18-4 21 11 13 20 7-4 18-6 23 5-5 10-16 8-23 4 8 9 5 24-13 20 11 0 9-19 5-19s-9 9-16 26h-1c3-11 4-21 4-31 0-11-1-21-4-32h1Zm-202 0c-3 11-4 21-4 32 0 10 1 20 4 31h-1c-7-17-12-26-15-26-5 0-7 19 4 19-18 4-21-11-13-20-7 4-18 6-23-4 5-11 16-9 23-5-8-9-5-24 13-20-11 0-9 19-4 19 3 0 8-9 15-26Zm101 11a20 20 0 1 1-1 41 20 20 0 0 1 1-41Zm-32-26a15 15 0 0 1 10 25 15 15 0 0 1-25-10 15 15 0 0 1 15-15Zm63 0a15 15 0 0 1 10 25 15 15 0 0 1-25-10 15 15 0 0 1 15-15ZM92 80a15 15 0 0 1 11 25 15 15 0 0 1-25-11 15 15 0 0 1 14-14Zm115 0a15 15 0 0 1 10 25 15 15 0 0 1-25-11 15 15 0 0 1 15-14ZM80 32l9 19c-10 0-18 5-24 11 5 3 16 1 34-5l1 1c-11 5-18 11-26 19-7 7-13 15-19 25h-1c7-18 8-29 5-34-6 6-11 13-11 24L29 82c11-4 21-9 27-16-5-2-15 1-21 4l32-32c-3 6-6 16-4 21 7-7 12-16 17-27Zm137-1c4 12 10 21 16 28 2-5-1-16-3-21l31 31c-5-2-16-5-21-3 7 6 16 12 28 16l-19 10c0-11-6-18-11-24-3 4-2 16 4 33v1c-6-10-12-18-20-25-7-8-15-14-25-20h1c17 6 28 7 33 4-6-5-13-11-24-11l10-19ZM149 2c10 5 8 16 4 23 9-8 24-5 20 13 0-11-19-9-19-4 0 3 9 8 26 15v1c-11-3-21-4-31-4-11 0-21 1-32 4v-1c17-7 26-12 26-15 0-5-19-7-19 4-4-17 10-21 20-13-4-7-6-18 5-23Z"/>
+<svg class="govuk-header__logotype x-govuk-header__logotype" xmlns="http://www.w3.org/2000/svg" focusable="false" role="img" width="172" height="35" viewBox="0 0 172 35" aria-label="X-GOVUK">
+  <title>X-GOVUK</title>
+  <path d="M21 29v.2c-2 .8-3 1.4-3 1.8 0 .5 2.2.7 2.2-.6.4 2.1-1.3 2.5-2.3 1.6.4.8.7 2-.5 2.6-1.3-.5-1-1.8-.6-2.6-1.2.9-2.8.4-2.3-1.4v-.2c0 1.3 2 1.1 2.2.6 0-.4-1-1-3-1.8V29c1.2.3 2.4.4 3.7.4 1.2 0 2.3-.1 3.6-.4Zm7.1-6 .1.1c-.7 2.1-.9 3.4-.6 4a4 4 0 0 0 1.3-2.8l2.3 1a11 11 0 0 0-3.2 2c.6.2 1.8-.1 2.4-.5l-3.7 3.8c.4-.7.7-1.9.5-2.5-.8.7-1.4 1.9-1.9 3.2L24.1 29c1.3 0 2.1-.5 2.8-1.2-.5-.4-1.8-.3-4 .6v-.2a12.3 12.3 0 0 0 5.2-5.2ZM6.4 23a16.3 16.3 0 0 0 5.3 5.2h-.1c-2-.7-3.4-.8-3.9-.4.7.6 1.5 1.3 2.8 1.3l-1.2 2.2A9.6 9.6 0 0 0 7.5 28c-.3.6 0 1.9.3 2.4l-3.6-3.6c.6.3 1.9.6 2.5.4a9.6 9.6 0 0 0-3.3-1.9l2.2-1.2c0 1.3.7 2.1 1.3 2.8.3-.5.2-1.8-.5-3.8V23Zm17.8-.6a1.7 1.7 0 0 1 1.1 3 1.8 1.8 0 0 1-2.9-1.3c0-1 .8-1.7 1.8-1.7Zm-13.5 0a1.8 1.8 0 0 1 1.3 3A1.8 1.8 0 0 1 9.1 24c0-.9.7-1.6 1.6-1.7ZM21 19.3a1.7 1.7 0 0 1 1.2 2.9 1.8 1.8 0 0 1-3-1.2c0-1 .8-1.8 1.8-1.8Zm-7.3 0a1.7 1.7 0 0 1 1.1 2.9A1.8 1.8 0 0 1 12 21c0-1 .8-1.8 1.8-1.8Zm15.5-5.7c.8 2 1.4 3 1.8 3 .5 0 .7-2.1-.6-2.1 2.1-.5 2.5 1.3 1.6 2.3.8-.5 2-.7 2.6.6-.5 1.2-1.8 1-2.6.5.9 1 .5 2.8-1.6 2.3 1.3 0 1.1-2.2.6-2.2-.4 0-1 1-1.8 3H29c.3-1.3.4-2.4.4-3.6a15 15 0 0 0-.4-3.7Zm-23.6 0c-.3 1.3-.5 2.5-.5 3.8 0 1.2.2 2.3.5 3.6h-.1c-.8-2-1.4-3-1.8-3-.6 0-.8 2.2.5 2.2-2.1.4-2.5-1.3-1.5-2.3-.8.4-2.1.7-2.7-.5.6-1.3 1.9-1 2.7-.6-1-1-.6-2.8 1.5-2.3-1.3 0-1 2.2-.5 2.2.4 0 1-1 1.8-3h.1ZM17.4 15a2.4 2.4 0 1 1-.1 4.8 2.4 2.4 0 0 1 0-4.8Zm-3.7-3a1.7 1.7 0 0 1 1.1 3 1.8 1.8 0 0 1-2.9-1.3c0-1 .8-1.7 1.8-1.7Zm7.3 0a1.7 1.7 0 0 1 1.2 3 1.8 1.8 0 0 1-3-1.3c0-1 .8-1.7 1.8-1.7ZM10.7 9.1a1.7 1.7 0 0 1 1.3 3 1.8 1.8 0 0 1-2.9-1.4c0-.8.8-1.5 1.6-1.6Zm13.4 0a1.8 1.8 0 0 1 1.2 3 1.8 1.8 0 0 1-2.9-1.4c0-.9.8-1.6 1.8-1.6ZM9.3 3.5l1 2.2A4 4 0 0 0 7.7 7c.6.3 1.8.1 4-.6v.1a9.7 9.7 0 0 0-3 2.3c-.8.8-1.5 1.7-2.2 2.9h-.1c.8-2.1 1-3.4.6-4-.7.7-1.3 1.5-1.3 2.8L3.4 9.3c1.3-.4 2.4-1 3.1-1.8-.5-.3-1.7 0-2.4.4l3.7-3.7c-.3.7-.7 1.9-.5 2.5.9-.9 1.5-2 2-3.2Zm16-.1a9.6 9.6 0 0 0 1.9 3.3c.2-.6-.1-2-.4-2.5l3.6 3.6c-.5-.2-1.8-.6-2.4-.3.8.7 1.9 1.4 3.3 1.8L29 10.5a4 4 0 0 0-1.2-2.8c-.4.5-.3 1.9.4 3.9-.7-1.1-1.4-2-2.3-2.8-.8-1-1.8-1.7-3-2.4h.2c2 .7 3.3.8 3.8.5a4 4 0 0 0-2.8-1.3l1.2-2.2Zm-8-3.4c1.3.6 1 1.9.6 2.7 1-1 2.8-.6 2.3 1.5 0-1.3-2.2-1-2.2-.5 0 .4 1 1 3 1.8v.1a13.7 13.7 0 0 0-7.3 0v-.1c2-.8 3-1.4 3-1.8 0-.6-2.2-.8-2.2.5-.5-2 1.1-2.5 2.3-1.5-.5-.8-.7-2.1.6-2.7ZM45 8l4.5 7.5L54 8h5l-6.8 10.5L59 29h-5l-4.5-7.5L45 29h-5l6.5-10.5L40 8h5Zm16.5 8a2.5 2.5 0 1 1 0 5 2.5 2.5 0 0 1 0-5Zm16 13.5c5.7 0 9.5-3.5 9.5-9v-2.8h-9V21h4.5c0 3-2.1 4.8-5 4.8-3.5 0-5.5-2.7-5.5-7.3s2-7.3 5.5-7.3c2.5 0 4.2 1.2 4.8 3.3h4.5c-.8-4.5-4.3-7-9.3-7-6 0-10 4.3-10 11s3.8 11 10 11Zm22.5 0c6.1 0 10-4.2 10-11s-3.9-11-10-11-10 4.2-10 11 3.8 11 10 11Zm0-3.8c-3.5 0-5.5-2.8-5.5-7.2s2-7.3 5.5-7.3 5.5 2.8 5.5 7.3-2 7.3-5.5 7.3Zm53.5 3.3h4.5v-6.5l2-2.3 6 8.8h5.5l-8.3-11.8L171 8h-5l-8 9.5V8h-4.5v21Zm-12 .3c5.6 0 8.8-3 8.8-7.8V8h-4.6v13c0 2.8-1.4 4.5-4.2 4.5-2.8 0-4.3-1.8-4.3-4.5V8h-4.4v13.5c0 4.8 3.1 7.8 8.7 7.8Zm-23.8-.3h5.5L130 8h-4.8l-4.7 16.5L115.7 8H111l6.8 21Z"/>
 </svg>
diff --git a/components/header/template.njk b/components/header/template.njk
index 2a755ae1..ab605d2b 100644
--- a/components/header/template.njk
+++ b/components/header/template.njk
@@ -3,20 +3,15 @@
   <div class="govuk-header__container govuk-width-container app-header__container">
     <div class="govuk-header__logo app-header__logo">
       <a href="{{ params.homepageUrl | default("/") | url }}" class="govuk-header__link govuk-header__link--homepage">
-        <span class="govuk-header__logotype">
-          {% if params.organisationLogo == "crown" %}
-            {% include "./_crown.svg" %}
-          {% elif params.organisationLogo == "royal-arms" %}
-            {% include "./_royal-arms.svg" %}
-          {% elif params.organisationLogo == "x-govuk" %}
-            {% include "./_x-govuk.svg" %}
-          {% elif params.organisationLogo %}
-            {{ params.organisationLogo | safe }}
-          {% endif %}
-          <span class="govuk-header__logotype-text">
-            {{ params.organisationName | default("GOV.UK") }}
-          </span>
-        </span>
+        {% if params.logotype == "x-govuk" %}
+          {% include "./_x-govuk.svg" %}
+        {% elif params.logotype.html %}
+          {{ params.logotype.html }}
+        {% elif params.logotype.text %}
+          <span class="app-header__logotype">{{ params.logotype.text }}</span>
+        {% else %}
+          {% include "./_govuk.svg" %}
+        {% endif %}
         {% if params.productName %}
         <span class="govuk-header__product-name">
           {{ params.productName }}
diff --git a/docs/options.md b/docs/options.md
index 99873167..e8e3101d 100644
--- a/docs/options.md
+++ b/docs/options.md
@@ -49,13 +49,14 @@ module.exports = function(eleventyConfig) {
 
 In addition to the [options available for the header component](https://design-system.service.gov.uk/components/header/), the following options can also be set:
 
-| Name                 | Type   | Description                                                                                                                                                               |
-| :------------------- | :----- | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| **homepageUrl**      | string | URL organisation name is linked to. Default is `'/'`                                                                                                                      |
-| **organisationLogo** | string | Logo that appears before the organisation name. If set to `crown` the GOV.UK logo is shown. If set to `royal-arms`, the Royal Coat of Arms is shown. Default is `'crown'` |
-| **organisationName** | string | Organisation name. Default is `'GOV.UK'`                                                                                                                                  |
-| **productName**      | string | Product name that appears after the organisation name. Default is `false`.                                                                                                |
-| **search**           | object | See [header.search](#options-for-header.search).                                                                                                                          |
+| Name              | Type   | Description                                                                                                                                                            |
+| :---------------- | :----- | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| **homepageUrl**   | string | URL organisation name is linked to. Default is `'/'`                                                                                                                   |
+| **logotype**      | object | Logo that appears in the header. If no value is provided, the GOV.UK logo is shown.                                                                                    |
+| **logotype.text** | string | Text to show instead of the GOV.UK logo. This text will appear bold. If `html` is set, this is not required. If `html` is provided, the `text` option will be ignored. |
+| **logotype.html** | string | If `text` is set, this is not required. If `html` is provided, the `text` option will be ignored.                                                                      |
+| **productName**   | string | Product name that appears after the organisation name. Default is `false`.                                                                                             |
+| **search**        | object | See [header.search](#options-for-header.search).                                                                                                                       |
 
 ### Options for header.search
 
diff --git a/eleventy.config.js b/eleventy.config.js
index 4010965b..6272826a 100644
--- a/eleventy.config.js
+++ b/eleventy.config.js
@@ -20,8 +20,7 @@ module.exports = function (eleventyConfig) {
       ? 'https://x-govuk.github.io/govuk-eleventy-plugin/'
       : '/',
     header: {
-      organisationLogo: 'x-govuk',
-      organisationName: 'X-GOVUK',
+      logotype: 'x-govuk',
       productName: 'Eleventy Plugin',
       search: {
         indexPath: '/search.json',
diff --git a/index.js b/index.js
index f77c91dc..65bb41b6 100644
--- a/index.js
+++ b/index.js
@@ -35,7 +35,7 @@ module.exports = function (eleventyConfig, pluginOptions = {}) {
 
   // Passthrough
   eleventyConfig.addPassthroughCopy({
-    'node_modules/govuk-frontend/govuk/assets': 'assets'
+    'node_modules/govuk-frontend/dist/govuk/assets': 'assets'
   })
 
   // Plugins
diff --git a/layouts/base.njk b/layouts/base.njk
index 3f10d683..7d744e7f 100644
--- a/layouts/base.njk
+++ b/layouts/base.njk
@@ -70,7 +70,7 @@
 {% endblock %}
 
 {% block bodyEnd %}
-  <script src="{{ '/assets/govuk.js' | url }}"></script>
+  <script src="{{ '/assets/govuk.js' | url }}" type="module"></script>
   <script>document.documentElement.classList.remove('no-js')</script>
   {% block scripts %}{% endblock %}
 {% endblock %}
diff --git a/lib/govuk.scss b/lib/govuk.scss
index 713c8db8..07f1b5e6 100644
--- a/lib/govuk.scss
+++ b/lib/govuk.scss
@@ -1,9 +1,8 @@
 // GOV.UK Frontend options
-$govuk-new-link-styles: true;
 $govuk-global-styles: true;
 
 // GOV.UK Frontend
-@import "node_modules/govuk-frontend/govuk/all";
+@import "node_modules/govuk-frontend/dist/govuk/all";
 
 // GOV.UK Prototype components
 @import "node_modules/@x-govuk/govuk-prototype-components/x-govuk/all";
diff --git a/lib/nunjucks.js b/lib/nunjucks.js
index 00860507..019dde23 100644
--- a/lib/nunjucks.js
+++ b/lib/nunjucks.js
@@ -25,7 +25,7 @@ module.exports = (eleventyConfig) => {
 
   const searchPaths = [
     './node_modules/@x-govuk/govuk-eleventy-plugin',
-    resolveNpmModule('govuk-frontend'),
+    './node_modules/govuk-frontend/dist',
     resolveNpmModule('@x-govuk/govuk-prototype-components'),
     ...(includes ? [path.join(input, includes)] : []),
     ...(layouts ? [path.join(input, layouts)] : []),
diff --git a/package-lock.json b/package-lock.json
index 319c3355..ba1fe8c1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,9 +14,9 @@
         "@11ty/eleventy-plugin-rss": "^1.1.2",
         "@rollup/plugin-commonjs": "^25.0.0",
         "@rollup/plugin-node-resolve": "^15.0.0",
-        "@x-govuk/govuk-prototype-components": "^2.0.2",
+        "@x-govuk/govuk-prototype-components": "^2.2.0",
         "deepmerge": "^4.2.2",
-        "govuk-frontend": "^4.3.0",
+        "govuk-frontend": "^5.0.0",
         "luxon": "^3.0.1",
         "markdown-it-abbr": "^2.0.0",
         "markdown-it-anchor": "^8.4.1",
@@ -5627,9 +5627,9 @@
       }
     },
     "node_modules/govuk-frontend": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-4.7.0.tgz",
-      "integrity": "sha512-0OsdCusF5qvLWwKziU8zqxiC0nq6WP0ZQuw51ymZ/1V0tO71oIKMlSLN2S9bm8RcEGSoidPt2A34gKxePrLjvg==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-5.0.0.tgz",
+      "integrity": "sha512-3WSfvQ+3kw/q/m8jrq/t8XnMUA8D2r0uhGyZaDbIh1gWTJBQzJBHbHiKYI9nc9ixIXdCFsc9RozkgEm57a795g==",
       "engines": {
         "node": ">= 4.2.0"
       }
@@ -5674,6 +5674,15 @@
         "node": "^16.x || ^18.x || >= 20.x"
       }
     },
+    "node_modules/govuk-prototype-kit/node_modules/govuk-frontend": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-4.7.0.tgz",
+      "integrity": "sha512-0OsdCusF5qvLWwKziU8zqxiC0nq6WP0ZQuw51ymZ/1V0tO71oIKMlSLN2S9bm8RcEGSoidPt2A34gKxePrLjvg==",
+      "optional": true,
+      "engines": {
+        "node": ">= 4.2.0"
+      }
+    },
     "node_modules/graceful-fs": {
       "version": "4.2.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
diff --git a/package.json b/package.json
index 951fadd5..a9e7b43e 100644
--- a/package.json
+++ b/package.json
@@ -48,9 +48,9 @@
     "@11ty/eleventy-plugin-rss": "^1.1.2",
     "@rollup/plugin-commonjs": "^25.0.0",
     "@rollup/plugin-node-resolve": "^15.0.0",
-    "@x-govuk/govuk-prototype-components": "^2.0.2",
+    "@x-govuk/govuk-prototype-components": "^2.2.0",
     "deepmerge": "^4.2.2",
-    "govuk-frontend": "^4.3.0",
+    "govuk-frontend": "^5.0.0",
     "luxon": "^3.0.1",
     "markdown-it-abbr": "^2.0.0",
     "markdown-it-anchor": "^8.4.1",