From c77bc47286c6122c539b46867498ae3e091607cd Mon Sep 17 00:00:00 2001
From: Andrew Hosgood <andrew.hosgood@nationalarchives.gov.uk>
Date: Thu, 11 Jul 2024 15:44:38 +0100
Subject: [PATCH] v0.1.34

---
 CHANGELOG.md                                  |  8 +-
 README.md                                     |  1 +
 package-lock.json                             |  8 +-
 package.json                                  |  2 +-
 setup.py                                      |  2 +-
 test/app/components/routes.py                 | 10 +++
 test/app/components/test-templates/files.html |  2 +
 .../components/test-templates/gallery.html    |  2 +
 .../templates/components/accordion/macro.html | 12 +--
 .../components/breadcrumbs/macro.html         |  2 +-
 .../templates/components/button/macro.html    |  4 +-
 .../templates/components/card/macro.html      | 10 +--
 .../components/checkboxes/macro.html          |  6 +-
 .../components/compound-filters/macro.html    |  2 +-
 .../components/cookie-banner/macro.html       |  2 +-
 .../components/date-input/macro.html          |  2 +-
 .../components/date-search/macro.html         |  6 +-
 .../templates/components/details/macro.html   |  2 +-
 .../components/error-summary/macro.html       |  2 +-
 .../components/featured-records/macro.html    |  2 +-
 .../templates/components/files/macro.html     | 35 ++++++++
 .../templates/components/footer/macro.html    |  2 +-
 .../templates/components/gallery/macro.html   | 85 +++++++++++++++++++
 .../components/global-header/macro.html       |  2 +-
 .../templates/components/grid/macro.html      |  2 +-
 .../templates/components/header/macro.html    |  2 +-
 .../templates/components/hero/macro.html      |  2 +-
 .../components/index-grid/macro.html          |  6 +-
 .../components/pagination/macro.html          |  2 +-
 .../components/phase-banner/macro.html        |  2 +-
 .../templates/components/picture/macro.html   |  2 +-
 .../components/quick-filters/macro.html       |  2 +-
 .../templates/components/radios/macro.html    |  2 +-
 .../components/search-field/macro.html        |  4 +-
 .../components/search-filters/macro.html      |  2 +-
 .../templates/components/select/macro.html    |  4 +-
 .../components/sensitive-image/macro.html     |  2 +-
 .../templates/components/sidebar/macro.html   |  4 +-
 .../templates/components/skip-link/macro.html |  2 +-
 .../templates/components/tabs/macro.html      |  2 +-
 .../components/text-input/macro.html          |  6 +-
 .../templates/components/textarea/macro.html  |  4 +-
 .../templates/components/warning/macro.html   |  2 +-
 .../templates/layouts/base.html               |  4 +-
 44 files changed, 207 insertions(+), 62 deletions(-)
 create mode 100644 test/app/components/test-templates/files.html
 create mode 100644 test/app/components/test-templates/gallery.html
 create mode 100644 tna_frontend_jinja/templates/components/files/macro.html
 create mode 100644 tna_frontend_jinja/templates/components/gallery/macro.html

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4075ab1..48f8671 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased](https://github.com/nationalarchives/tna-frontend-jinja/compare/v0.1.33...HEAD)
+## [Unreleased](https://github.com/nationalarchives/tna-frontend-jinja/compare/v0.1.34...HEAD)
 
 ### Added
 ### Changed
@@ -14,6 +14,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 ### Security
 
+## [0.1.34](https://github.com/nationalarchives/tna-frontend-jinja/compare/v0.1.33...v0.1.34) - 2024-07-11
+
+### Changed
+
+- Upgraded TNA Frontend to `v0.1.65`
+
 ## [0.1.33](https://github.com/nationalarchives/tna-frontend-jinja/compare/v0.1.32...v0.1.33) - 2024-06-24
 
 ### Changed
diff --git a/README.md b/README.md
index d1dd2f5..1826145 100644
--- a/README.md
+++ b/README.md
@@ -52,6 +52,7 @@ We test each component against its published [component fixtures](https://github
 
 | TNA Frontend Jinja    | Compatible TNA Frontend versions           |
 | --------------------- | ------------------------------------------ |
+| `0.1.34`              | `v0.1.65`                                  |
 | `0.1.33`              | `v0.1.62`, `v0.1.63`, `v0.1.64`            |
 | `0.1.32`              | `v0.1.60`, `v0.1.61`                       |
 | `0.1.31`              | `v0.1.59`                                  |
diff --git a/package-lock.json b/package-lock.json
index 7531c36..fa9fcca 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,7 +5,7 @@
   "packages": {
     "": {
       "dependencies": {
-        "@nationalarchives/frontend": "0.1.62",
+        "@nationalarchives/frontend": "0.1.65",
         "diff": "^5.1.0",
         "glob": "^10.2.7",
         "js-beautify": "^1.14.8",
@@ -30,9 +30,9 @@
       }
     },
     "node_modules/@nationalarchives/frontend": {
-      "version": "0.1.62",
-      "resolved": "https://registry.npmjs.org/@nationalarchives/frontend/-/frontend-0.1.62.tgz",
-      "integrity": "sha512-b5z1v1x9O68OtJSIVWB72H5vKLJBjOBRAwQ4gaP3da5YiqDHxvoHqhx/aqTHaqk5Ynw4EK09khJu4MTwY1zGYQ=="
+      "version": "0.1.65",
+      "resolved": "https://registry.npmjs.org/@nationalarchives/frontend/-/frontend-0.1.65.tgz",
+      "integrity": "sha512-9a6NAQjSfgsVLGucjLJXEPaUwzpWLQcMc3WdHIs+qVBd7hx7UZD5RCmzAEtJgJbROOpeg3AOBJiR8fwcbwA7Xg=="
     },
     "node_modules/@one-ini/wasm": {
       "version": "0.1.1",
diff --git a/package.json b/package.json
index 4ecf286..1eb741e 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
     "test": "node test-fixtures.mjs"
   },
   "dependencies": {
-    "@nationalarchives/frontend": "0.1.62",
+    "@nationalarchives/frontend": "0.1.65",
     "diff": "^5.1.0",
     "glob": "^10.2.7",
     "js-beautify": "^1.14.8",
diff --git a/setup.py b/setup.py
index 7ee5ed1..82fe03f 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="tna-frontend-jinja",
-    version="0.1.33",
+    version="0.1.34",
     author="Andrew Hosgood",
     author_email="andrew.hosgood@nationalarchives.gov.uk",
     description="TNA Frontend Jinja templates",
diff --git a/test/app/components/routes.py b/test/app/components/routes.py
index 3584172..2a8d578 100644
--- a/test/app/components/routes.py
+++ b/test/app/components/routes.py
@@ -70,11 +70,21 @@ def featured_records():
     return render_component("featured-records.html")
 
 
+@bp.route("/files")
+def files():
+    return render_component("files.html")
+
+
 @bp.route("/footer")
 def footer():
     return render_component("footer.html")
 
 
+@bp.route("/gallery")
+def gallery():
+    return render_component("gallery.html")
+
+
 @bp.route("/grid")
 def grid():
     return render_component("grid.html")
diff --git a/test/app/components/test-templates/files.html b/test/app/components/test-templates/files.html
new file mode 100644
index 0000000..0b85c9a
--- /dev/null
+++ b/test/app/components/test-templates/files.html
@@ -0,0 +1,2 @@
+{%- from "components/files/macro.html" import tnaFiles -%}
+{{ tnaFiles(context) }}
\ No newline at end of file
diff --git a/test/app/components/test-templates/gallery.html b/test/app/components/test-templates/gallery.html
new file mode 100644
index 0000000..ad69656
--- /dev/null
+++ b/test/app/components/test-templates/gallery.html
@@ -0,0 +1,2 @@
+{%- from "components/gallery/macro.html" import tnaGallery -%}
+{{ tnaGallery(context) }}
\ No newline at end of file
diff --git a/tna_frontend_jinja/templates/components/accordion/macro.html b/tna_frontend_jinja/templates/components/accordion/macro.html
index f600409..7bb39c6 100644
--- a/tna_frontend_jinja/templates/components/accordion/macro.html
+++ b/tna_frontend_jinja/templates/components/accordion/macro.html
@@ -1,18 +1,20 @@
 {% macro tnaAccordion(params) %}
 {%- set containerClasses = [params.classes] if params.classes else [] -%}
 {%- set classes = containerClasses | join(' ') -%}
-<div class="tna-accordion{% if classes %} {{ classes }}{% endif %}" data-module="tna-accordion" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}="{{ value }}"{% endfor %}{% endif %}>
+<div class="tna-accordion{% if classes %} {{ classes }}{% endif %}" data-multipleitems="{{ 'true' if params.openMultipleItems else 'false' }}" data-module="tna-accordion" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}>
   {%- for item in params['items'] %}
-  <details class="tna-accordion__details"{%- if params.group %} name="{{ params.group }}"{% endif %}{%- if item.open %} open{% endif %}>
-    <summary class="tna-accordion__summary">{{ item.title }}</summary>
-    <div class="tna-accordion__content">
+  <div class="tna-accordion__item" data-isopen="{{ 'true' if item.open else 'false' }}">
+    <h{{ params.itemHeadingLevel }} class="tna-accordion__heading tna-heading-s">
+      {{ item.title }}
+    </h{{ params.itemHeadingLevel }}>
+    <div class="tna-accordion__body" id="{{ params.id }}-content-{{ loop.index }}">
       {%- if item.text %}
         <p>{{ item.text }}</p>
       {%- else %}
         {{ item.body | safe }}
       {%- endif %}
     </div>
-  </details>
+  </div>
   {%- endfor %}
 </div>
 {% endmacro %}
\ No newline at end of file
diff --git a/tna_frontend_jinja/templates/components/breadcrumbs/macro.html b/tna_frontend_jinja/templates/components/breadcrumbs/macro.html
index 2e142e1..53419ce 100644
--- a/tna_frontend_jinja/templates/components/breadcrumbs/macro.html
+++ b/tna_frontend_jinja/templates/components/breadcrumbs/macro.html
@@ -4,7 +4,7 @@
   {%- set containerClasses = containerClasses + ['tna-breadcrumbs--no-collapse'] -%}
 {%- endif -%}
 {%- set classes = ' '.join(containerClasses) -%}
-<nav class="tna-breadcrumbs{% if classes %} {{ classes }}{% endif %}" data-module="tna-breadcrumbs" aria-label="Breadcrumb" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}="{{ value }}"{% endfor %}{% endif %}>
+<nav class="tna-breadcrumbs{% if classes %} {{ classes }}{% endif %}" data-module="tna-breadcrumbs" aria-label="Breadcrumb" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}>
   <ol class="tna-breadcrumbs__list" {%- if params.structuredData %} itemscope itemtype="https://schema.org/BreadcrumbList"{% endif %}>
   {%- for item in params['items'] -%}
     <li class="tna-breadcrumbs__item" {%- if params.structuredData %} itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"{% endif %}>
diff --git a/tna_frontend_jinja/templates/components/button/macro.html b/tna_frontend_jinja/templates/components/button/macro.html
index aa732c3..a8395d3 100644
--- a/tna_frontend_jinja/templates/components/button/macro.html
+++ b/tna_frontend_jinja/templates/components/button/macro.html
@@ -19,9 +19,11 @@
   {%- set buttonClasses = buttonClasses + ['tna-button--icon-right'] -%}
 {%- endif -%}
 {%- set classes = ' '.join(buttonClasses) -%}
-<{{ 'button' if params.buttonElement else 'a' }}{%- if not params.buttonElement %} href="{{ params.href }}"{%- endif %} class="tna-button {{ classes }}"{%- if params.buttonElement %} type="{{ params.buttonType or 'button' }}"{%- endif -%}{%- if params.title %} title="{{ params.title }}"{% endif %} {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}="{{ value }}"{% endfor %}{% endif %}>
+<{{ 'button' if params.buttonElement else 'a' }}{%- if not params.buttonElement %} href="{{ params.href }}"{%- endif %} class="tna-button {{ classes }}"{%- if params.buttonElement %} type="{{ params.buttonType or 'button' }}"{%- endif -%}{%- if params.title %} title="{{ params.title }}"{% endif %} {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}>
   {% if params.icon -%}
   <i class="fa-solid fa-{{ params.icon }}" aria-hidden="true"></i>
+  {% elif params.iconSvg -%}
+  {{ params.iconSvg | safe }}
   {% endif -%}
   {{ params.text }}
 </{{ 'button' if params.buttonElement else 'a' }}>
diff --git a/tna_frontend_jinja/templates/components/card/macro.html b/tna_frontend_jinja/templates/components/card/macro.html
index ca1c422..fd6b81e 100644
--- a/tna_frontend_jinja/templates/components/card/macro.html
+++ b/tna_frontend_jinja/templates/components/card/macro.html
@@ -12,14 +12,14 @@
   {%- set containerClasses = containerClasses + ['tna-background-accent'] -%}
 {%- endif -%}
 {%- set classes = ' '.join(containerClasses) -%}
-<{{ htmlElement }} class="tna-card{% if classes %} {{ classes }}{% endif %}" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}="{{ value }}"{% endfor %}{% endif %}>
+<{{ htmlElement }} class="tna-card{% if classes %} {{ classes }}{% endif %}" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}>
   <div class="tna-card__inner">
   {%- if params.supertitle %}
     <hgroup class="tna-hgroup-{{ params.headingSize or 'm' }} tna-card__heading">
       <p class="tna-hgroup__supertitle{% if params.plainSupertitle %} tna-hgroup__supertitle--plain{% endif %}">{{ params.supertitle }}</p>
       <h{{ params.headingLevel }} class="tna-hgroup__title">
         {%- if params.href %}
-        <a href="{{ params.href }}" class="tna-card__heading-link{% if params.hrefClasses %} {{ params.hrefClasses }}{% endif %}" {%- if params.hrefAttributes %}{%- for attribute, value in params.hrefAttributes.items() %} {{ attribute }}="{{ value }}"{% endfor %}{% endif %}>{{ params.title }}</a>
+        <a href="{{ params.href }}" class="tna-card__heading-link{% if params.hrefClasses %} {{ params.hrefClasses }}{% endif %}" {%- if params.hrefAttributes %}{%- for attribute, value in params.hrefAttributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}>{{ params.title }}</a>
         {%- else %}
         {{ params.title }}
         {%- endif %}
@@ -28,7 +28,7 @@
   {%- else %}
     <h{{ params.headingLevel }} class=" tna-heading-{{ params.headingSize or 'm' }} tna-card__heading">
       {%- if params.href %}
-      <a href="{{ params.href }}" class="tna-card__heading-link{% if params.hrefClasses %} {{ params.hrefClasses }}{% endif %}" {%- if params.hrefAttributes %}{%- for attribute, value in params.hrefAttributes.items() %} {{ attribute }}="{{ value }}"{% endfor %}{% endif %}>{{ params.title }}</a>
+      <a href="{{ params.href }}" class="tna-card__heading-link{% if params.hrefClasses %} {{ params.hrefClasses }}{% endif %}" {%- if params.hrefAttributes %}{%- for attribute, value in params.hrefAttributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}>{{ params.title }}</a>
       {%- else %}
       {{ params.title }}
       {%- endif %}
@@ -36,7 +36,7 @@
   {%- endif %}
   {%- if params.imageSrc %}
     {%- if params.href %}
-    <a href="{{ params.href }}" class="tna-card__image-container{% if params.hrefClasses %} {{ params.hrefClasses }}{% endif %}" tabindex="-1" {%- if params.hrefAttributes %}{%- for attribute, value in params.hrefAttributes.items() %} {{ attribute }}="{{ value }}"{% endfor %}{% endif %}>
+    <a href="{{ params.href }}" class="tna-card__image-container{% if params.hrefClasses %} {{ params.hrefClasses }}{% endif %}" tabindex="-1" {%- if params.hrefAttributes %}{%- for attribute, value in params.hrefAttributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}>
     {%- else %}
     <div class="tna-card__image-container">
     {%- endif %}
@@ -85,7 +85,7 @@
   {%- if params.actions %}
     <div class="tna-card__actions">
     {%- for item in params.actions %}
-      <a href="{{ item.href }}" class="tna-card__action{% if item.classes %} {{ item.classes }}{% endif %}" {%- if item.title %} title="{{ item.title }}"{% endif %} {%- if item.attributes %}{% for attribute, value in item.attributes.items() %} {{ attribute }}="{{ value }}"{% endfor %}{% endif %}>
+      <a href="{{ item.href }}" class="tna-card__action{% if item.classes %} {{ item.classes }}{% endif %}" {%- if item.title %} title="{{ item.title }}"{% endif %} {%- if item.attributes %}{% for attribute, value in item.attributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}>
         {{ item.text }}
       </a>
     {%- endfor %}
diff --git a/tna_frontend_jinja/templates/components/checkboxes/macro.html b/tna_frontend_jinja/templates/components/checkboxes/macro.html
index 326465e..ee5f67b 100644
--- a/tna_frontend_jinja/templates/components/checkboxes/macro.html
+++ b/tna_frontend_jinja/templates/components/checkboxes/macro.html
@@ -3,7 +3,7 @@
 {%- if params.inline -%}
   {%- set containerClasses = containerClasses + ['tna-form__group--inline'] -%}
 {%- endif -%}
-<div class="tna-form__group{% if params.error %} tna-form__group--error{% endif %} {{ ' '.join(containerClasses) }}" {%- if params.formGroupAttributes %}{% for attribute, value in params.formGroupAttributes.items() %} {{ attribute }}="{{ value }}"{% endfor %}{% endif %}>
+<div class="tna-form__group{% if params.error %} tna-form__group--error{% endif %} {{ ' '.join(containerClasses) }}" {%- if params.formGroupAttributes %}{% for attribute, value in params.formGroupAttributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}>
   <fieldset class="tna-form__fieldset"{%- if params.hint or params.error %} aria-describedby="{%- if params.hint -%}{{ params.id }}-hint{%- endif %} {% if params.error -%}{{ params.id }}-error{%- endif -%}"{%- endif %}>
     <legend class="tna-form__legend">
       <h{{ params.headingLevel }} class="tna-form__heading tna-form__heading--{{ params.headingSize or 'm' }}">
@@ -31,8 +31,8 @@
   <div class="tna-checkboxes__item">
     <input type="checkbox" id="{{ params.id }}-{{ item.value }}" value="{{ item.value }}" name="{{ params.name }}"
     {%- if item.checked %} checked{% endif %}
-    {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}="{{ value }}"{% endfor %}{% endif %}
-    {%- if extraAttributes %}{% for attribute, value in extraAttributes.items() %} {{ attribute }}="{{ value }}"{% endfor %}{% endif %}>
+    {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}
+    {%- if extraAttributes %}{% for attribute, value in extraAttributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}>
     <label for="{{ params.id }}-{{ item.value }}" class="tna-checkboxes__item-label">
       {{ item.text }}
     </label>
diff --git a/tna_frontend_jinja/templates/components/compound-filters/macro.html b/tna_frontend_jinja/templates/components/compound-filters/macro.html
index d906ac6..15b37c0 100644
--- a/tna_frontend_jinja/templates/components/compound-filters/macro.html
+++ b/tna_frontend_jinja/templates/components/compound-filters/macro.html
@@ -1,6 +1,6 @@
 {% macro tnaCompoundFilters(params) %}
 {%- set containerClasses = [params.classes] if params.classes else [] -%}
-<ul class="tna-compound-filters {{ containerClasses | join(' ') }}" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}="{{ value }}"{% endfor %}{% endif %}>
+<ul class="tna-compound-filters {{ containerClasses | join(' ') }}" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}>
   {%- for item in params['items'] -%}
   <li class="tna-compound-filters__item">
     <span class="tna-compound-filters__label">{{ item.label }}</span>
diff --git a/tna_frontend_jinja/templates/components/cookie-banner/macro.html b/tna_frontend_jinja/templates/components/cookie-banner/macro.html
index 0ebe9e2..c6673ce 100644
--- a/tna_frontend_jinja/templates/components/cookie-banner/macro.html
+++ b/tna_frontend_jinja/templates/components/cookie-banner/macro.html
@@ -2,7 +2,7 @@
 {% from "components/button/macro.html" import tnaButton %}
 
 {%- set containerClasses = [params.classes] if params.classes else [] -%}
-<section class="tna-cookie-banner {{ ' '.join(containerClasses) }}" data-module="tna-cookie-banner" data-policies="{{ params.policies if params.policies }}" data-preferenceskey="{{ params.preferencesSetKey if params.preferencesSetKey }}" data-policieskey="{{ params.policiesKey if params.policiesKey }}" data-domain="{{ params.cookiesDomain if params.cookiesDomain }}" data-path="{{ params.cookiesPath if params.cookiesPath }}" data-insecure="{{ 'true' if params.allowInsecure else 'false' }}" aria-label="Cookies on {{ params.serviceName }}" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}="{{ value }}"{% endfor %}{% endif %} hidden>
+<section class="tna-cookie-banner {{ ' '.join(containerClasses) }}" data-module="tna-cookie-banner" data-policies="{{ params.policies if params.policies }}" data-preferenceskey="{{ params.preferencesSetKey if params.preferencesSetKey }}" data-policieskey="{{ params.policiesKey if params.policiesKey }}" data-domain="{{ params.cookiesDomain if params.cookiesDomain }}" data-path="{{ params.cookiesPath if params.cookiesPath }}" data-insecure="{{ 'true' if params.allowInsecure else 'false' }}" aria-label="Cookies on {{ params.serviceName }}" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %} hidden>
   <div class="tna-container">
     <div class="tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--prompt">
       <h2 class="tna-heading-m">This website uses cookies</h2>
diff --git a/tna_frontend_jinja/templates/components/date-input/macro.html b/tna_frontend_jinja/templates/components/date-input/macro.html
index 0e6f7f5..c478e6e 100644
--- a/tna_frontend_jinja/templates/components/date-input/macro.html
+++ b/tna_frontend_jinja/templates/components/date-input/macro.html
@@ -3,7 +3,7 @@
 {%- if params.inline -%}
   {%- set containerClasses = containerClasses + ['tna-form__group--inline'] -%}
 {%- endif -%}
-<div class="tna-form__group{% if params.error %} tna-form__group--error{% endif %} {{ ' '.join(containerClasses) }}" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}="{{ value }}"{% endfor %}{% endif %}>
+<div class="tna-form__group{% if params.error %} tna-form__group--error{% endif %} {{ ' '.join(containerClasses) }}" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}>
   <fieldset class="tna-form__fieldset"{%- if params.hint or params.error %} aria-describedby="{%- if params.hint -%}{{ params.id }}-hint{%- endif %} {% if params.error -%}{{ params.id }}-error{%- endif -%}"{%- endif %} role="group">
     <legend class="tna-form__legend">
       <h{{ params.headingLevel }} class="tna-form__heading tna-form__heading--{{ params.headingSize or 'm' }}">
diff --git a/tna_frontend_jinja/templates/components/date-search/macro.html b/tna_frontend_jinja/templates/components/date-search/macro.html
index 46f3814..7f84330 100644
--- a/tna_frontend_jinja/templates/components/date-search/macro.html
+++ b/tna_frontend_jinja/templates/components/date-search/macro.html
@@ -3,7 +3,7 @@
 {%- if params.inline -%}
   {%- set containerClasses = containerClasses + ['tna-form__group--inline'] -%}
 {%- endif -%}
-<div class="tna-form__group{% if params.error %} tna-form__group--error{% endif %} {{ ' '.join(containerClasses) }}" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}="{{ value }}"{% endfor %}{% endif %}>
+<div class="tna-form__group{% if params.error %} tna-form__group--error{% endif %} {{ ' '.join(containerClasses) }}" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}>
   <div class="tna-form__group-contents">
     <h{{ params.headingLevel }} class="tna-form__heading tna-form__heading--{{ params.headingSize or 'm' }}">
       <label class="tna-form__label" for="{{ params.id }}">
@@ -29,6 +29,6 @@
 {%- set inputClasses = [params.classes] if params.classes else [] -%}
 <input type="date" id="{{ params.id }}" class="tna-date-search{% if params.maxWidth %} tna-date-search--max-width{% endif %} {{ inputClasses | join(' ') }}" name="{{ params.name }}" value="{{ params.value }}"
 {%- if params.hint or params.error %} aria-describedby="{%- if params.hint -%}{{ params.id }}-hint{%- endif %} {% if params.error -%}{{ params.id }}-error{%- endif -%}"{%- endif %}
-{%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}="{{ value }}"{% endfor %}{% endif %}
-{%- if extraAttributes %}{% for attribute, value in extraAttributes.items() %} {{ attribute }}="{{ value }}"{% endfor %}{% endif %}>
+{%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}
+{%- if extraAttributes %}{% for attribute, value in extraAttributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}>
 {% endmacro %}
\ No newline at end of file
diff --git a/tna_frontend_jinja/templates/components/details/macro.html b/tna_frontend_jinja/templates/components/details/macro.html
index a62cece..4487dfe 100644
--- a/tna_frontend_jinja/templates/components/details/macro.html
+++ b/tna_frontend_jinja/templates/components/details/macro.html
@@ -1,7 +1,7 @@
 {% macro tnaDetails(params) %}
 {%- set containerClasses = [params.classes] if params.classes else [] -%}
 {%- set classes = containerClasses | join(' ') -%}
-<div class="tna-details{% if classes %} {{ classes }}{% endif %}" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}="{{ value }}"{% endfor %}{% endif %}>
+<div class="tna-details{% if classes %} {{ classes }}{% endif %}" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}>
   <details class="tna-details__details"{%- if params.open %} open{% endif %}>
     <summary class="tna-details__summary">{{ params.title }}</summary>
     <div class="tna-details__content">
diff --git a/tna_frontend_jinja/templates/components/error-summary/macro.html b/tna_frontend_jinja/templates/components/error-summary/macro.html
index 6cbbf2b..f07f5ff 100644
--- a/tna_frontend_jinja/templates/components/error-summary/macro.html
+++ b/tna_frontend_jinja/templates/components/error-summary/macro.html
@@ -1,6 +1,6 @@
 {% macro tnaErrorSummary(params) %}
 {%- set containerClasses = [params.classes] if params.classes else [] -%}
-<div class="tna-error-summary {{ ' '.join(containerClasses) }}" data-module="tna-error-summary" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}="{{ value }}"{% endfor %}{% endif %}{%- if params.disableAutoFocus != undefined %} data-disableautofocus="{{ params.disableAutoFocus | lower }}"{% endif %}>
+<div class="tna-error-summary {{ ' '.join(containerClasses) }}" data-module="tna-error-summary" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}{%- if params.disableAutoFocus != undefined %} data-disableautofocus="{{ params.disableAutoFocus | lower }}"{% endif %}>
   <div role="alert">
     <h{{ params.headingLevel }} class="tna-error-summary__heading tna-heading-m">
       {{ params.title }}
diff --git a/tna_frontend_jinja/templates/components/featured-records/macro.html b/tna_frontend_jinja/templates/components/featured-records/macro.html
index 47c9b40..b04cdb1 100644
--- a/tna_frontend_jinja/templates/components/featured-records/macro.html
+++ b/tna_frontend_jinja/templates/components/featured-records/macro.html
@@ -1,6 +1,6 @@
 {% macro tnaFeaturedRecords(params) %}
 {%- set containerClasses = [params.classes] if params.classes else [] -%}
-<ul class="tna-featured-records {{ ' '.join(containerClasses) }}" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}="{{ value }}"{% endfor %}{% endif %}>
+<ul class="tna-featured-records {{ ' '.join(containerClasses) }}" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}>
   {%- for item in params['items'] %}
   <li class="tna-featured-records__item">
     {%- if item.imageSrc %}
diff --git a/tna_frontend_jinja/templates/components/files/macro.html b/tna_frontend_jinja/templates/components/files/macro.html
new file mode 100644
index 0000000..5a3c462
--- /dev/null
+++ b/tna_frontend_jinja/templates/components/files/macro.html
@@ -0,0 +1,35 @@
+{% macro tnaFiles(params) %}
+{%- set containerClasses = [params.classes] if params.classes else [] -%}
+{%- set classes = containerClasses | join(' ') -%}
+<div class="tna-files{% if classes %} {{ classes }}{% endif %}" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}>
+  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" class="tna-files__icon"><!--!Font Awesome Free 6.5.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d="M288 32c0-17.7-14.3-32-32-32s-32 14.3-32 32V274.7l-73.4-73.4c-12.5-12.5-32.8-12.5-45.3 0s-12.5 32.8 0 45.3l128 128c12.5 12.5 32.8 12.5 45.3 0l128-128c12.5-12.5 12.5-32.8 0-45.3s-32.8-12.5-45.3 0L288 274.7V32zM64 352c-35.3 0-64 28.7-64 64v32c0 35.3 28.7 64 64 64H448c35.3 0 64-28.7 64-64V416c0-35.3-28.7-64-64-64H346.5l-45.3 45.3c-25 25-65.5 25-90.5 0L165.5 352H64zm368 56a24 24 0 1 1 0 48 24 24 0 1 1 0-48z"/></svg>
+  <ul class="tna-files__items">
+    {%- for item in params['items'] %}
+    <li class="tna-files__item">
+      <p class="tna-files__item-title">
+        <a href="{{ item.href }}" class="tna-files__link">{{ item.text }}</a>
+      </p>
+      <dl class="tna-dl-chips tna-dl-chips--plain tna-files__item-meta">
+        <dt>File type</dt>
+        <dd>
+          <span class="tna-dl-chips__item">{{ item.fileType }}</span>
+        </dd>
+        <dt>File size</dt>
+        <dd>
+          <span class="tna-dl-chips__item">{{ item.fileSize }}</span>
+        </dd>
+        {% if item.fileExtent %}
+        <dt>Extent</dt>
+        <dd>
+          <span class="tna-dl-chips__item">{{ item.fileExtent }}</span>
+        </dd>
+        {% endif %}
+      </dl>
+      {% if item.description %}
+      <p class="tna-files__item-description">{{ item.description }}</p>
+      {% endif %}
+    </li>
+    {%- endfor %}
+  </ul>
+</div>
+{% endmacro %}
\ No newline at end of file
diff --git a/tna_frontend_jinja/templates/components/footer/macro.html b/tna_frontend_jinja/templates/components/footer/macro.html
index a76ac90..a5a9645 100644
--- a/tna_frontend_jinja/templates/components/footer/macro.html
+++ b/tna_frontend_jinja/templates/components/footer/macro.html
@@ -2,7 +2,7 @@
 {% from "components/button/macro.html" import tnaButton %}
 
 {%- set containerClasses = [params.classes] if params.classes else [] -%}
-<footer class="tna-footer {{ ' '.join(containerClasses) }}" data-module="tna-footer" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}="{{ value }}"{% endfor %}{% endif %}>
+<footer class="tna-footer {{ ' '.join(containerClasses) }}" data-module="tna-footer" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}>
   {%- if params.themeSelector %}
   <section class="tna-footer__theme-selector tna-background-tint" hidden>
     <div class="tna-container tna-!--padding-vertical-xs">
diff --git a/tna_frontend_jinja/templates/components/gallery/macro.html b/tna_frontend_jinja/templates/components/gallery/macro.html
new file mode 100644
index 0000000..36a1c99
--- /dev/null
+++ b/tna_frontend_jinja/templates/components/gallery/macro.html
@@ -0,0 +1,85 @@
+{% macro tnaGallery(params) %}
+{% from "components/button/macro.html" import tnaButton %}
+
+{%- set containerClasses = [params.classes] if params.classes else [] -%}
+{%- set classes = containerClasses | join(' ') -%}
+<section class="tna-gallery{% if classes %} {{ classes }}{% endif %}" data-module="tna-gallery" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}>
+  <div class="tna-gallery__header">
+    <div class="tna-gallery__header-inner">
+      <h{{ params.headingLevel }} class="tna-heading-{{ params.headingSize or 'm' }}">
+        {{ params.title }}
+      </h{{ params.headingLevel }}>
+      {%- if params.text %}
+        <p>{{ params.text }}</p>
+      {%- else %}
+        {{ params.body | safe }}
+      {%- endif %}
+    </div>
+    <div class="tna-gallery__options tna-button-group tna-button-group--small" hidden>
+      {{ tnaButton({
+        'text': 'See all images',
+        'iconSvg': '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!--!Font Awesome Free 6.5.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d="M128 136c0-22.1-17.9-40-40-40L40 96C17.9 96 0 113.9 0 136l0 48c0 22.1 17.9 40 40 40H88c22.1 0 40-17.9 40-40l0-48zm0 192c0-22.1-17.9-40-40-40H40c-22.1 0-40 17.9-40 40l0 48c0 22.1 17.9 40 40 40H88c22.1 0 40-17.9 40-40V328zm32-192v48c0 22.1 17.9 40 40 40h48c22.1 0 40-17.9 40-40V136c0-22.1-17.9-40-40-40l-48 0c-22.1 0-40 17.9-40 40zM288 328c0-22.1-17.9-40-40-40H200c-22.1 0-40 17.9-40 40l0 48c0 22.1 17.9 40 40 40h48c22.1 0 40-17.9 40-40V328zm32-192v48c0 22.1 17.9 40 40 40h48c22.1 0 40-17.9 40-40V136c0-22.1-17.9-40-40-40l-48 0c-22.1 0-40 17.9-40 40zM448 328c0-22.1-17.9-40-40-40H360c-22.1 0-40 17.9-40 40v48c0 22.1 17.9 40 40 40h48c22.1 0 40-17.9 40-40V328z"/></svg>',
+        'iconOnlyOnMobile': True,
+        'buttonElement': True,
+        'attributes': {
+          'hidden': '',
+          'value': 'show-index'
+        }
+      }) | indent(6) }}
+      {{ tnaButton({
+        'text': 'Full screen',
+        'iconSvg': '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!--!Font Awesome Free 6.5.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d="M32 32C14.3 32 0 46.3 0 64v96c0 17.7 14.3 32 32 32s32-14.3 32-32V96h64c17.7 0 32-14.3 32-32s-14.3-32-32-32H32zM64 352c0-17.7-14.3-32-32-32s-32 14.3-32 32v96c0 17.7 14.3 32 32 32h96c17.7 0 32-14.3 32-32s-14.3-32-32-32H64V352zM320 32c-17.7 0-32 14.3-32 32s14.3 32 32 32h64v64c0 17.7 14.3 32 32 32s32-14.3 32-32V64c0-17.7-14.3-32-32-32H320zM448 352c0-17.7-14.3-32-32-32s-32 14.3-32 32v64H320c-17.7 0-32 14.3-32 32s14.3 32 32 32h96c17.7 0 32-14.3 32-32V352z"/></svg>',
+        'iconOnlyOnMobile': True,
+        'buttonElement': True,
+        'attributes': {
+          'hidden': '',
+          'value': 'enter-fullscreen'
+        }
+      }) | indent(6) }}
+      {{ tnaButton({
+        'text': 'Exit full screen',
+        'iconSvg': '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!--!Font Awesome Free 6.5.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d="M160 64c0-17.7-14.3-32-32-32s-32 14.3-32 32v64H32c-17.7 0-32 14.3-32 32s14.3 32 32 32h96c17.7 0 32-14.3 32-32V64zM32 320c-17.7 0-32 14.3-32 32s14.3 32 32 32H96v64c0 17.7 14.3 32 32 32s32-14.3 32-32V352c0-17.7-14.3-32-32-32H32zM352 64c0-17.7-14.3-32-32-32s-32 14.3-32 32v96c0 17.7 14.3 32 32 32h96c17.7 0 32-14.3 32-32s-14.3-32-32-32H352V64zM320 320c-17.7 0-32 14.3-32 32v96c0 17.7 14.3 32 32 32s32-14.3 32-32V384h64c17.7 0 32-14.3 32-32s-14.3-32-32-32H320z"/></svg>',
+        'iconOnlyOnMobile': True,
+        'buttonElement': True,
+        'attributes': {
+          'hidden': '',
+          'value': 'exit-fullscreen'
+        }
+      }) | indent(6) }}
+    </div>
+  </div>
+  <div class="tna-gallery__items">
+    {%- for item in params['items'] %}
+    <div class="tna-gallery__item" id="{{ params.id }}-item-{{ loop.index }}" aria-labeledby="{{ params.id }}-item-{{ loop.index }}-tab" role="tabpanel">
+      <p class="tna-gallery__item-header">Image {{ loop.index }} of {{ params['items'] | length }}</p>
+      <figure class="tna-gallery__item-figure">
+        <div class="tna-gallery__item-figure-inner">
+          <img src="{{ item.src }}" class="tna-gallery__item-image" alt="{{ item.alt }}" width="{{ item.width }}" height="{{ item.height }}">
+        </div>
+        {%- if item.description %}
+        <figcaption class="tna-gallery__item-description">
+          <p>{{ item.description }}</p>
+        </figcaption>
+        {%- endif %}
+      </figure>
+    </div>
+    {%- endfor %}
+  </div>
+  <div class="tna-gallery__navigation-buttons" hidden>
+    <button type="button" class="tna-gallery__navigation-button tna-gallery__navigation-prev">
+      <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 512"><!--!Font Awesome Free 6.5.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d="M9.4 233.4c-12.5 12.5-12.5 32.8 0 45.3l192 192c12.5 12.5 32.8 12.5 45.3 0s12.5-32.8 0-45.3L77.3 256 246.6 86.6c12.5-12.5 12.5-32.8 0-45.3s-32.8-12.5-45.3 0l-192 192z"/></svg>
+    </button>
+    <button type="button" class="tna-gallery__navigation-button tna-gallery__navigation-next">
+      <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 512"><!--!Font Awesome Free 6.5.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d="M310.6 233.4c12.5 12.5 12.5 32.8 0 45.3l-192 192c-12.5 12.5-32.8 12.5-45.3 0s-12.5-32.8 0-45.3L242.7 256 73.4 86.6c-12.5-12.5-12.5-32.8 0-45.3s32.8-12.5 45.3 0l192 192z"/></svg>
+    </button>
+  </div>
+  <div class="tna-gallery__navigation" role="tablist" hidden>
+    {%- for item in params['items'] -%}
+    <button type="button" class="tna-gallery__navigation-item" role="tab" id="{{ params.id }}-item-{{ loop.index }}-tab" title="Photo {{ loop.index }} of {{ params['items'] | length }}" aria-controls="{{ params.id }}-item-{{ loop.index }}">
+      <img src="{{ item.src }}" class="tna-gallery__navigation-item-image" alt="" width="{{ item.width }}" height="{{ item.height }}" aria-hidden>
+      <span class="tna-gallery__navigation-item-label">{{ loop.index }}</span>
+    </button>
+    {%- endfor -%}
+  </div>
+</section>
+{% endmacro %}
\ No newline at end of file
diff --git a/tna_frontend_jinja/templates/components/global-header/macro.html b/tna_frontend_jinja/templates/components/global-header/macro.html
index 0e6a905..d536c30 100644
--- a/tna_frontend_jinja/templates/components/global-header/macro.html
+++ b/tna_frontend_jinja/templates/components/global-header/macro.html
@@ -3,7 +3,7 @@
 {%- if params.collapseOnMedium -%}
   {%- set containerClasses = containerClasses + ['tna-global-header--collapse-on-medium'] -%}
 {%- endif -%}
-<header class="tna-global-header {{ ' '.join(containerClasses) }}" data-module="tna-global-header" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}="{{ value }}"{% endfor %}{% endif %}>
+<header class="tna-global-header {{ ' '.join(containerClasses) }}" data-module="tna-global-header" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}>
   <div class="tna-container tna-global-header__main">
     <div class="tna-column tna-column--flex-1 tna-column--order-2">
       <span class="tna-global-header__logo-wrapper">
diff --git a/tna_frontend_jinja/templates/components/grid/macro.html b/tna_frontend_jinja/templates/components/grid/macro.html
index a4e5efd..3c06919 100644
--- a/tna_frontend_jinja/templates/components/grid/macro.html
+++ b/tna_frontend_jinja/templates/components/grid/macro.html
@@ -10,7 +10,7 @@
 {%- if params.noPaddingAll -%}
   {%- set containerClasses = containerClasses + ['tna-container--no-padding-all'] -%}
 {%- endif -%}
-<{{ htmlElement }} class="tna-container {{ ' '.join(containerClasses) }}" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}="{{ value }}"{% endfor %}{% endif %}>
+<{{ htmlElement }} class="tna-container {{ ' '.join(containerClasses) }}" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}>
 {%- for item in params.columns %}
   {%- set columnHtmlElement = item.htmlElement if item.htmlElement else 'div' -%}
   {%- set columnClasses = [item.classes] if item.classes else [] -%}
diff --git a/tna_frontend_jinja/templates/components/header/macro.html b/tna_frontend_jinja/templates/components/header/macro.html
index f2bb843..b58a2d0 100644
--- a/tna_frontend_jinja/templates/components/header/macro.html
+++ b/tna_frontend_jinja/templates/components/header/macro.html
@@ -1,6 +1,6 @@
 {% macro tnaHeader(params) %}
 {%- set containerClasses = [params.classes] if params.classes else [] -%}
-<header class="tna-header {{ ' '.join(containerClasses) }}" data-module="tna-header" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}="{{ value }}"{% endfor %}{% endif %}>
+<header class="tna-header {{ ' '.join(containerClasses) }}" data-module="tna-header" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}>
   {%- if params.exit -%}
   <div class="tna-header__exit">
     <div class="tna-container">
diff --git a/tna_frontend_jinja/templates/components/hero/macro.html b/tna_frontend_jinja/templates/components/hero/macro.html
index 1a0bb71..8b31b7e 100644
--- a/tna_frontend_jinja/templates/components/hero/macro.html
+++ b/tna_frontend_jinja/templates/components/hero/macro.html
@@ -18,7 +18,7 @@
   {%- set containerClasses = containerClasses + ['tna-hero--narrow'] -%}
 {%- endif -%}
 {% set hasContent = params.title or params.body or params.text %}
-<{{ 'header' if hasContent else 'div' }} class="tna-hero {{ ' '.join(containerClasses) }}" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}="{{ value }}"{% endfor %}{% endif %}>
+<{{ 'header' if hasContent else 'div' }} class="tna-hero {{ ' '.join(containerClasses) }}" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}>
   <figure class="tna-hero__figure">
     {%- if params.imageCaption -%}
     <figcaption class="tna-hero__caption">
diff --git a/tna_frontend_jinja/templates/components/index-grid/macro.html b/tna_frontend_jinja/templates/components/index-grid/macro.html
index bc0b359..269c5b7 100644
--- a/tna_frontend_jinja/templates/components/index-grid/macro.html
+++ b/tna_frontend_jinja/templates/components/index-grid/macro.html
@@ -1,6 +1,6 @@
 {% macro tnaIndexGrid(params) %}
 {%- set containerClasses = [params.classes] if params.classes else [] -%}
-<nav class="tna-index-grid {{ ' '.join(containerClasses) }}" aria-label="{{ params.title }}" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}="{{ value }}"{% endfor %}{% endif %}>
+<nav class="tna-index-grid {{ ' '.join(containerClasses) }}" aria-label="{{ params.title }}" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}>
   <div class="tna-container">
     <div class="tna-column tna-column--width-2-3 tna-column--width-5-6-medium tna-column--full-small tna-column--full-tiny">
       {%- if params.supertitle %}
@@ -8,7 +8,7 @@
         <p class="tna-hgroup__supertitle{% if params.plainSupertitle %} tna-hgroup__supertitle--plain{% endif %}">{{ params.supertitle }}</p>
         <h{{ params.headingLevel }} class="tna-hgroup__title">
           {%- if params.href %}
-          <a href="{{ params.href }}" class="tna-index-grid__heading-link{% if params.hrefClasses %} {{ params.hrefClasses }}{% endif %}" {%- for attribute, value in params.hrefAttributes %} {{ attribute }}="{{ value }}"{% endfor %}>{{ params.title }}</a>
+          <a href="{{ params.href }}" class="tna-index-grid__heading-link{% if params.hrefClasses %} {{ params.hrefClasses }}{% endif %}" {%- for attribute, value in params.hrefAttributes %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}>{{ params.title }}</a>
           {%- else %}
           {{ params.title }}
           {%- endif %}
@@ -17,7 +17,7 @@
     {%- else %}
       <h{{ params.headingLevel }} class="tna-heading-{{ params.headingSize or 'l' }} tna-index-grid__heading">
         {%- if params.href %}
-        <a href="{{ params.href }}" class="tna-index-grid__heading-link{% if params.hrefClasses %} {{ params.hrefClasses }}{% endif %}" {%- for attribute, value in params.hrefAttributes %} {{ attribute }}="{{ value }}"{% endfor %}>{{ params.title }}</a>
+        <a href="{{ params.href }}" class="tna-index-grid__heading-link{% if params.hrefClasses %} {{ params.hrefClasses }}{% endif %}" {%- for attribute, value in params.hrefAttributes %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}>{{ params.title }}</a>
         {%- else %}
         {{ params.title }}
         {%- endif %}
diff --git a/tna_frontend_jinja/templates/components/pagination/macro.html b/tna_frontend_jinja/templates/components/pagination/macro.html
index 827ccfe..438d463 100644
--- a/tna_frontend_jinja/templates/components/pagination/macro.html
+++ b/tna_frontend_jinja/templates/components/pagination/macro.html
@@ -5,7 +5,7 @@
 {%- if params.spaced -%}
   {%- set containerClasses = containerClasses + ['tna-pagination--spaced'] -%}
 {%- endif -%}
-<nav class="tna-pagination {{ ' '.join(containerClasses) }}" aria-label="{{ params.landmarkLabel if params.landmarkLabel else 'Pagination' }}" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}="{{ value }}"{% endfor %}{% endif %}>
+<nav class="tna-pagination {{ ' '.join(containerClasses) }}" aria-label="{{ params.landmarkLabel if params.landmarkLabel else 'Pagination' }}" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}>
   {% if params.previous -%}
   <div class="tna-pagination__prev">
     {{ tnaButton({
diff --git a/tna_frontend_jinja/templates/components/phase-banner/macro.html b/tna_frontend_jinja/templates/components/phase-banner/macro.html
index eb76536..78aec48 100644
--- a/tna_frontend_jinja/templates/components/phase-banner/macro.html
+++ b/tna_frontend_jinja/templates/components/phase-banner/macro.html
@@ -3,7 +3,7 @@
 {%- if params.accent -%}
   {%- set containerClasses = containerClasses + ['tna-phase-banner--accent'] -%}
 {%- endif -%}
-<div class="tna-phase-banner {{ ' '.join(containerClasses) }}" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}="{{ value }}"{% endfor %}{% endif %}>
+<div class="tna-phase-banner {{ ' '.join(containerClasses) }}" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}>
   <div class="tna-container">
     <div class="tna-column tna-column--full-tiny">
       <span class="tna-phase-banner__phase">
diff --git a/tna_frontend_jinja/templates/components/picture/macro.html b/tna_frontend_jinja/templates/components/picture/macro.html
index 9128203..2c26e4d 100644
--- a/tna_frontend_jinja/templates/components/picture/macro.html
+++ b/tna_frontend_jinja/templates/components/picture/macro.html
@@ -2,7 +2,7 @@
 {% from "components/tabs/macro.html" import tnaTabs %}
 
 {%- set containerClasses = [params.classes] if params.classes else [] -%}
-<figure class="tna-picture {{ ' '.join(containerClasses) }}" data-module="tna-picture"{% if params.informationLabelOpen %} data-informationlabelopen="{{ params.informationLabelOpen }}"{% endif %}{% if params.informationLabelClose %} data-informationlabelclose="{{ params.informationLabelClose }}"{% endif %} {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}="{{ value }}"{% endfor %}{% endif %}>
+<figure class="tna-picture {{ ' '.join(containerClasses) }}" data-module="tna-picture"{% if params.informationLabelOpen %} data-informationlabelopen="{{ params.informationLabelOpen }}"{% endif %}{% if params.informationLabelClose %} data-informationlabelclose="{{ params.informationLabelClose }}"{% endif %} {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}>
   <div class="tna-picture__image-wrapper tna-background-tint">
     <picture>
     {%- for source in params.sources -%}
diff --git a/tna_frontend_jinja/templates/components/quick-filters/macro.html b/tna_frontend_jinja/templates/components/quick-filters/macro.html
index be21d79..7c75de5 100644
--- a/tna_frontend_jinja/templates/components/quick-filters/macro.html
+++ b/tna_frontend_jinja/templates/components/quick-filters/macro.html
@@ -1,6 +1,6 @@
 {% macro tnaQuickFilters(params) %}
 {%- set containerClasses = [params.classes] if params.classes else [] -%}
-<ul class="tna-quick-filters{% if params.stack %} tna-quick-filters--stacked{% endif %} {% if params.fill %} tna-quick-filters--filled{% endif %} {{ ' '.join(containerClasses) }}" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}="{{ value }}"{% endfor %}{% endif %}>
+<ul class="tna-quick-filters{% if params.stack %} tna-quick-filters--stacked{% endif %} {% if params.fill %} tna-quick-filters--filled{% endif %} {{ ' '.join(containerClasses) }}" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}>
   {%- for item in params['items'] -%}
   <li class="tna-quick-filters__item{%- if item.selected %} tna-quick-filters__item--selected{% endif %}">
     <a href="{{ item.href }}" {%- if item.title %} title="{{ item.title }}"{% endif %} class="tna-quick-filters__link">{{ item.label }}</a>
diff --git a/tna_frontend_jinja/templates/components/radios/macro.html b/tna_frontend_jinja/templates/components/radios/macro.html
index b939ae9..75c54b1 100644
--- a/tna_frontend_jinja/templates/components/radios/macro.html
+++ b/tna_frontend_jinja/templates/components/radios/macro.html
@@ -3,7 +3,7 @@
 {%- if params.inline -%}
   {%- set containerClasses = containerClasses + ['tna-form__group--inline'] -%}
 {%- endif -%}
-<div class="tna-form__group{% if params.error %} tna-form__group--error{% endif %} {{ ' '.join(containerClasses) }}" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}="{{ value }}"{% endfor %}{% endif %}>
+<div class="tna-form__group{% if params.error %} tna-form__group--error{% endif %} {{ ' '.join(containerClasses) }}" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}>
   <fieldset class="tna-form__fieldset"{%- if params.hint or params.error %} aria-describedby="{%- if params.hint -%}{{ params.id }}-hint{%- endif %} {% if params.error -%}{{ params.id }}-error{%- endif -%}"{%- endif %}>
     <legend class="tna-form__legend">
       <h{{ params.headingLevel }} class="tna-form__heading tna-form__heading--{{ params.headingSize or 'm' }}">
diff --git a/tna_frontend_jinja/templates/components/search-field/macro.html b/tna_frontend_jinja/templates/components/search-field/macro.html
index 15473f5..d68046f 100644
--- a/tna_frontend_jinja/templates/components/search-field/macro.html
+++ b/tna_frontend_jinja/templates/components/search-field/macro.html
@@ -1,7 +1,7 @@
 {% macro tnaSearchField(params) %}
 {%- set containerClasses = [params.formGroupClasses] if params.formGroupClasses else [] -%}
 {%- set inputClasses = [params.classes] if params.classes else [] -%}
-<div class="tna-search-field {{ ' '.join(containerClasses) }}" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}="{{ value }}"{% endfor %}{% endif %}>
+<div class="tna-search-field {{ ' '.join(containerClasses) }}" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}>
   <div class="tna-form__group{% if params.error %} tna-form__group--error{% endif %} {{ ' '.join(containerClasses) }}">
     <div class="tna-form__group-contents">
       <h{{ params.headingLevel }} class="tna-form__heading tna-form__heading--{{ params.headingSize or 'm' }}">
@@ -21,7 +21,7 @@
       {%- if params.maxLength %} maxlength="{{ params.maxLength }}"{% endif %}
       {%- if params.autofill %} autofill="{{ params.autofill }}"{% endif %}
       {%- if params.inputmode %} inputmode="{{ params.inputmode }}"{% endif %}
-      {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}="{{ value }}"{% endfor %}{% endif %}>
+      {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}>
       <button type="submit" class="tna-button tna-search-field__button">
         Search
         <i class="fa-solid fa-fw fa-arrow-right tna-!--hide-on-tiny" aria-hidden="true"></i>
diff --git a/tna_frontend_jinja/templates/components/search-filters/macro.html b/tna_frontend_jinja/templates/components/search-filters/macro.html
index 0fd8c9c..6726592 100644
--- a/tna_frontend_jinja/templates/components/search-filters/macro.html
+++ b/tna_frontend_jinja/templates/components/search-filters/macro.html
@@ -6,7 +6,7 @@
 {% from "components/text-input/macro.html" import tnaTextInputElement %}
 
 {%- set containerClasses = [params.classes] if params.classes else [] -%}
-<div class="tna-search-filters {{ ' '.join(containerClasses) }}" data-module="tna-search-filters" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}="{{ value }}"{% endfor %}{% endif %}>
+<div class="tna-search-filters {{ ' '.join(containerClasses) }}" data-module="tna-search-filters" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}>
   <h{{ params.rootHeadingLevel }} class="tna-heading-m tna-search-filters__title">
     {{ params.title }}
   </h{{ params.rootHeadingLevel }}>
diff --git a/tna_frontend_jinja/templates/components/select/macro.html b/tna_frontend_jinja/templates/components/select/macro.html
index cc76b8f..27290a2 100644
--- a/tna_frontend_jinja/templates/components/select/macro.html
+++ b/tna_frontend_jinja/templates/components/select/macro.html
@@ -4,7 +4,7 @@
 {%- if params.inline -%}
   {%- set containerClasses = containerClasses + ['tna-form__group--inline'] -%}
 {%- endif -%}
-<div class="tna-form__group{% if params.error %} tna-form__group--error{% endif %} {{ ' '.join(containerClasses) }}" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}="{{ value }}"{% endfor %}{% endif %}>
+<div class="tna-form__group{% if params.error %} tna-form__group--error{% endif %} {{ ' '.join(containerClasses) }}" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}>
   <div class="tna-form__group-contents">
     <h{{ params.headingLevel }} class="tna-form__heading tna-form__heading--{{ params.headingSize or 'm' }}">
       <label class="tna-form__label" for="{{ params.id }}">
@@ -22,7 +22,7 @@
     </p>
     {%- endif %}
   </div>
-  <select class="tna-select{% if params.size %} tna-select--{{ params.size }}{% endif %} {{ inputClasses | join(' ') }}" name="{{ params.name }}" id="{{ params.id }}"{% if params.hint %} aria-describedby="{{ params.id }}-hint"{% endif %} {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}="{{ value }}"{% endfor %}{% endif %}>
+  <select class="tna-select{% if params.size %} tna-select--{{ params.size }}{% endif %} {{ inputClasses | join(' ') }}" name="{{ params.name }}" id="{{ params.id }}"{% if params.hint %} aria-describedby="{{ params.id }}-hint"{% endif %} {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}>
     {%- for item in params['items'] %}
     <option value="{{ item.value }}"{% if item.value == params.selected %} selected{% endif %}>{{ item.text }}</option>
     {%- endfor %}
diff --git a/tna_frontend_jinja/templates/components/sensitive-image/macro.html b/tna_frontend_jinja/templates/components/sensitive-image/macro.html
index 9be8b3a..fdb2b55 100644
--- a/tna_frontend_jinja/templates/components/sensitive-image/macro.html
+++ b/tna_frontend_jinja/templates/components/sensitive-image/macro.html
@@ -1,6 +1,6 @@
 {% macro tnaSensitiveImage(params) %}
 {%- set containerClasses = [params.classes] if params.classes else [] -%}
-<div class="tna-sensitive-image {{ ' '.join(containerClasses) }}" data-module="tna-sensitive-image" style="--sensitive-image: url('{{ params.image.src }}'); --sensitive-image-width: {{ params.image.width }}; --sensitive-image-height: {{ params.image.height }}" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}="{{ value }}"{% endfor %}{% endif %}>
+<div class="tna-sensitive-image {{ ' '.join(containerClasses) }}" data-module="tna-sensitive-image" style="--sensitive-image: url('{{ params.image.src }}'); --sensitive-image-width: {{ params.image.width }}; --sensitive-image-height: {{ params.image.height }}" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}>
   <p class="tna-sensitive-image__warning">{{ params.warning }}</p>
   <details class="tna-sensitive-image__details">
     <summary class="tna-sensitive-image__show" data-action="{{ params.action }}">{{ params.action }}</summary>
diff --git a/tna_frontend_jinja/templates/components/sidebar/macro.html b/tna_frontend_jinja/templates/components/sidebar/macro.html
index 8fee566..572427d 100644
--- a/tna_frontend_jinja/templates/components/sidebar/macro.html
+++ b/tna_frontend_jinja/templates/components/sidebar/macro.html
@@ -11,9 +11,9 @@
   {%- set containerClasses = containerClasses + ['tna-sidebar--sticky'] -%}
 {%- endif -%}
 {%- set classes = ' '.join(containerClasses) -%}
-<nav class="tna-sidebar{% if classes %} {{ classes }}{% endif %}" aria-label="Sidebar" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}="{{ value }}"{% endfor %}{% endif %}>
+<nav class="tna-sidebar{% if classes %} {{ classes }}{% endif %}" aria-label="Sidebar" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}>
   <h{{ params.headingLevel }} class="tna-sidebar__heading tna-heading-m">
-    {{ params.heading }}
+    {{ params.title }}
   </h{{ params.headingLevel }}>
   <ul class="tna-sidebar__items">
     {%- for item in params['items'] %}
diff --git a/tna_frontend_jinja/templates/components/skip-link/macro.html b/tna_frontend_jinja/templates/components/skip-link/macro.html
index d07d104..84c3529 100644
--- a/tna_frontend_jinja/templates/components/skip-link/macro.html
+++ b/tna_frontend_jinja/templates/components/skip-link/macro.html
@@ -1,6 +1,6 @@
 {% macro tnaSkipLink(params) %}
 {%- set containerClasses = [params.classes] if params.classes else [] -%}
-<a href="#{{ params.href if params.href else 'main-content' }}" class="tna-skip-link {{ ' '.join(containerClasses) }}" data-module="tna-skip-link" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}="{{ value }}"{% endfor %}{% endif %}>
+<a href="#{{ params.href if params.href else 'main-content' }}" class="tna-skip-link {{ ' '.join(containerClasses) }}" data-module="tna-skip-link" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}>
   {{ params.text if params.text else 'Skip to main content' }}
 </a>
 {% endmacro %}
\ No newline at end of file
diff --git a/tna_frontend_jinja/templates/components/tabs/macro.html b/tna_frontend_jinja/templates/components/tabs/macro.html
index f56d17a..fbf1479 100644
--- a/tna_frontend_jinja/templates/components/tabs/macro.html
+++ b/tna_frontend_jinja/templates/components/tabs/macro.html
@@ -3,7 +3,7 @@
 {%- if params.sticky -%}
   {%- set containerClasses = containerClasses + ['tna-tabs--sticky'] -%}
 {%- endif -%}
-<div class="tna-tabs {{ ' '.join(containerClasses) }}" data-module="tna-tabs" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}="{{ value }}"{% endfor %}{% endif %}>
+<div class="tna-tabs {{ ' '.join(containerClasses) }}" data-module="tna-tabs" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}>
   <ul class="tna-tabs__list">
   {% for item in params['items'] %}
     <li class="tna-tabs__list-item">
diff --git a/tna_frontend_jinja/templates/components/text-input/macro.html b/tna_frontend_jinja/templates/components/text-input/macro.html
index c93069f..74f4ad3 100644
--- a/tna_frontend_jinja/templates/components/text-input/macro.html
+++ b/tna_frontend_jinja/templates/components/text-input/macro.html
@@ -3,7 +3,7 @@
 {%- if params.inline -%}
   {%- set containerClasses = containerClasses + ['tna-form__group--inline'] -%}
 {%- endif -%}
-<div class="tna-form__group{% if params.error %} tna-form__group--error{% endif %} {{ ' '.join(containerClasses) }}" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}="{{ value }}"{% endfor %}{% endif %}>
+<div class="tna-form__group{% if params.error %} tna-form__group--error{% endif %} {{ ' '.join(containerClasses) }}" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}>
   <div class="tna-form__group-contents">
     <h{{ params.headingLevel }} class="tna-form__heading tna-form__heading--{{ params.headingSize or 'm' }}">
       <label class="tna-form__label" for="{{ params.id }}">
@@ -32,6 +32,6 @@
 {%- if params.maxLength %} maxlength="{{ params.maxLength }}"{% endif %}
 {%- if params.autofill %} autofill="{{ params.autofill }}"{% endif %}
 {%- if params.inputmode %} inputmode="{{ params.inputmode }}"{% endif %}
-{%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}="{{ value }}"{% endfor %}{% endif %}
-{%- if extraAttributes %}{% for attribute, value in extraAttributes.items() %} {{ attribute }}="{{ value }}"{% endfor %}{% endif %}>
+{%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}
+{%- if extraAttributes %}{% for attribute, value in extraAttributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}>
 {% endmacro %}
\ No newline at end of file
diff --git a/tna_frontend_jinja/templates/components/textarea/macro.html b/tna_frontend_jinja/templates/components/textarea/macro.html
index d3b49be..e0fdc8d 100644
--- a/tna_frontend_jinja/templates/components/textarea/macro.html
+++ b/tna_frontend_jinja/templates/components/textarea/macro.html
@@ -4,7 +4,7 @@
 {%- if params.inline -%}
   {%- set containerClasses = containerClasses + ['tna-form__group--inline'] -%}
 {%- endif -%}
-<div class="tna-form__group{% if params.error %} tna-form__group--error{% endif %} {{ ' '.join(containerClasses) }}" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}="{{ value }}"{% endfor %}{% endif %}>
+<div class="tna-form__group{% if params.error %} tna-form__group--error{% endif %} {{ ' '.join(containerClasses) }}" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}>
   <div class="tna-form__group-contents">
     <h{{ params.headingLevel }} class="tna-form__heading tna-form__heading--{{ params.headingSize or 'm' }}">
       <label class="tna-form__label" for="{{ params.id }}">
@@ -24,6 +24,6 @@
   </div>
   <textarea id="{{ params.id }}" class="tna-textarea{% if params.size %} tna-textarea--{{ params.size }}{% endif %} {{ inputClasses | join(' ') }}" name="{{ params.name }}" spellcheck="{{ 'true' if params.spellcheck else 'false' }}" rows="{{ params.rows if params.rows else 5 }}"
   {%- if params.hint or params.error %} aria-describedby="{%- if params.hint -%}{{ params.id }}-hint{%- endif %} {% if params.error -%}{{ params.id }}-error{%- endif -%}"{%- endif %}
-  {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}="{{ value }}"{% endfor %}{% endif %}>{{ params.value }}</textarea>
+  {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}>{{ params.value }}</textarea>
 </div>
 {% endmacro %}
\ No newline at end of file
diff --git a/tna_frontend_jinja/templates/components/warning/macro.html b/tna_frontend_jinja/templates/components/warning/macro.html
index ccdb3f7..7a603b0 100644
--- a/tna_frontend_jinja/templates/components/warning/macro.html
+++ b/tna_frontend_jinja/templates/components/warning/macro.html
@@ -1,6 +1,6 @@
 {% macro tnaWarning(params) %}
 {%- set containerClasses = [params.classes] if params.classes else [] -%}
-<div class="tna-warning {{ ' '.join(containerClasses) }}" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}="{{ value }}"{% endfor %}{% endif %}>
+<div class="tna-warning {{ ' '.join(containerClasses) }}" {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}>
   <h{{ params.headingLevel }} class="tna-warning__heading">
     <span class="tna-visually-hidden">{{ params.heading or 'Important information' }}</span>
     <span class="tna-warning__heading-icon" aria-hidden="true">!</span>
diff --git a/tna_frontend_jinja/templates/layouts/base.html b/tna_frontend_jinja/templates/layouts/base.html
index 8573a89..5a94c78 100644
--- a/tna_frontend_jinja/templates/layouts/base.html
+++ b/tna_frontend_jinja/templates/layouts/base.html
@@ -6,7 +6,7 @@
 {%- set defaultSiteTitle = 'The National Archives' -%}
 
 <!DOCTYPE html>
-<html lang="{{ htmlLang | default('en') }}" class="tna-template{% if theme and theme != 'light' %} tna-template--{{ theme }}-theme{% endif %}{% if themeAccent %} tna-template--{{ themeAccent }}-accent{% endif %}{% if htmlClasses %} {{ htmlClasses }}{% endif %}" {%- if htmlAttributes %}{% for attribute, value in htmlAttributes.items() %} {{ attribute }}="{{ value }}"{% endfor %}{% endif %}>
+<html lang="{{ htmlLang | default('en') }}" class="tna-template{% if theme and theme != 'light' %} tna-template--{{ theme }}-theme{% endif %}{% if themeAccent %} tna-template--{{ themeAccent }}-accent{% endif %}{% if htmlClasses %} {{ htmlClasses }}{% endif %}" {%- if htmlAttributes %}{% for attribute, value in htmlAttributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}>
   <head>
     <meta charset="utf-8">
     <title>{% block pageTitle %}{% if pageTitle %}{{ pageTitle }} - {{ siteTitle or defaultSiteTitle }}{% else %}{{ siteTitle or defaultSiteTitle }}{% endif %}{% endblock %}</title>
@@ -35,7 +35,7 @@
 
     {% block stylesheets %}{% endblock %}
   </head>
-    <body class="tna-template__body{% if bodyClasses %} {{ bodyClasses }}{% endif %}" {%- if bodyAttributes %}{% for attribute, value in bodyAttributes.items() %} {{ attribute }}="{{ value }}"{% endfor %}{% endif %}>
+    <body class="tna-template__body{% if bodyClasses %} {{ bodyClasses }}{% endif %}" {%- if bodyAttributes %}{% for attribute, value in bodyAttributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}>
     {% block bodyStart %}
       {% block cookies %}
         {{ tnaCookieBanner({