diff --git a/documentation/asciidoc/computers/raspberry-pi/eeprom-bootloader.adoc b/documentation/asciidoc/computers/raspberry-pi/eeprom-bootloader.adoc
index dfb6d16fd..41725174a 100644
--- a/documentation/asciidoc/computers/raspberry-pi/eeprom-bootloader.adoc
+++ b/documentation/asciidoc/computers/raspberry-pi/eeprom-bootloader.adoc
@@ -187,6 +187,20 @@ The number of times that SD boot will be retried after failure before moving to
 
 Default: `0`
 
+[[SD_OVERCURRENT_CHECK]]
+==== `SD_OVERCURRENT_CHECK`
+
+Raspberry Pi 4, Raspberry Pi 5 and Raspberry Pi 500 only.
+
+Before booting, the bootloader checks the SD power switch overcurrent signal. The overcurrent signal occurs if the SD card is damaged and has a short circuit which will cause it to get hot.
+
+If an over-current condition is detected, the bootloader switches off power to the SD card and waits five seconds before probing the SD card again. This error is displayed on the diagnostic screen, the UART and the activity LED (1 long, 2 short flashes).
+
+The overcurrent check can be switched from an error to a non-blocking warning by setting `SD_OVERCURRENT_CHECK=0` in the bootloader config.
+
+Default: `1`
+
+
 [[SD_QUIRKS]]
 ==== `SD_QUIRKS`
 
diff --git a/documentation/asciidoc/services/connect/troubleshooting.adoc b/documentation/asciidoc/services/connect/troubleshooting.adoc
index 4616fbdd6..ae145ff8c 100644
--- a/documentation/asciidoc/services/connect/troubleshooting.adoc
+++ b/documentation/asciidoc/services/connect/troubleshooting.adoc
@@ -79,7 +79,7 @@ If you have repeated issues trying to run Connect's required services, run the f
 [source,console]
 ----
 $ systemctl --user status rpi-connect-wayvnc.service rpi-connect-wayvnc-watcher.path
-$ journalctl --user --follow --unit rpi-connect-wayvnc.service --unit rpi-connect-wayvnc-watcher.path
+$ journalctl --follow --user-unit rpi-connect-wayvnc.service --user-unit rpi-connect-wayvnc-watcher.path
 ----
 
 If the service fails to start or doesn't exist, ensure that your environment meets the following criteria:
@@ -223,5 +223,5 @@ To view logs for the Connect service and its dedicated WayVNC server, run the fo
 
 [source,console]
 ----
-$ journalctl --user --follow --unit rpi-connect --unit rpi-connect-wayvnc
+$ journalctl --follow --user-unit rpi-connect --user-unit rpi-connect-wayvnc
 ----
diff --git a/documentation/images/placeholder/placeholder_circle-SMALL.png b/documentation/images/placeholder/placeholder_circle-SMALL.png
new file mode 100644
index 000000000..d87e8121a
Binary files /dev/null and b/documentation/images/placeholder/placeholder_circle-SMALL.png differ
diff --git a/documentation/images/placeholder/placeholder_circle.png b/documentation/images/placeholder/placeholder_circle.png
index d87e8121a..258267657 100644
Binary files a/documentation/images/placeholder/placeholder_circle.png and b/documentation/images/placeholder/placeholder_circle.png differ
diff --git a/documentation/images/placeholder/placeholder_square-SMALL.png b/documentation/images/placeholder/placeholder_square-SMALL.png
new file mode 100644
index 000000000..b51bc8fb1
Binary files /dev/null and b/documentation/images/placeholder/placeholder_square-SMALL.png differ
diff --git a/documentation/images/placeholder/placeholder_square.png b/documentation/images/placeholder/placeholder_square.png
index b51bc8fb1..8583725b8 100644
Binary files a/documentation/images/placeholder/placeholder_square.png and b/documentation/images/placeholder/placeholder_square.png differ
diff --git a/documentation/images/placeholder/placeholder_triangle-SMALL.png b/documentation/images/placeholder/placeholder_triangle-SMALL.png
new file mode 100644
index 000000000..0ee52120c
Binary files /dev/null and b/documentation/images/placeholder/placeholder_triangle-SMALL.png differ
diff --git a/documentation/images/placeholder/placeholder_triangle.png b/documentation/images/placeholder/placeholder_triangle.png
index 0ee52120c..17d54ff2d 100644
Binary files a/documentation/images/placeholder/placeholder_triangle.png and b/documentation/images/placeholder/placeholder_triangle.png differ
diff --git a/documentation/index.json b/documentation/index.json
index f85750364..f81870af5 100644
--- a/documentation/index.json
+++ b/documentation/index.json
@@ -227,7 +227,7 @@
                     "description": "Supports Arm Serial Wire Debug (SWD), and acts as a UART bridge",
                     "image": "full-sized/Debug-Probe.png",
                     "subpath": "debug-probe.adoc"
-                },			
+                },
                 {
                     "title": "MicroPython",
                     "description": "Getting started with MicroPython",
diff --git a/jekyll-assets/_includes/header.html b/jekyll-assets/_includes/header.html
index 0a29fad7c..c40eb276d 100644
--- a/jekyll-assets/_includes/header.html
+++ b/jekyll-assets/_includes/header.html
@@ -71,6 +71,12 @@
 #__rptl-header .__rptl-header-logo .__rptl-header-logo-text {
   fill: var(--rptl-header-logo-text-fill, #000);
 }
+#__rptl-header .__rptl-header-logo .__rptl-header-logo-leaf {
+  fill: var(--rptl-header-logo-leaf-fill, #46af4b);
+}
+#__rptl-header .__rptl-header-logo .__rptl-header-logo-berry {
+  fill: var(--rptl-header-logo-berry-fill, #cd2355);
+}
 #__rptl-header .__rptl-header-burger {
   margin: 0;
   padding: 0;
@@ -382,7 +388,7 @@
   <div class="__rptl-header-navbar">
     <div class="__rptl-header-wrapper">
       <a href="https://www.raspberrypi.com/" class="__rptl-header-brand">
-        <svg class="__rptl-header-logo" aria-hidden="true" focusable="false" height="44" viewBox="0 0 606 128" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-labelledby="__rptl-header-logo"><title id="__rptl-header-logo">Raspberry Pi</title><defs><path d="M99.9 73.5c-.6-5.9-3.2-11.2-7-13.9-.7-2.4-1.8-4.5-3.2-6.3-.2-2.8-1.4-8.2-6.9-13 .6-.5 1.2-1.2 1.6-1.9 4.6-2 7.8-6.3 8.2-9.5 2.4-2.4 3.8-5.3 4-8.2.1-1.4-.2-2.6-.7-3.7 2-2.2 2.7-4.8 1.8-7.2-1.4-4-6.2-6.5-12.6-6.8-1.7-1.6-4.1-2.4-7-2.4-1.2 0-2.5.2-3.8.5-1-.5-2.3-.8-3.7-.8-2.4 0-5.1.7-7.1 1.9-.4-.2-.6-.2-.9-.2-3.2 0-6.4 2.2-8 3.5-1.6 1.3-3.1 2.8-4.2 4.4-1.2-1.6-2.6-3.1-4.2-4.4-1.6-1.3-4.8-3.5-8-3.5-.3 0-.6 0-.9.1C35.3.9 32.6.2 30.2.2c-1.4 0-2.7.3-3.7.8-1.3-.3-2.6-.5-3.8-.5-2.9 0-5.3.8-7 2.4-6.4.3-11.2 2.8-12.6 6.8-.9 2.5-.2 5.1 1.8 7.2-.5 1.1-.8 2.3-.7 3.7.1 2.9 1.5 5.8 4 8.2.4 3.2 3.6 7.5 8.2 9.5.4.8 1 1.4 1.6 1.9-5.5 4.8-6.7 10.2-6.9 13-1.5 1.8-2.6 3.9-3.2 6.3-3.8 2.8-6.4 8-7 13.9-.6 5.9 1 11.4 4.3 14.8.4 2.6 2 6.1 3.6 8.2.3 4.5 2.2 8.8 5.4 12.4 3.2 3.6 7.4 6.1 11.9 7 2.7 2.5 5.6 4.3 9.5 5.9 1.7 1.7 6.6 5.8 14.9 5.8s13.2-4.1 14.9-5.8c3.9-1.6 6.8-3.3 9.5-5.9 4.5-.9 8.7-3.4 11.9-7 3.2-3.6 5.1-8 5.4-12.4 1.6-2.1 3.1-5.6 3.6-8.2 3-3.4 4.7-8.9 4.1-14.7Zm-22.2-18c-3.9-2.1-7.6-5.2-10.3-8.7-3.7-4.4-1.3-6.4 4.5-5.3 4.3 1.1 8.5 4.5 10.2 8.6 2.2 5.6.6 8.2-4.4 5.4ZM62.4 8.6c.3-.1.7.2.6.5-.2 1.5.8 1.3 1 1.1 2.4-3 4.9-3.6 7.2-3.4.4 0 .6.5.3.8-.9 1.3.1 1.6.4 1.3 3.7-2.3 7.2-2.3 8.5-1.3.3.2.3.6 0 .8-1.4 1.2-.6 1.7-.1 1.6 3.7-1.3 8.9-.2 10.7 1.4.2.2.2.6 0 .8-2.3 2-3.4 3.6-3.9 6.8-.1.9 1.4.7 2 .5.3-.1.6.2.6.5.1 2.1-2 4.5-5 6.5-.4.3-.3.9.6.9.4 0 .6.4.4.8-1.1 2-2.5 3.9-7.5 5.2-.5.1-.5.8-.1 1 .4.2.4.6.2.9-5 4.3-17.6 2.6-19.2-4.6 0-.1 0-.3.1-.4 3-4 9.9-11.8 20.9-15.9.4-.2.3-.8-.2-.8-10.5 1.5-18 7.4-22.6 13.6-.2.2-.4.3-.7.1-8-4.2-1.4-16.5 5.8-18.7Zm-12 31.9c1.6 0 5.6.1 9.8 3.4 7 5.8-1 10-9.8 10s-16.8-4.1-9.8-10c4.2-3.3 8.2-3.4 9.8-3.4ZM14.9 28.2c-.2-.3 0-.7.4-.8.9 0 1-.7.6-.9-3-2-5.1-4.4-5-6.5 0-.3.3-.6.6-.5.6.2 2.1.3 2-.5-.5-3.2-1.6-4.8-3.9-6.8-.2-.2-.2-.6 0-.8 1.8-1.5 7-2.7 10.7-1.4.5.2 1.2-.4-.1-1.6-.2-.2-.2-.6 0-.8 1.3-1 4.9-1 8.5 1.3.4.2 1.3 0 .4-1.3-.2-.3-.1-.8.3-.8 2.3-.2 4.8.5 7.2 3.4.2.3 1.1.5 1-1.1 0-.4.3-.6.6-.5 7.2 2.2 13.8 14.5 5.7 18.7-.2.1-.5.1-.7-.1-4.4-6.2-11.8-12.1-22.5-13.7-.5-.1-.6.6-.2.8 11 4.1 17.9 11.9 20.9 15.9.1.1.1.3.1.4-1.6 7.2-14.2 8.9-19.2 4.6-.3-.2-.3-.7.2-.9.4-.2.4-.8-.1-1-5-1.3-6.4-3.1-7.5-5.1Zm3.6 21.9c1.8-4.1 5.9-7.5 10.2-8.6 5.8-1.1 8.2.9 4.5 5.3-2.8 3.4-6.4 6.5-10.3 8.7-4.8 2.8-6.4.2-4.4-5.4ZM8.4 80.8c-1.6-4.2-1.2-9.4 1.2-13.4 2.6-4.4 5.2-4.2 6.2-.5 1.3 4.9.8 10.8-1.4 15.5-1.9 3.8-4.3 2.5-6-1.6Zm18.7 28.6c-6.2-1.3-11.5-7.6-11.8-14 1-22.6 33.7 17.9 11.8 14Zm.7-28.3c-5.5-3.2-6.9-10.9-3.2-17.3s11.1-9 16.6-5.9c5.5 3.2 6.9 10.9 3.2 17.3-3.7 6.5-11.2 9.1-16.6 5.9Zm31.7 37c-2.6 1.9-5.7 3-9.1 3-3.4 0-6.6-1.1-9.1-3-5.4-3.8 0-8.1 9.1-8.1s14.5 4.3 9.1 8.1Zm-9.1-13.8c-7 0-12.7-4.9-12.7-10.9s5.7-10.9 12.7-10.9c7 0 12.7 4.9 12.7 10.9s-5.7 10.9-12.7 10.9Zm6-29c-3.7-6.4-2.2-14.2 3.2-17.3 5.5-3.2 12.9-.5 16.6 5.9 3.7 6.4 2.2 14.2-3.2 17.3-5.5 3.1-12.9.5-16.6-5.9Zm17.2 34.1c-21.9 3.9 10.8-36.7 11.8-14-.2 6.4-5.5 12.7-11.8 14Zm18.8-28.6c-1.7 4.1-4.1 5.4-6.1 1.6-2.2-4.6-2.7-10.5-1.4-15.5 1-3.7 3.7-3.9 6.2.5 2.5 4 2.9 9.1 1.3 13.4Z" id="a"/></defs><g fill="none" fill-rule="evenodd"><path class="__rptl-header-logo-text" d="M145.6 74.3h-10.1v21.3c0 .7-.5 1.2-1.2 1.2H124c-.7 0-1.2-.5-1.2-1.2V36.5c0-.7.5-1.2 1.2-1.2h21.7c7.3 0 12.9 1.6 16.8 4.9 3.9 3.2 5.9 7.8 5.9 13.7.1 3.7-.8 7.3-2.7 10.5-2 3-4.9 5.3-8.3 6.7l12.7 24c.3.6.1 1.3-.5 1.6-.2.1-.4.1-.6.1h-11c-.5 0-1-.3-1.3-.8l-11.1-21.7ZM135.5 64h10.2c3.2 0 5.6-.8 7.4-2.4 1.8-1.7 2.8-4.2 2.6-6.7.1-2.5-.8-5-2.5-6.8-1.6-1.7-4.2-2.5-7.6-2.5h-10.2l.1 18.4Zm66.8 32.1c-.4-1.1-.7-2.2-.9-3.4-2.9 3.3-7.1 5.1-11.5 4.9-4.1.1-8-1.2-11.1-3.9-2.9-2.4-4.5-6-4.4-9.8 0-4.8 1.8-8.6 5.4-11.1 3.6-2.6 8.8-3.9 15.6-3.9h5.6v-2.6c.1-1.8-.5-3.6-1.6-5.1-1.1-1.3-2.8-1.9-5.1-1.9-1.7-.1-3.5.4-4.8 1.5-.9.8-1.5 1.9-1.7 3.1-.1.6-.6 1-1.2 1h-9.9c-.7 0-1.2-.5-1.2-1.2v-.1c.2-2.2 1.1-4.2 2.4-6 1.8-2.4 4.2-4.2 6.9-5.3 3.2-1.3 6.6-2 10-1.9 5.6 0 10.1 1.4 13.4 4.2 3.3 2.8 5 6.8 5 11.9v19.8c-.1 3 .4 6 1.4 8.9.3.6 0 1.3-.6 1.6-.2.1-.3.1-.5.1h-10.1c-.5-.1-1-.4-1.1-.8Zm-9.8-7.8c1.7 0 3.4-.4 5-1.2 1.4-.7 2.6-1.8 3.4-3.2V76h-4.6c-6.1 0-9.4 2.1-9.8 6.3v.7c0 1.4.5 2.8 1.6 3.8 1.2 1.1 2.8 1.6 4.4 1.5Zm53.8-4.1c0-1.5-.9-2.9-2.2-3.5-2.2-1.1-4.6-1.9-7.1-2.3-10.9-2.3-16.3-6.9-16.3-13.8 0-4 1.8-7.8 5-10.2 3.4-2.7 7.8-4.1 13.2-4.1 5.8 0 10.4 1.4 13.9 4.1 3 2.2 4.9 5.7 5.2 9.4 0 .6-.5 1.2-1.1 1.2h-10c-.6 0-1.1-.4-1.2-1-.2-1.3-.7-2.4-1.6-3.3-1.1-1.1-2.9-1.7-5.3-1.7-1.7-.1-3.4.4-4.8 1.4-1.1.9-1.7 2.2-1.7 3.5 0 1.4.7 2.6 1.9 3.3 2 1.1 4.2 1.8 6.5 2.2 2.6.5 5.2 1.2 7.7 2 6.4 2.4 9.7 6.5 9.7 12.3.1 4.1-2 7.9-5.4 10.1-3.6 2.6-8.2 3.9-13.8 3.9-3.5.1-7-.6-10.2-2-2.8-1.2-5.2-3.2-7-5.6-1.4-1.9-2.2-4.1-2.5-6.4-.1-.7.4-1.3 1-1.3h9.4c.6 0 1.1.4 1.2.9.2 1.6 1 3.1 2.3 4 1.7 1.2 3.9 1.8 6 1.7 1.9.1 3.7-.3 5.3-1.3 1.2-.8 1.9-2.1 1.9-3.5Zm60.3-9.8c0 7-1.6 12.7-4.8 16.9-3 4.1-7.8 6.5-12.9 6.4-4.3.2-8.4-1.6-11.2-4.8v20.4c0 .7-.5 1.2-1.2 1.2h-9.8c-.7 0-1.2-.5-1.2-1.2v-61c0-.7.5-1.2 1.2-1.2h9.1c.6 0 1.1.5 1.2 1.1l.3 3.4c2.8-3.5 7.1-5.5 11.6-5.3 5.6 0 10 2.1 13.1 6.2 3.1 4.2 4.7 9.9 4.7 17.2l-.1.7Zm-12.2-.9c0-4.2-.8-7.5-2.3-9.8-1.4-2.3-3.9-3.6-6.6-3.5-3.8 0-6.5 1.5-7.9 4.4v18.7c1.5 3 4.2 4.5 8 4.5 5.9 0 8.8-4.8 8.8-14.3Zm60.5.9c0 7.3-1.6 13-4.7 17.1-3.1 4.1-7.5 6.1-13.1 6.1-4.6.1-9.1-2-11.9-5.7l-.4 3.8c-.1.6-.6 1.1-1.2 1.1h-8.7c-.7 0-1.2-.5-1.2-1.2V33.1c0-.7.5-1.2 1.2-1.2h9.8c.7 0 1.2.5 1.2 1.2v22.1c2.7-3.3 6.8-5.1 11.1-4.9 5.6 0 9.9 2 13.1 6.1 3.2 4.1 4.8 9.9 4.8 17.3v.7Zm-12.2-.9c0-4.6-.7-8-2.2-10.1-1.5-2.1-4-3.3-6.5-3.2-3.9 0-6.6 1.6-8 4.8v18c1.5 3.2 4.2 4.8 8.1 4.8 3.9 0 6.5-1.9 7.8-5.8.6-2.8.9-5.7.8-8.5Zm40.2 24.1c-6.7 0-12.2-2.1-16.4-6.2-4.2-4.1-6.3-9.6-6.3-16.4v-1.2c-.1-4.3.8-8.5 2.7-12.3 1.6-3.5 4.3-6.4 7.5-8.4 3.4-2 7.2-3 11.1-2.9 6.2 0 11.2 2 14.8 5.9 3.6 3.9 5.4 9.5 5.4 16.8v3.8c0 .7-.5 1.2-1.2 1.2h-27.9c.3 2.7 1.5 5.3 3.6 7.2 2.1 1.8 4.8 2.8 7.5 2.7 3.8.2 7.6-1.3 10.2-4.1.5-.5 1.2-.5 1.7 0l.1.1 4.4 5c.4.4.4 1.1.1 1.5-1.8 2.3-4.2 4.1-6.8 5.3-3.4 1.3-7 2.1-10.5 2Zm-1.4-37.5c-2.2-.1-4.4.8-5.9 2.5-1.7 2-2.7 4.5-2.9 7h17v-1c.1-2.3-.7-4.6-2.2-6.3-1.6-1.5-3.8-2.3-6-2.2Zm52.7 1.1c0 .7-.5 1.2-1.2 1.2h-.1c-1-.1-2.1-.2-3.1-.2-4.6 0-7.6 1.6-9.1 4.7v28.7c0 .7-.5 1.2-1.2 1.2h-9.8c-.7 0-1.2-.5-1.2-1.2V52.3c0-.7.5-1.2 1.2-1.2h9.2c.6 0 1.1.5 1.2 1.1l.3 4.3c2.4-4.2 5.8-6.3 10.2-6.3 1 0 2 .1 2.9.3.5.1.9.6.9 1.2l-.2 9.5Zm30.8 0c0 .7-.5 1.2-1.2 1.2h-.1c-1-.1-2.1-.2-3.1-.2-4.6 0-7.6 1.6-9.1 4.7v28.7c0 .7-.5 1.2-1.2 1.2h-9.8c-.7 0-1.2-.5-1.2-1.2V52.3c0-.7.5-1.2 1.2-1.2h9.2c.6 0 1.1.5 1.2 1.1l.3 4.3c2.4-4.2 5.8-6.3 10.2-6.3 1 0 2 .1 2.9.3.5.1.9.6.9 1.2l-.2 9.5Zm24.6 18.3 8.2-27.6c.1-.5.6-.8 1.1-.8h10.5c.7 0 1.2.5 1.2 1.2 0 .1 0 .3-.1.4l-17.8 51.2-1 2.4c-2.7 6-7.2 9-13.5 9-1.5 0-3-.2-4.5-.6-.5-.1-.9-.6-.9-1.2v-7.1c0-.7.5-1.2 1.2-1.2h1.2c1.6.1 3.2-.3 4.6-1.1 1.3-.8 2.2-2.1 2.7-3.5l1.4-3.8-15.5-44.2c-.2-.6.1-1.3.7-1.5.1 0 .3-.1.4-.1h10.6c.5 0 1 .3 1.1.8l8.4 27.7Zm61.4-4.4v20.5c0 .7-.5 1.2-1.2 1.2h-10.3c-.7 0-1.2-.5-1.2-1.2V36.5c0-.7.5-1.2 1.2-1.2h22.8c4.2-.1 8.4.8 12.2 2.5 3.3 1.5 6.2 4.1 8.1 7.2 1.9 3.2 2.9 6.9 2.8 10.6 0 6-2.1 10.8-6.2 14.3s-9.8 5.2-17.1 5.2H551Zm0-10.2h11.3c3.4 0 5.9-.8 7.7-2.4 1.8-1.8 2.8-4.2 2.6-6.8.1-2.7-.8-5.3-2.7-7.3-1.9-1.9-4.6-3-7.3-2.9H551v19.4Zm40.4-25.6c-.1-1.7.6-3.3 1.8-4.5 2.9-2.4 7.1-2.4 10 0 2.5 2.5 2.5 6.6 0 9.1-2.9 2.4-7 2.4-9.9 0-1.3-1.2-2-2.9-1.9-4.6Zm11.8 57.5h-9.9c-.7 0-1.2-.5-1.2-1.2V52.3c0-.7.5-1.2 1.2-1.2h9.9c.7 0 1.2.5 1.2 1.2v43.3c0 .7-.6 1.2-1.2 1.2Z" fill="#000" fill-rule="nonzero"/><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)" fill-rule="nonzero"><path fill="#E30A33" d="M-14.6.1h127.9v21.3H-14.6z"/><path fill="#F18E43" d="M-14.6 21.4h127.9v21.3H-14.6z"/><path fill="#F9DF53" d="M-14.6 42.7h127.9V64H-14.6z"/><path fill="#008F58" d="M-14.6 64h127.9v21.3H-14.6z"/><path fill="#3098D4" d="M-14.6 85.3h127.9v21.3H-14.6z"/><path fill="#A03E7E" d="M-14.6 106.7h127.9V128H-14.6z"/></g></g></svg>
+        <svg class="__rptl-header-logo" aria-hidden="true" focusable="false" height="44" viewBox="0 0 270 57" xmlns="http://www.w3.org/2000/svg" aria-labelledby="__rptl-header-logo"><title id="__rptl-header-logo">Raspberry Pi</title><g fill-rule="nonzero" fill="none"><path d="M65.275 33.317h-4.477v9.46c0 .29-.235.526-.525.526h-4.57a.525.525 0 0 1-.526-.525V16.55a.525.525 0 0 1 .525-.525h9.61c3.223 0 5.709.718 7.457 2.154a7.437 7.437 0 0 1 2.623 6.09 8.391 8.391 0 0 1-1.208 4.655 8.24 8.24 0 0 1-3.663 2.97l5.635 10.638a.525.525 0 0 1-.464.77h-4.917a.63.63 0 0 1-.56-.342l-4.94-9.643Zm-4.477-4.552h4.534a4.641 4.641 0 0 0 3.278-1.078 3.85 3.85 0 0 0 1.162-2.97 4.122 4.122 0 0 0-1.096-3.034 4.556 4.556 0 0 0-3.363-1.106h-4.515v8.188ZM90.426 42.997a6.562 6.562 0 0 1-.402-1.511 6.551 6.551 0 0 1-5.114 2.192 7.195 7.195 0 0 1-4.937-1.724 5.542 5.542 0 0 1-1.958-4.347 5.73 5.73 0 0 1 2.389-4.946c1.592-1.148 3.894-1.73 6.904-1.742h2.491v-1.162a3.342 3.342 0 0 0-.72-2.248 2.838 2.838 0 0 0-2.277-.843 3.226 3.226 0 0 0-2.145.656 2.13 2.13 0 0 0-.748 1.37.513.513 0 0 1-.513.428h-4.375a.533.533 0 0 1-.524-.596 5.494 5.494 0 0 1 1.054-2.663 7.184 7.184 0 0 1 3.073-2.352 11.2 11.2 0 0 1 4.459-.852 8.848 8.848 0 0 1 5.948 1.883 6.587 6.587 0 0 1 2.202 5.292v8.787a9.948 9.948 0 0 0 .629 3.93.525.525 0 0 1-.47.754h-4.485a.515.515 0 0 1-.48-.306Zm-4.336-3.46c.77.007 1.529-.176 2.21-.534a3.509 3.509 0 0 0 1.5-1.433v-3.485h-2.024c-2.71 0-4.153.937-4.328 2.81l-.019.319a2.166 2.166 0 0 0 .712 1.667 2.764 2.764 0 0 0 1.949.656ZM109.963 37.701a1.745 1.745 0 0 0-.983-1.564 11.18 11.18 0 0 0-3.157-1.021c-4.822-1.012-7.232-3.06-7.232-6.145a5.57 5.57 0 0 1 2.24-4.506 9.031 9.031 0 0 1 5.854-1.808 9.723 9.723 0 0 1 6.173 1.817 5.699 5.699 0 0 1 2.292 4.175.52.52 0 0 1-.525.546h-4.382a.514.514 0 0 1-.514-.435 2.538 2.538 0 0 0-.721-1.485 3.172 3.172 0 0 0-2.342-.759 3.24 3.24 0 0 0-2.117.619c-.483.377-.76.96-.75 1.573.001.603.327 1.158.853 1.452a8.76 8.76 0 0 0 2.876.956 23.54 23.54 0 0 1 3.41.908c2.86 1.05 4.29 2.867 4.29 5.452a5.288 5.288 0 0 1-2.38 4.487 10.264 10.264 0 0 1-6.145 1.715c-1.556.029-3.1-.281-4.524-.91a7.586 7.586 0 0 1-3.1-2.49 5.853 5.853 0 0 1-1.094-2.824.533.533 0 0 1 .523-.596h4.11a.513.513 0 0 1 .513.418c.091.71.46 1.354 1.024 1.793a4.233 4.233 0 0 0 2.66.768c.827.057 1.65-.15 2.352-.59.508-.35.807-.93.796-1.546ZM136.719 33.355a12.159 12.159 0 0 1-2.127 7.503 6.817 6.817 0 0 1-5.742 2.82 6.315 6.315 0 0 1-4.965-2.136v9.03c0 .29-.235.525-.525.525h-4.364a.525.525 0 0 1-.525-.525V23.557a.525.525 0 0 1 .525-.525h4.018c.27 0 .497.206.523.475l.142 1.51a6.363 6.363 0 0 1 5.134-2.36 6.865 6.865 0 0 1 5.826 2.773c1.387 1.848 2.08 4.396 2.08 7.644v.28Zm-5.415-.394a7.982 7.982 0 0 0-1.002-4.365 3.266 3.266 0 0 0-2.913-1.536 3.546 3.546 0 0 0-3.504 1.948v8.3a3.605 3.605 0 0 0 3.541 2.004c2.586 0 3.878-2.117 3.878-6.35ZM158.159 33.355c0 3.247-.694 5.78-2.08 7.597a6.889 6.889 0 0 1-5.808 2.726 6.329 6.329 0 0 1-5.264-2.53l-.191 1.689a.525.525 0 0 1-.522.466h-3.877a.525.525 0 0 1-.525-.525V15.05c0-.29.235-.525.525-.525h4.364a.525.525 0 0 1 .525.525v9.798a6.166 6.166 0 0 1 4.928-2.192 6.945 6.945 0 0 1 5.817 2.726c1.405 1.817 2.108 4.374 2.108 7.672v.3Zm-5.415-.394a8.068 8.068 0 0 0-.974-4.487 3.295 3.295 0 0 0-2.904-1.414 3.572 3.572 0 0 0-3.56 2.117v8a3.62 3.62 0 0 0 3.597 2.135c1.626.093 3.081-.999 3.448-2.585.31-1.23.442-2.498.393-3.766ZM170.555 43.678a9.95 9.95 0 0 1-7.26-2.736 9.722 9.722 0 0 1-2.8-7.288v-.524a12.247 12.247 0 0 1 1.18-5.461 8.666 8.666 0 0 1 3.344-3.71 9.387 9.387 0 0 1 4.936-1.302 8.413 8.413 0 0 1 6.548 2.623c1.593 1.749 2.39 4.228 2.39 7.438v1.685a.525.525 0 0 1-.526.525h-12.383a5.028 5.028 0 0 0 1.583 3.185 4.785 4.785 0 0 0 3.344 1.2 5.886 5.886 0 0 0 4.524-1.837.527.527 0 0 1 .773.026l1.964 2.198c.17.188.182.47.028.672a8.216 8.216 0 0 1-3.036 2.34 10.82 10.82 0 0 1-4.609.966Zm-.618-16.656a3.382 3.382 0 0 0-2.614 1.092 5.65 5.65 0 0 0-1.283 3.124h7.531v-.433a4.034 4.034 0 0 0-.974-2.795 3.492 3.492 0 0 0-2.66-.988ZM193.333 27.525a.523.523 0 0 1-.575.515c-.459-.051-.92-.078-1.382-.081-2.049 0-3.391.693-4.028 2.08v12.739a.525.525 0 0 1-.525.525h-4.364a.525.525 0 0 1-.525-.525V23.557a.525.525 0 0 1 .525-.525h4.096c.277 0 .507.215.524.492l.12 1.924a5.017 5.017 0 0 1 4.514-2.791c.434-.002.867.044 1.29.138a.515.515 0 0 1 .39.515l-.06 4.215ZM207.017 27.525a.523.523 0 0 1-.575.515c-.459-.051-.92-.078-1.382-.081-2.048 0-3.39.693-4.028 2.08v12.739a.525.525 0 0 1-.525.525h-4.364a.525.525 0 0 1-.525-.525V23.557a.525.525 0 0 1 .525-.525h4.096c.277 0 .507.215.524.492l.12 1.924a5.018 5.018 0 0 1 4.514-2.791c.434-.002.867.044 1.29.138a.515.515 0 0 1 .39.515l-.06 4.215ZM217.934 35.64l3.635-12.233a.525.525 0 0 1 .504-.375h4.677a.525.525 0 0 1 .496.697l-7.907 22.721-.45 1.068a6.18 6.18 0 0 1-5.995 3.972 8.368 8.368 0 0 1-2.003-.25.529.529 0 0 1-.395-.513v-3.15a.525.525 0 0 1 .546-.524l.538.02a3.442 3.442 0 0 0 2.035-.492 3.08 3.08 0 0 0 1.19-1.555l.637-1.667-6.857-19.63a.525.525 0 0 1 .496-.697h4.696c.232 0 .437.152.503.374l3.654 12.234ZM245.156 33.692v9.086c0 .29-.235.525-.525.525h-4.57a.525.525 0 0 1-.526-.525V16.55a.525.525 0 0 1 .525-.525h10.117a12.31 12.31 0 0 1 5.405 1.124 8.284 8.284 0 0 1 3.587 3.194 8.91 8.91 0 0 1 1.256 4.712 7.833 7.833 0 0 1-2.745 6.323c-1.83 1.543-4.362 2.314-7.597 2.314h-4.927Zm0-4.553h5.02a4.934 4.934 0 0 0 3.401-1.049 3.816 3.816 0 0 0 1.171-2.998 4.5 4.5 0 0 0-1.18-3.24 4.41 4.41 0 0 0-3.26-1.275h-5.152v8.562ZM263.081 17.786a2.666 2.666 0 0 1 .815-2.005 3.512 3.512 0 0 1 4.431 0 2.86 2.86 0 0 1-.01 4.028 3.473 3.473 0 0 1-4.402 0 2.66 2.66 0 0 1-.834-2.023Zm5.227 25.517h-4.383a.525.525 0 0 1-.525-.525V23.557a.525.525 0 0 1 .525-.525h4.383a.525.525 0 0 1 .525.525v19.22a.525.525 0 0 1-.525.526ZM45.008 32.949a8.74 8.74 0 0 0-3.104-6.182 7.664 7.664 0 0 0-1.44-2.801 8.594 8.594 0 0 0-3.058-5.777c.284-.244.524-.536.708-.862a6.186 6.186 0 0 0 3.63-4.23 5.558 5.558 0 0 0 1.755-3.64 3.481 3.481 0 0 0-.31-1.638 3.114 3.114 0 0 0 .81-3.215c-.606-1.756-2.73-2.896-5.584-3.017a4.497 4.497 0 0 0-3.11-1.065 7.188 7.188 0 0 0-1.678.207 3.821 3.821 0 0 0-1.65-.334 6.458 6.458 0 0 0-3.148.858 2.894 2.894 0 0 0-.38-.025 6.276 6.276 0 0 0-3.551 1.558 10.765 10.765 0 0 0-1.866 1.944 10.768 10.768 0 0 0-1.867-1.944 6.278 6.278 0 0 0-3.55-1.558c-.127 0-.254.008-.38.025a6.46 6.46 0 0 0-3.148-.858 3.822 3.822 0 0 0-1.65.334 7.188 7.188 0 0 0-1.68-.207 4.498 4.498 0 0 0-3.109 1.065c-2.854.12-4.978 1.261-5.585 3.018a3.114 3.114 0 0 0 .812 3.214 3.482 3.482 0 0 0-.31 1.639 5.557 5.557 0 0 0 1.755 3.64 6.186 6.186 0 0 0 3.63 4.229c.183.326.423.618.707.862A8.594 8.594 0 0 0 5.6 23.966a7.663 7.663 0 0 0-1.44 2.801 8.74 8.74 0 0 0-3.104 6.182 8.424 8.424 0 0 0 1.92 6.578c.26 1.31.8 2.549 1.581 3.632a9.452 9.452 0 0 0 2.386 5.514 9.768 9.768 0 0 0 5.262 3.126 12.74 12.74 0 0 0 4.208 2.605 9.763 9.763 0 0 0 13.24 0c1.559-.585 2.988-1.47 4.207-2.605a9.768 9.768 0 0 0 5.262-3.126 9.452 9.452 0 0 0 2.386-5.514 9.311 9.311 0 0 0 1.582-3.632 8.424 8.424 0 0 0 1.919-6.578Z" class="__rptl-header-logo-text"/><path d="M28.366 4.192a.225.225 0 0 1 .286.24c-.072.672.335.587.432.468a3.526 3.526 0 0 1 3.188-1.53.225.225 0 0 1 .154.363c-.4.593.03.706.19.6 1.631-1.02 3.187-1.023 3.785-.594a.225.225 0 0 1 .013.349c-.604.514-.266.77-.052.692a5.802 5.802 0 0 1 4.74.607.227.227 0 0 1 .006.343 4.493 4.493 0 0 0-1.73 3.018c-.045.396.614.313.891.241a.225.225 0 0 1 .28.21c.026.954-.876 2.002-2.218 2.898-.18.12-.154.408.256.42a.222.222 0 0 1 .191.334c-.478.888-1.13 1.724-3.345 2.298a.227.227 0 0 0-.032.429.217.217 0 0 1 .071.384c-2.207 1.896-7.8 1.148-8.51-2.043a.224.224 0 0 1 .04-.182 21.262 21.262 0 0 1 9.276-7.058.176.176 0 0 0-.087-.34 15.168 15.168 0 0 0-10.074 6.074.227.227 0 0 1-.289.065c-3.585-1.851-.64-7.317 2.538-8.286ZM7.285 12.85a.222.222 0 0 1 .191-.334c.41-.01.436-.299.256-.419C6.39 11.201 5.49 10.153 5.514 9.2a.225.225 0 0 1 .28-.21c.278.072.936.155.891-.241a4.493 4.493 0 0 0-1.73-3.017.227.227 0 0 1 .006-.344 5.802 5.802 0 0 1 4.74-.607c.214.079.552-.178-.052-.692a.225.225 0 0 1 .014-.35c.597-.428 2.153-.426 3.785.594.159.107.589-.006.19-.599a.225.225 0 0 1 .153-.363A3.526 3.526 0 0 1 16.98 4.9c.096.12.503.204.432-.469a.225.225 0 0 1 .286-.239c3.178.97 6.122 6.435 2.537 8.286a.227.227 0 0 1-.289-.065A15.168 15.168 0 0 0 9.873 6.34a.176.176 0 0 0-.088.34 21.262 21.262 0 0 1 9.276 7.057c.04.052.054.119.04.183-.71 3.19-6.303 3.938-8.51 2.042a.217.217 0 0 1 .071-.384.227.227 0 0 0-.031-.429c-2.216-.574-2.867-1.41-3.346-2.298Z" class="__rptl-header-logo-leaf"/><path d="M37.158 22.605c.92 2.446.203 3.622-1.978 2.377a15.632 15.632 0 0 1-4.58-3.84c-1.644-1.952-.576-2.821 2.012-2.352a6.985 6.985 0 0 1 4.546 3.815ZM27.375 19.853c3.12 2.593-.454 4.428-4.343 4.428-3.89 0-7.463-1.835-4.344-4.428a6.935 6.935 0 0 1 8.687 0ZM8.906 22.605a6.985 6.985 0 0 1 4.545-3.815c2.588-.47 3.656.4 2.013 2.352a15.632 15.632 0 0 1-4.58 3.84c-2.182 1.245-2.898.069-1.978-2.377ZM4.394 36.196a6.983 6.983 0 0 1 .518-5.942c1.153-1.96 2.313-1.883 2.773-.222.585 2.29.373 4.712-.6 6.867-.854 1.696-1.921 1.123-2.691-.703ZM12.704 48.896A6.942 6.942 0 0 1 7.482 42.7c.433-10.066 14.94 7.91 5.222 6.196ZM12.999 36.358c-2.433-1.404-3.077-4.844-1.438-7.682 1.639-2.839 4.94-4 7.372-2.596 2.433 1.404 3.077 4.844 1.438 7.682-1.639 2.839-4.94 4-7.372 2.596ZM27.091 52.737a6.947 6.947 0 0 1-8.119 0c-2.41-1.664.015-3.58 4.06-3.58s6.47 1.916 4.06 3.58Z" class="__rptl-header-logo-berry"/><ellipse class="__rptl-header-logo-berry" cx="23.032" cy="41.795" rx="5.647" ry="4.84"/><path d="M25.692 33.762c-1.639-2.838-.995-6.278 1.438-7.682 2.433-1.405 5.734-.243 7.372 2.596 1.64 2.838.995 6.278-1.438 7.682-2.432 1.405-5.733.243-7.372-2.596ZM33.36 48.896C23.64 50.61 38.149 32.634 38.58 42.7a6.941 6.941 0 0 1-5.221 6.196ZM41.67 36.196c-.77 1.826-1.838 2.399-2.691.703a10.417 10.417 0 0 1-.6-6.867c.46-1.66 1.62-1.739 2.772.222a6.983 6.983 0 0 1 .518 5.942Z" class="__rptl-header-logo-berry"/></g></svg>
       </a>
 
       <label class="__rptl-header-burger" for="__rptl-header-burger-state">
diff --git a/jekyll-assets/css/style.css b/jekyll-assets/css/style.css
index d641463c2..d986b628e 100644
--- a/jekyll-assets/css/style.css
+++ b/jekyll-assets/css/style.css
@@ -28,6 +28,8 @@
   --rptl-header-burger-stroke-color: var(--subtle);
   --rptl-header-subnav-background-color: #f7f8fa;
   --rptl-header-logo-text-fill: var(--textcolor);
+  --rptl-header-logo-leaf-fill: #46af4b;
+  --rptl-header-logo-berry-fill: var(--brand-colour);
   --rptl-cookiebanner-background-color: var(--less-subtle);
   --rptl-cookiebanner-text-color: var(--bg);
   --rptl-footer-background-color: #f5f6f9;
@@ -67,6 +69,8 @@
     --rptl-header-burger-stroke-color: var(--textcolor);
     --rptl-header-subnav-background-color: var(--near-bg);
     --rptl-header-logo-text-fill: var(--textcolor);
+    --rptl-header-logo-leaf-fill: var(--bg);
+    --rptl-header-logo-berry-fill: var(--bg);
     --rptl-cookiebanner-background-color: var(--code-bg-colour);
     --rptl-cookiebanner-text-color: var(--textcolor);
     --rptl-footer-background-color: #13131B;
diff --git a/scripts/add_new_page.py b/scripts/add_new_page.py
new file mode 100755
index 000000000..b948bd14f
--- /dev/null
+++ b/scripts/add_new_page.py
@@ -0,0 +1,108 @@
+#!/usr/bin/env python3
+
+# Example usage:
+#   scripts/add_new_page.py "My new HAT"
+# will create documentation/asciidoc/accessories/my-new-hat.adoc and documentation/asciidoc/accessories/my-new-hat/about.adoc
+#
+#   scripts/add_new_page.py -b new-hat "My new HAT"
+# will create documentation/asciidoc/accessories/new-hat.adoc and documentation/asciidoc/accessories/new-hat/about.adoc
+#
+#   scripts/add_new_page.py -b new-hat -s intro "My new HAT"
+# will create documentation/asciidoc/accessories/new-hat.adoc and documentation/asciidoc/accessories/new-hat/intro.adoc
+#
+#   scripts/add_new_page.py -c services "Some extra Service"
+# will create documentation/asciidoc/services/some-extra-service.adoc and documentation/asciidoc/services/some-extra-service/about.adoc
+#
+#   scripts/add_new_page.py -c services -b id -s signing_up "Raspberry Pi ID"
+# will create documentation/asciidoc/services/id.adoc and documentation/asciidoc/services/id/signing_up.adoc
+
+import argparse
+import json
+import os
+import random
+import re
+import shutil
+import sys
+
+DOCUMENTATION_DIR = 'documentation'
+INDEX_JSON = os.path.join(DOCUMENTATION_DIR, 'index.json')
+IMAGES_DIR = os.path.join(DOCUMENTATION_DIR, 'images')
+PLACEHOLDER_IMAGES_DIR = os.path.join(IMAGES_DIR, 'placeholder')
+PLACEHOLDER_SHAPES = ('circle', 'square', 'triangle')
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser()
+    parser.add_argument('name')
+    parser.add_argument('-c', '--category', default='accessories')
+    parser.add_argument('-b', '--basename')
+    parser.add_argument('-s', '--subfile', default='about')
+    args = parser.parse_args()
+    print(args)
+
+    name = args.name
+    category = args.category
+    basename = args.basename
+    if not basename:
+        basename = re.sub('\W', '-', name.lower())
+    subfile = f"{args.subfile}.adoc"
+
+    # Validate the category
+    valid_categories = []
+    with open(INDEX_JSON, 'r') as json_fh:
+        json_contents = json.load(json_fh)
+        for tab in json_contents["tabs"]:
+            if 'from_json' in tab:
+                continue
+            valid_categories.append(tab['path'])
+    if category not in valid_categories:
+        raise Exception(f"Invalid category {category}. Choose from {valid_categories}")
+    category_dir = os.path.join(DOCUMENTATION_DIR, 'asciidoc', category)
+    if not os.path.exists(category_dir):
+        raise Exception(f"{category_dir} doesn't exist")
+
+    # Check the new page hasn't already been added
+    new_dir = os.path.join(category_dir, basename)
+    if os.path.isdir(new_dir):
+        raise Exception(f"{new_dir} already exists")
+    new_file = f"{new_dir}.adoc"
+    if os.path.isfile(new_file):
+        raise Exception(f"{new_file} already exists")
+    new_subfile = os.path.join(new_dir, subfile)
+    if os.path.isfile(new_subfile):
+        raise Exception(f"{new_subfile} already exists")
+
+    print(f"Will create {new_file} and {new_subfile}")
+    # sys.exit(0)
+    # Create the template AsciiDoc documentation
+    os.mkdir(new_dir)
+    with open(new_file, 'w') as fh:
+        fh.write(f"include::{basename}/{subfile}[]\n")
+    with open(new_subfile, 'w') as fh:
+        fh.write(f"== About\n\nAll about {name} and why it's amazing")
+
+    # Add the placeholder images
+    shape = random.choice(PLACEHOLDER_SHAPES)
+    shutil.copyfile(os.path.join(PLACEHOLDER_IMAGES_DIR, f"placeholder_{shape}-SMALL.png"), os.path.join(IMAGES_DIR, f"{basename}-SMALL.png"))
+    shutil.copyfile(os.path.join(PLACEHOLDER_IMAGES_DIR, f"placeholder_{shape}.png"), os.path.join(IMAGES_DIR, 'full-sized', f"{basename}.png"))
+
+    # And finally update the JSON which ties everything together
+    with open(INDEX_JSON, 'r+') as json_fh:
+        json_contents = json.load(json_fh)
+        found = False
+        for tab in json_contents["tabs"]:
+            if tab['path'] == category:
+                found = True
+                tab["subitems"].append({
+                    "title": name,
+                    "description": f"Description of {name}",
+                    "image": os.path.join('full-sized', f"{basename}.png"),
+                    "subpath": f"{basename}.adoc",
+                })
+                break
+        if not found: # this shouldn't ever happen, as we already validated the category earlier
+            raise Exception(f"Couldn't find tab with path {category} in {INDEX_JSON}")
+        json_fh.seek(0)
+        json.dump(json_contents, json_fh, indent=4)
+
+    print(f"Done. Use 'git status' and 'git diff' to see what has changed, and then add more content to\n {new_subfile}")
+