From a388178e2ab0fb599e90582e2a157457c9e26216 Mon Sep 17 00:00:00 2001
From: Jonathan Bobel <jbobel@flexion.us>
Date: Fri, 25 Aug 2023 10:40:56 -0400
Subject: [PATCH] Removing or changing more govuk styles

---
 .pa11yci                                      |  2 +-
 Pipfile.lock                                  | 36 +++-----
 app/assets/error_pages/5xx.html               | 18 ++--
 .../javascripts/collapsibleCheckboxes.js      |  2 +-
 app/assets/javascripts/errorBanner.js         |  4 +-
 .../uswds/_uswds-theme-custom-styles.scss     |  4 +-
 .../components/components/footer/_footer.scss | 82 +++++++++----------
 .../components/components/footer/template.njk |  2 +-
 .../components/components/hint/_hint.scss     | 10 +--
 app/templates/components/radios.html          |  2 +-
 app/templates/components/service-link.html    |  2 +-
 .../forms/fields/checkboxes/template.njk      |  2 +-
 app/templates/main_template.html              |  5 +-
 app/templates/org_template.html               |  4 +-
 app/templates/partials/jobs/status.html       |  2 +-
 .../guidance-formatting-letters.html          |  6 +-
 .../templates/guidance-formatting.html        | 12 +--
 .../views/dashboard/_inbox_messages.html      |  2 +-
 app/templates/views/email-not-received.html   |  2 +-
 .../views/features/text-messages.html         |  6 +-
 app/templates/views/get-started.html          |  2 +-
 .../guidance/branding-and-customisation.html  | 16 ++--
 .../guidance/create-and-send-messages.html    |  4 +-
 .../guidance/edit-and-format-messages.html    | 10 +--
 app/templates/views/guidance/index.html       | 16 ++--
 app/templates/views/inbound-sms-admin.html    |  2 +-
 .../organizations/organization/index.html     | 16 ++--
 .../views/platform-admin/services.html        |  2 +-
 .../views/templates/_template_list.html       |  4 +-
 .../views/templates/choose-reply.html         |  2 +-
 app/templates/views/trial-mode.html           |  4 +-
 app/templates/views/two-factor-webauthn.html  |  2 +-
 .../views/user-profile/security-keys.html     |  2 +-
 .../views/verification-not-received.html      |  2 +-
 paas-failwhale/index.html                     | 16 ++--
 .../static_503/stylesheets/main.css           | 80 +++++++++---------
 .../static_503/stylesheets/print.css          |  2 +-
 .../views/organizations/test_organizations.py |  6 +-
 tests/app/main/views/test_template_folders.py |  2 +-
 .../javascripts/collapsibleCheckboxes.test.js |  4 +-
 tests/javascripts/errorBanner.test.js         |  6 +-
 tests/javascripts/listEntry.test.js           |  2 +-
 tests/javascripts/updateContent.test.js       |  2 +-
 43 files changed, 198 insertions(+), 211 deletions(-)

diff --git a/.pa11yci b/.pa11yci
index 51cc60d3f..35d04000c 100644
--- a/.pa11yci
+++ b/.pa11yci
@@ -6,7 +6,7 @@
     "hideElements": [
       "nav > ol a",
       "#sms-pricing-details",
-      "a.govuk-footer__link.govuk-footer__copyright-logo"
+      "a.usa-footer__link.usa-footer__copyright-logo"
     ]
   },
   "urls": [
diff --git a/Pipfile.lock b/Pipfile.lock
index 2225ff88b..df820cff3 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "fac46aace8fde798b2bf2288410bfd865433cbc969dd4f462ad3a96081d7574f"
+            "sha256": "0cf6fd5827de938eb059e0b04bb4408d59992627dc14e30c5b1eeac80af31498"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -235,7 +235,7 @@
                 "sha256:f779d3ad205f108d14e99bb3859aa7dd8e9c68874617c72354d7ecaec2a054ac",
                 "sha256:f87f746ee241d30d6ed93969de31e5ffd09a2961a051e60ae6bddde9ec3583aa"
             ],
-            "markers": "python_version >= '3.7'",
+            "markers": "python_full_version >= '3.7.0'",
             "version": "==3.2.0"
         },
         "click": {
@@ -425,11 +425,6 @@
             "index": "pypi",
             "version": "==1.1.1"
         },
-        "gds-metrics": {
-            "git": "https://github.com/alphagov/gds_metrics_python.git",
-            "ref": "6f1840a57b6fb1ee40b7e84f2f18ec229de8aa72",
-            "version": "==0.2.4"
-        },
         "geojson": {
             "hashes": [
                 "sha256:e49df982b204ed481e4c1236c57f587adf71537301cf8faf7120ab27d73c7568",
@@ -448,8 +443,7 @@
         },
         "govuk-frontend-jinja": {
             "git": "https://github.com/alphagov/govuk-frontend-jinja.git",
-            "ref": "ddbe208a976ffa4ca330881c506c5200dfa69851",
-            "version": "==0.5.8-alpha"
+            "ref": "ddbe208a976ffa4ca330881c506c5200dfa69851"
         },
         "greenlet": {
             "hashes": [
@@ -833,14 +827,6 @@
             ],
             "version": "==8.13.19"
         },
-        "prometheus-client": {
-            "hashes": [
-                "sha256:21e674f39831ae3f8acde238afd9a27a37d0d2fb5a28ea094f0ce25d2cbf2091",
-                "sha256:e537f37160f6807b8202a6fc4764cdd19bac5480ddd3e0d463c3002b34462101"
-            ],
-            "index": "pypi",
-            "version": "==0.17.1"
-        },
         "pycparser": {
             "hashes": [
                 "sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9",
@@ -1403,7 +1389,7 @@
                 "sha256:f779d3ad205f108d14e99bb3859aa7dd8e9c68874617c72354d7ecaec2a054ac",
                 "sha256:f87f746ee241d30d6ed93969de31e5ffd09a2961a051e60ae6bddde9ec3583aa"
             ],
-            "markers": "python_version >= '3.7'",
+            "markers": "python_full_version >= '3.7.0'",
             "version": "==3.2.0"
         },
         "cryptography": {
@@ -1652,7 +1638,7 @@
                 "sha256:355216845c60bd96232cd8d8c40e8f9765cc86f46880e43a8fd22dc1a1a8cab1",
                 "sha256:e3f60a94fa066dc52ec76661e37c851cb232d92f9886b15cb560aaada2df8feb"
             ],
-            "markers": "python_full_version >= '3.8.0'",
+            "markers": "python_version >= '3.8'",
             "version": "==3.0.0"
         },
         "markupsafe": {
@@ -1856,7 +1842,7 @@
                 "sha256:4659bc2a667783e7a15d190f6fccf8b2486685b6dba4c19c3876314769c57526",
                 "sha256:b4fa3a7a0be38243123cf9d1f3518da10c51bdb165a2b2985566247f9155a7d3"
             ],
-            "markers": "python_version >= '3.6'",
+            "markers": "python_full_version >= '3.6.0'",
             "version": "==32.0.1"
         },
         "playwright": {
@@ -1869,7 +1855,7 @@
                 "sha256:b476f63251876f1625f490af8d58ec0db90b555c623b7f54105f91d33878c06d",
                 "sha256:b574889ef97b7f44a633aa10d72b8966a850a4354d915fd0bc7e8658e825dd63"
             ],
-            "markers": "python_full_version >= '3.8.0'",
+            "markers": "python_version >= '3.8'",
             "version": "==1.37.0"
         },
         "pluggy": {
@@ -1893,7 +1879,7 @@
                 "sha256:259bcc17857d8a8b3b4a2327324b79e5f020a13c16074670f9c8c8f872ea76d0",
                 "sha256:5d1013ba8dc7895b548be5afb05740ca82454fd899971563d2ef625d090326f8"
             ],
-            "markers": "python_full_version >= '3.8.0'",
+            "markers": "python_version >= '3.8'",
             "version": "==2.11.0"
         },
         "pycparser": {
@@ -1915,7 +1901,7 @@
                 "sha256:4132f6d49cb4dae6819e5379898f2b8cce3c5f23994194c24b77d5da2e36f774",
                 "sha256:a0aae034c444db0071aa077972ba4768d40c830d9539fd45bf4cd3f8f6992efc"
             ],
-            "markers": "python_full_version >= '3.8.0'",
+            "markers": "python_version >= '3.8'",
             "version": "==3.1.0"
         },
         "pygments": {
@@ -2073,7 +2059,7 @@
                 "sha256:146a90b3b6b47cac4a73c12866a499e9817426423f57c5a66949c086191a8808",
                 "sha256:fb9d6c0a0f643c99eed3875b5377a184132ba9be4d61516a55273d3554d75a39"
             ],
-            "markers": "python_version >= '3.7'",
+            "markers": "python_full_version >= '3.7.0'",
             "version": "==13.5.2"
         },
         "s3transfer": {
@@ -2120,7 +2106,7 @@
                 "sha256:8cc040628f3cea5d7128f2e76cf486b2251a4e543c7b938f58d9a377f6694a2d",
                 "sha256:a54534acf9b89bc7ed264807013b505bf07f74dbe4bcfa37d32bd063870b087c"
             ],
-            "markers": "python_full_version >= '3.8.0'",
+            "markers": "python_version >= '3.8'",
             "version": "==5.1.0"
         },
         "text-unidecode": {
diff --git a/app/assets/error_pages/5xx.html b/app/assets/error_pages/5xx.html
index d98023e0c..4051845ca 100644
--- a/app/assets/error_pages/5xx.html
+++ b/app/assets/error_pages/5xx.html
@@ -66,7 +66,7 @@
   </header>
 
   <div class="govuk-width-container">
-    <main class="govuk-main-wrapper govuk-!-padding-top-0" id="main-content" role="main">
+    <main class="govuk-main-wrapper" id="main-content" role="main">
       <div class="grid-row">
         <div class="grid-col-12">
           <h1 class="govuk-heading-l govuk-!-padding-top-7">
@@ -85,25 +85,25 @@
     </main>
   </div>
 
-  <footer class="govuk-footer " role="contentinfo">
+  <footer class="usa-footer " role="contentinfo">
     <div class="govuk-width-container ">
-      <div class="govuk-footer__meta">
-        <div class="govuk-footer__meta-item govuk-footer__meta-item--grow">
+      <div class="usa-footer__meta">
+        <div class="usa-footer__meta-item usa-footer__meta-item--grow">
 
           <h2 class="usa-sr-only">Support links</h2>
-          <div class="govuk-footer__meta-custom">
+          <div class="usa-footer__meta-custom">
             Built by the <a href="https://www.gsa.gov/about-us/organization/federal-acquisition-service/technology-transformation-services/tts-solutions"
-              class="govuk-footer__link">Technology Transformation Services</a>
+              class="usa-footer__link">Technology Transformation Services</a>
           </div>
 
-          <svg role="presentation" focusable="false" class="govuk-footer__licence-logo"
+          <svg role="presentation" focusable="false" class="usa-footer__licence-logo"
             xmlns="http://www.w3.org/2000/svg" viewbox="0 0 483.2 195.7" height="17" width="41">
             <path fill="currentColor"
               d="M421.5 142.8V.1l-50.7 32.3v161.1h112.4v-50.7zm-122.3-9.6A47.12 47.12 0 0 1 221 97.8c0-26 21.1-47.1 47.1-47.1 16.7 0 31.4 8.7 39.7 21.8l42.7-27.2A97.63 97.63 0 0 0 268.1 0c-36.5 0-68.3 20.1-85.1 49.7A98 98 0 0 0 97.8 0C43.9 0 0 43.9 0 97.8s43.9 97.8 97.8 97.8c36.5 0 68.3-20.1 85.1-49.7a97.76 97.76 0 0 0 149.6 25.4l19.4 22.2h3v-87.8h-80l24.3 27.5zM97.8 145c-26 0-47.1-21.1-47.1-47.1s21.1-47.1 47.1-47.1 47.2 21 47.2 47S123.8 145 97.8 145" />
           </svg>
-          <span class="govuk-footer__licence-description">
+          <span class="usa-footer__licence-description">
             All content is available under the
-            <a class="govuk-footer__link"
+            <a class="usa-footer__link"
               href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/" rel="license">Open
               Government Licence v3.0</a>, except where otherwise stated
           </span>
diff --git a/app/assets/javascripts/collapsibleCheckboxes.js b/app/assets/javascripts/collapsibleCheckboxes.js
index cbf95bbf1..f67cad80a 100644
--- a/app/assets/javascripts/collapsibleCheckboxes.js
+++ b/app/assets/javascripts/collapsibleCheckboxes.js
@@ -20,7 +20,7 @@
     }[field] || `No ${field}s`)
   };
   Summary.prototype.addContent = function() {
-    const $hint = this.module.$formGroup.find('.govuk-hint');
+    const $hint = this.module.$formGroup.find('.usa-hint');
     this.$text = $(`<p class="selection-summary__text" />`);
 
     if (this.fieldLabel === 'folder') { this.$text.addClass('selection-summary__text--folders'); }
diff --git a/app/assets/javascripts/errorBanner.js b/app/assets/javascripts/errorBanner.js
index 35cdf0c83..2efef7d95 100644
--- a/app/assets/javascripts/errorBanner.js
+++ b/app/assets/javascripts/errorBanner.js
@@ -9,9 +9,9 @@
   This may behave in unexpected ways if you have more than one element with the `banner-dangerous` class on your page.
   */
   window.GOVUK.ErrorBanner = {
-    hideBanner: () => $('.banner-dangerous').addClass('govuk-!-display-none'),
+    hideBanner: () => $('.banner-dangerous').addClass('display-none'),
     showBanner: () => $('.banner-dangerous')
-      .removeClass('govuk-!-display-none')
+      .removeClass('display-none')
       .trigger('focus'),
   };
 })(window);
diff --git a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
index 818c5cb8b..b6362c8a2 100644
--- a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
+++ b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
@@ -143,7 +143,7 @@ td.table-empty-message {
 }
 
 .usa-checkbox .usa-checkbox__label {
-   + a.template-list-folder, + a.usa-template-list-template {
+   + a.template-list-folder {
       margin-left: units(4);
    }
 }
@@ -165,7 +165,7 @@ td.table-empty-message {
    margin: 0 units(0.5);
 }
 
-.usa-template-list-template, .template-list-template {
+.template-list-template {
    background: url(../img/material-icons/description.svg) no-repeat;
    padding-left: units(4);
    display: inline-flex; 
diff --git a/app/templates/components/components/footer/_footer.scss b/app/templates/components/components/footer/_footer.scss
index 9ee8181b9..8c964ff3e 100644
--- a/app/templates/components/components/footer/_footer.scss
+++ b/app/templates/components/components/footer/_footer.scss
@@ -6,41 +6,41 @@
 
 @include govuk-exports("govuk/component/footer") {
 
-  $govuk-footer-background: $govuk-canvas-background-colour;
-  $govuk-footer-border-top: #a1acb2;
-  $govuk-footer-border: govuk-colour("grey-2");
-  $govuk-footer-text: #454a4c;
-  $govuk-footer-link: $govuk-footer-text;
-  $govuk-footer-link-hover: #171819;
+  $usa-footer-background: $govuk-canvas-background-colour;
+  $usa-footer-border-top: #a1acb2;
+  $usa-footer-border: govuk-colour("grey-2");
+  $usa-footer-text: #454a4c;
+  $usa-footer-link: $usa-footer-text;
+  $usa-footer-link-hover: #171819;
 
   // Based on the govuk-crest-2x.png image dimensions.
-  $govuk-footer-crest-image-width-2x: 250px;
-  $govuk-footer-crest-image-height-2x: 204px;
+  $usa-footer-crest-image-width-2x: 250px;
+  $usa-footer-crest-image-height-2x: 204px;
   // Half the 2x image so that it fits the regular 1x size.
-  $govuk-footer-crest-image-width: ($govuk-footer-crest-image-width-2x / 2);
-  $govuk-footer-crest-image-height: ($govuk-footer-crest-image-height-2x / 2);
+  $usa-footer-crest-image-width: ($usa-footer-crest-image-width-2x / 2);
+  $usa-footer-crest-image-height: ($usa-footer-crest-image-height-2x / 2);
 
-  .govuk-footer {
+  .usa-footer {
     @include govuk-font($size: 16);
     @include govuk-responsive-padding(7, "top");
     @include govuk-responsive-padding(5, "bottom");
 
-    border-top: 1px solid $govuk-footer-border-top;
-    color: $govuk-footer-text;
-    background: $govuk-footer-background;
+    border-top: 1px solid $usa-footer-border-top;
+    color: $usa-footer-text;
+    background: $usa-footer-background;
   }
 
-  .govuk-footer__link {
+  .usa-footer__link {
     @include govuk-focusable-fill;
 
     &:link,
     &:visited {
-      color: $govuk-footer-link;
+      color: $usa-footer-link;
     }
 
     &:hover,
     &:active {
-      color: $govuk-footer-link-hover;
+      color: $usa-footer-link-hover;
     }
 
     // When focussed, the text colour needs to be darker to ensure that colour
@@ -59,14 +59,14 @@
     }
   }
 
-  .govuk-footer__section-break {
+  .usa-footer__section-break {
     margin: 0; // Reset `<hr>` default margins
     @include govuk-responsive-margin(8, "bottom");
     border: 0; // Reset `<hr>` default borders
-    border-bottom: 1px solid $govuk-footer-border;
+    border-bottom: 1px solid $usa-footer-border;
   }
 
-  .govuk-footer__meta {
+  .usa-footer__meta {
     display: -webkit-box;
     display: -webkit-flex;
     display: -ms-flexbox;
@@ -86,13 +86,13 @@
             justify-content: center; // Support: Flexbox
   }
 
-  .govuk-footer__meta-item {
+  .usa-footer__meta-item {
     margin-right: $govuk-gutter-half;
     margin-bottom: govuk-spacing(5);
     margin-left: $govuk-gutter-half;
   }
 
-  .govuk-footer__meta-item--grow {
+  .usa-footer__meta-item--grow {
     -webkit-box-flex: 1;
     -webkit-flex: 1;
         -ms-flex: 1;
@@ -104,7 +104,7 @@
     }
   }
 
-  .govuk-footer__licence-logo {
+  .usa-footer__licence-logo {
     display: inline-block;
     margin-right: govuk-spacing(2);
     @include mq ($until: desktop) {
@@ -113,52 +113,52 @@
     vertical-align: top;
   }
 
-  .govuk-footer__licence-description {
+  .usa-footer__licence-description {
     display: inline-block;
   }
 
-  .govuk-footer__copyright-logo {
+  .usa-footer__copyright-logo {
     display: inline-block;
-    min-width: $govuk-footer-crest-image-width;
-    padding-top: ($govuk-footer-crest-image-height + govuk-spacing(2));
+    min-width: $usa-footer-crest-image-width;
+    padding-top: ($usa-footer-crest-image-height + govuk-spacing(2));
     background-image: govuk-image-url("govuk-crest.png");
     @include govuk-device-pixel-ratio {
       background-image: govuk-image-url("govuk-crest-2x.png");
     }
     background-repeat: no-repeat;
     background-position: 50% 0%;
-    background-size: $govuk-footer-crest-image-width $govuk-footer-crest-image-height;
+    background-size: $usa-footer-crest-image-width $usa-footer-crest-image-height;
     text-align: center;
     text-decoration: none;
     white-space: nowrap;
   }
 
-  .govuk-footer__inline-list {
+  .usa-footer__inline-list {
     margin-top: 0;
     margin-bottom: govuk-spacing(3);
     padding: 0;
   }
 
-  .govuk-footer__meta-custom {
+  .usa-footer__meta-custom {
     margin-bottom: govuk-spacing(4);
   }
 
-  .govuk-footer__inline-list-item {
+  .usa-footer__inline-list-item {
     display: inline-block;
     margin-right: govuk-spacing(3);
     margin-bottom: govuk-spacing(1);
   }
 
-  .govuk-footer__heading {
+  .usa-footer__heading {
     @include govuk-responsive-margin(7, "bottom");
     padding-bottom: govuk-spacing(4);
     @include mq ($until: tablet) {
       padding-bottom: govuk-spacing(2);
     }
-    border-bottom: 1px solid $govuk-footer-border;
+    border-bottom: 1px solid $usa-footer-border;
   }
 
-  .govuk-footer__navigation {
+  .usa-footer__navigation {
     display: -webkit-box;
     display: -webkit-flex;
     display: -ms-flexbox;
@@ -170,7 +170,7 @@
             flex-wrap: wrap; // Support: Flexbox
   }
 
-  .govuk-footer__section {
+  .usa-footer__section {
     display: inline-block;
     margin-right: $govuk-gutter-half;
     margin-bottom: $govuk-gutter;
@@ -195,7 +195,7 @@
 
   // Sections two-third:one-third on desktop
   @include mq ($from: desktop) {
-    .govuk-footer__section:first-child {
+    .usa-footer__section:first-child {
       -webkit-box-flex: 2;
       -webkit-flex-grow: 2;
           -ms-flex-positive: 2;
@@ -203,7 +203,7 @@
     }
   }
 
-  .govuk-footer__list {
+  .usa-footer__list {
     margin: 0;
     padding: 0;
     list-style: none;
@@ -213,24 +213,24 @@
   }
 
   @include mq ($from: desktop) {
-    .govuk-footer__list--columns-2 {
+    .usa-footer__list--columns-2 {
       -webkit-column-count: 2;
          -moz-column-count: 2;
               column-count: 2; // Support: Columns
     }
 
-    .govuk-footer__list--columns-3 {
+    .usa-footer__list--columns-3 {
       -webkit-column-count: 3;
          -moz-column-count: 3;
               column-count: 3; // Support: Columns
     }
   }
 
-  .govuk-footer__list-item {
+  .usa-footer__list-item {
     @include govuk-responsive-margin(4, "bottom");
   }
 
-  .govuk-footer__list-item:last-child {
+  .usa-footer__list-item:last-child {
     margin-bottom: 0;
   }
 }
diff --git a/app/templates/components/components/footer/template.njk b/app/templates/components/components/footer/template.njk
index af58c3b3c..f540b8337 100644
--- a/app/templates/components/components/footer/template.njk
+++ b/app/templates/components/components/footer/template.njk
@@ -41,7 +41,7 @@
           <h2 class="usa-sr-only">{{ params.meta.visuallyHiddenTitle | default("Support links") }}</h2>
           {% if params.meta.items %}
             {% for item in params.meta.items %}
-              <a class="govuk-footer__link" href="{{ item.href }}" {% for attribute, value in item.attributes %}
+              <a class="usa-footer__link" href="{{ item.href }}" {% for attribute, value in item.attributes %}
                 {{attribute}}="{{value}}" {% endfor %}>
                 {{ item.text }}
               </a>
diff --git a/app/templates/components/components/hint/_hint.scss b/app/templates/components/components/hint/_hint.scss
index 7dab10c46..a9370334a 100644
--- a/app/templates/components/components/hint/_hint.scss
+++ b/app/templates/components/components/hint/_hint.scss
@@ -3,7 +3,7 @@
 @import "../../helpers/all";
 
 @include govuk-exports("govuk/component/hint") {
-  .govuk-hint {
+  .usa-hint {
     @include govuk-font($size: 19);
 
     display: block;
@@ -23,7 +23,7 @@
   // This adjustment will not work in browsers that do not support :not(). 
   // Users with these browsers will see the default size margin (5px larger).
 
-  .govuk-label:not(.govuk-label--m):not(.govuk-label--l):not(.govuk-label--xl) + .govuk-hint {
+  .govuk-label:not(.govuk-label--m):not(.govuk-label--l):not(.govuk-label--xl) + .usa-hint {
     margin-bottom: govuk-spacing(2);
   }
 
@@ -37,14 +37,14 @@
   // This adjustment will not work in browsers that do not support :not(). 
   // Users with these browsers will see the default size margin (5px larger).
 
-  .govuk-fieldset__legend:not(.govuk-fieldset__legend--m):not(.govuk-fieldset__legend--l):not(.govuk-fieldset__legend--xl) + .govuk-hint {
+  .govuk-fieldset__legend:not(.govuk-fieldset__legend--m):not(.govuk-fieldset__legend--l):not(.govuk-fieldset__legend--xl) + .usa-hint {
     margin-bottom: govuk-spacing(2);
   }
 
   // Reduces visual spacing of legend when there is a hint
 
-  .govuk-fieldset__legend + .govuk-hint,
-  .govuk-fieldset__legend + .govuk-hint {
+  .govuk-fieldset__legend + .usa-hint,
+  .govuk-fieldset__legend + .usa-hint {
     margin-top: -(govuk-spacing(1));
   }
 }
diff --git a/app/templates/components/radios.html b/app/templates/components/radios.html
index 2b3aa0a02..f3db32cf7 100644
--- a/app/templates/components/radios.html
+++ b/app/templates/components/radios.html
@@ -29,7 +29,7 @@
 ) %}
  <div class="{{ wrapping_class }} {% if field.errors %} form-group-error{% endif %}">
    <fieldset>
-     <legend class="form-label {% if bold_legend %}govuk-!-font-weight-bold{% endif %}">
+     <legend class="form-label {% if bold_legend %}bold{% endif %}">
        {{ field.label.text }}
        {% if field.errors %}
          <span class="error-message" data-module="track-error" data-error-type="{{ field.errors[0] }}" data-error-label="{{ field.name }}">
diff --git a/app/templates/components/service-link.html b/app/templates/components/service-link.html
index 5b873cc19..69481121a 100644
--- a/app/templates/components/service-link.html
+++ b/app/templates/components/service-link.html
@@ -2,6 +2,6 @@
   {% if service %}
     <a class="usa-link" href="{{ url_for(endpoint, service_id=service.id) }}">{{ link_text }}</a>
   {% else %}
-    <b class="govuk-!-font-weight-bold">{{ link_text|capitalize }}</b>
+    <b>{{ link_text|capitalize }}</b>
   {% endif %}
 {% endmacro %}
diff --git a/app/templates/forms/fields/checkboxes/template.njk b/app/templates/forms/fields/checkboxes/template.njk
index 3d8717acb..ae7c2aa62 100644
--- a/app/templates/forms/fields/checkboxes/template.njk
+++ b/app/templates/forms/fields/checkboxes/template.njk
@@ -8,7 +8,7 @@
     Changes:
     - `formGroup` option to control whether or not the checkboxes are wrapped with a `usa-form-group` class
     - `classes` option added to `item` allow custom classes on the `.govuk-checkboxes__item` element
-    - `classes` option added to `item.hint` allow custom classes on the `.govuk-hint` element (added to GOVUK Frontend in v3.5.0 - remove when we update)
+    - `classes` option added to `item.hint` allow custom classes on the `.usa-hint` element (added to GOVUK Frontend in v3.5.0 - remove when we update)
     - `asList` option added the root `params` object to allow setting of the `.govuk-checkboxes` and `.govuk-checkboxes__item` element types
     - `children` option added to `item` allowing the sending in of prerendered child checkboxes (allowing the creation of tree structures through recursion) -#}
 {#- If an id 'prefix' is not passed, fall back to using the name attribute
diff --git a/app/templates/main_template.html b/app/templates/main_template.html
index a191d7f88..b6072b74c 100644
--- a/app/templates/main_template.html
+++ b/app/templates/main_template.html
@@ -9,7 +9,8 @@
     <meta charset="utf-8" />
     <title>{% block pageTitle %}Notify.gov{% endblock %}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover">
-    <meta name="theme-color" content="{{ themeColor | default('#0b0c0c') }}" /> {# Hardcoded value of $govuk-black #}
+    <meta name="theme-color" media="(prefers-color-scheme: light)" content="f0f0f0" />
+    <meta name="theme-color" media="(prefers-color-scheme: dark)" content="1b1b1b" />
     {% if config['NR_MONITOR_ON'] %}
       {% include "partials/newrelic.html" -%}
     {% endif %}
@@ -31,7 +32,7 @@
     {# image url needs to be absolute e.g. http://wwww.domain.com/.../govuk-opengraph-image.png #}
     <!-- <meta property="og:image" content="{{ assetUrl | default('/assets') }}/images/govuk-opengraph-image.png"> -->
   </head>
-  <body class="govuk-template__body {{ bodyClasses }}">
+  <body class="usa-template__body {{ bodyClasses }}">
     <script nonce="{{ csp_nonce() }}">document.body.className = ((document.body.className) ? document.body.className + ' js-enabled' : 'js-enabled');</script>
     {% block bodyStart %}{% endblock %}
 
diff --git a/app/templates/org_template.html b/app/templates/org_template.html
index b466d6717..2e15a03e6 100644
--- a/app/templates/org_template.html
+++ b/app/templates/org_template.html
@@ -10,7 +10,7 @@
       {% if current_user.platform_admin %}
         <a href="{{ url_for('.organizations') }}" class="usa-link navigation-organization-link">Organizations</a>
       {% endif %}
-      <div class="navigation-service govuk-!-font-weight-bold">
+      <div class="navigation-service">
         {{ current_org.name }}
       </div>
       <a href="{{ url_for('main.choose_account') }}" class="usa-link navigation-service">Switch service</a>
@@ -23,7 +23,7 @@
         {% block beforeContent %}
           {% block backLink %}{% endblock %}
         {% endblock %}
-        <main class="govuk-main-wrapper column-main govuk-!-padding-top-0 govuk-!-padding-bottom-0" id="main-content" role="main" >
+        <main class="govuk-main-wrapper column-main" id="main-content" role="main" >
           {% block content %}
             {% include 'flash_messages.html' %}
             {% block maincolumn_content %}{% endblock %}
diff --git a/app/templates/partials/jobs/status.html b/app/templates/partials/jobs/status.html
index 17ee1beb2..703050e8d 100644
--- a/app/templates/partials/jobs/status.html
+++ b/app/templates/partials/jobs/status.html
@@ -14,7 +14,7 @@
     <p class="usa-error-message">
         Notify cannot send these messages because you have reached a limit. You can only send {{ current_service.message_limit|format_thousands }} messages per day and {{ 250000|format_thousands }} messages in total.
     </p>
-    <p class="usa-error-message govuk-!-margin-bottom-6">
+    <p class="usa-error-message">
         Upload this spreadsheet again tomorrow or <a class="usa-link" href="https://www.notifications.service.gov.uk/support">contact the Notify.gov team</a> to raise the limit.
     </p>
     {% endif %}
diff --git a/app/templates/partials/templates/guidance-formatting-letters.html b/app/templates/partials/templates/guidance-formatting-letters.html
index aee15b433..6e502bc47 100644
--- a/app/templates/partials/templates/guidance-formatting-letters.html
+++ b/app/templates/partials/templates/guidance-formatting-letters.html
@@ -6,7 +6,7 @@
 </p>
 {{ govukInsetText({
   "text": "# This is a heading",
-  "classes": "govuk-!-margin-top-0 govuk-!-margin-bottom-3"})
+  "classes": ""})
 }}
 <p class="govuk-body">
   To make bullet points, use asterisks:
@@ -15,7 +15,7 @@
   "html": "* point 1<br/>
             * point 2<br/>
             * point 3<br/>",
-  "classes": "govuk-!-margin-top-0 govuk-!-margin-bottom-3"})
+  "classes": ""})
 }}
 <p class="govuk-body">
   To insert a page break, use three asterisks:
@@ -26,5 +26,5 @@
             ***<br/>
             <br/>
             Content on page 2<br/>",
-  "classes": "govuk-!-margin-top-0 govuk-!-margin-bottom-3"})
+  "classes": ""})
 }}
diff --git a/app/templates/partials/templates/guidance-formatting.html b/app/templates/partials/templates/guidance-formatting.html
index f3780f04e..9d4211af3 100644
--- a/app/templates/partials/templates/guidance-formatting.html
+++ b/app/templates/partials/templates/guidance-formatting.html
@@ -4,24 +4,24 @@
 <p class="bottom-gutter-1-3">
   To put a title in your template, use a hash:
 </p>
-<div class="govuk-!-margin-bottom-6">
-  {{ govukInsetText({"text": "# This is a title", "classes": "govuk-!-margin-top-0"})}}
+<div>
+  {{ govukInsetText({"text": "# This is a title", "classes": ""})}}
 </div>
 <p class="bottom-gutter-1-3">
   To make bullet points, use asterisks:
 </p>
-<div class="govuk-!-margin-bottom-6">
+<div>
   {{ govukInsetText({
     "html": "* point 1<br/>
              * point 2<br/>
              * point 3<br/>",
-    "classes": "govuk-!-margin-top-0"})
+    "classes": ""})
   }}
 </div>
 <p class="bottom-gutter-1-3">
   To add inset text, use a caret:
 </p>
-<div class="govuk-!-margin-bottom-6">
+<div>
   {{ govukInsetText({"text": "^ You must tell us if your circumstances change", "classes": "govuk-!-margin-top-0"})}}
 </div>
 <p class="bottom-gutter-1-3">
@@ -31,5 +31,5 @@
   "html": '<p class="govuk-body">First paragraph</p>
             <p class="govuk-body" style="letter-spacing: 1px;">---</p>
             <p class="govuk-body">Second paragraph</p>',
-  "classes": "govuk-!-margin-top-0"})
+  "classes": ""})
 }}
diff --git a/app/templates/views/dashboard/_inbox_messages.html b/app/templates/views/dashboard/_inbox_messages.html
index 0c62f31a9..50d016192 100644
--- a/app/templates/views/dashboard/_inbox_messages.html
+++ b/app/templates/views/dashboard/_inbox_messages.html
@@ -4,7 +4,7 @@
 <div class="ajax-block-container">
   {% if messages %}
     <p class="bottom-gutter-2-3 top-gutter-1-2">
-      <a href="{{ url_for('.inbox_download', service_id=current_service.id) }}" download class="usa-link govuk-!-font-weight-bold">Download these messages</a>
+      <a href="{{ url_for('.inbox_download', service_id=current_service.id) }}" download class="usa-link bold">Download these messages</a>
     </p>
   {% endif %}
   {% call(item, row_number) list_table(
diff --git a/app/templates/views/email-not-received.html b/app/templates/views/email-not-received.html
index f9ef33538..b15e8bdd6 100644
--- a/app/templates/views/email-not-received.html
+++ b/app/templates/views/email-not-received.html
@@ -25,7 +25,7 @@
     <ul class="govuk-list govuk-list--bullet">
       <li>find a member of your team who has permission to manage settings, team and usage</li>
       <li>ask them to change the email address for your account</li>
-      <li>select <span class="govuk-body govuk-!-font-weight-bold">Resend email link</span></li>
+      <li>select <span class="govuk-body bold">Resend email link</span></li>
     </ul>
 
   </div>
diff --git a/app/templates/views/features/text-messages.html b/app/templates/views/features/text-messages.html
index 28989d1c0..4050fe5a2 100644
--- a/app/templates/views/features/text-messages.html
+++ b/app/templates/views/features/text-messages.html
@@ -33,9 +33,9 @@
   <p>To change the text message sender from the default of ‘Notify.gov’:</p>
 
   <ol class="list list-number">
-    <li>Go to the <b class="govuk-!-font-weight-bold">Text message settings</b> section of the {{ service_link(current_service, 'main.service_settings', 'settings') }} page.</li>
-    <li>Select <b class="govuk-!-font-weight-bold">Manage</b> on the <b class="govuk-!-font-weight-bold">Text message senders</b> row.</li>
-    <li>Select <b class="govuk-!-font-weight-bold">Change</b> or <b class="govuk-!-font-weight-bold">Add text message sender</b>.</li>
+    <li>Go to the <b class="bold">Text message settings</b> section of the {{ service_link(current_service, 'main.service_settings', 'settings') }} page.</li>
+    <li>Select <b class="bold">Manage</b> on the <b class="bold">Text message senders</b> row.</li>
+    <li>Select <b class="bold">Change</b> or <b class="bold">Add text message sender</b>.</li>
 </ol>
 
   <h2 class="heading heading-medium">Pricing<h2>
diff --git a/app/templates/views/get-started.html b/app/templates/views/get-started.html
index e1884f94c..417be7bd1 100644
--- a/app/templates/views/get-started.html
+++ b/app/templates/views/get-started.html
@@ -51,7 +51,7 @@
   <li class="usa-process-list__item padding-bottom-4">
     <h2 class="usa-process-list__heading line-height-sans-3">Start sending messages</h2>
     {% if not current_user.is_authenticated or not current_service %}
-    <p>When you’re ready to send messages to people outside your team, go to the <b class="govuk-!-font-weight-bold">Settings</b> page and select <b class="govuk-!-font-weight-bold">Request to go live</b>. We’ll approve your request within one working day.</p>
+    <p>When you’re ready to send messages to people outside your team, go to the <b class="bold">Settings</b> page and select <b class="bold">Request to go live</b>. We’ll approve your request within one working day.</p>
     {% else %}
     <p>You should <a class="usa-link" href="{{ url_for('.request_to_go_live', service_id=current_service.id) }}">request to go live</a> when you’re ready to send messages to people outside your team. We’ll approve your request within one working day.</p>
     {% endif %}
diff --git a/app/templates/views/guidance/branding-and-customisation.html b/app/templates/views/guidance/branding-and-customisation.html
index 2010ed1ae..2e3939a5b 100644
--- a/app/templates/views/guidance/branding-and-customisation.html
+++ b/app/templates/views/guidance/branding-and-customisation.html
@@ -24,8 +24,8 @@
   <p>To change your email branding:</p>
 
   <ol class="list list-number">
-    <li>Go to the <b class="govuk-!-font-weight-bold">Email settings</b> section of the {{ service_link(current_service, 'main.service_settings', 'settings') }} page.</li>
-    <li>Select <b class="govuk-!-font-weight-bold">Change</b> on the <b class="govuk-!-font-weight-bold">Email branding</b> row.</li>
+    <li>Go to the <b class="bold">Email settings</b> section of the {{ service_link(current_service, 'main.service_settings', 'settings') }} page.</li>
+    <li>Select <b class="bold">Change</b> on the <b class="bold">Email branding</b> row.</li>
   </ol>
 
   <h2 class="font-body-lg" id="reply-to-address">Add a reply-to email address</h2>
@@ -35,9 +35,9 @@
   <p>To add a reply-to email address:</p>
 
   <ol class="list list-number">
-    <li>Go to the <b class="govuk-!-font-weight-bold">Email settings</b> section of the {{ service_link(current_service, 'main.service_settings', 'settings') }} page.</li>
-    <li>Select <b class="govuk-!-font-weight-bold">Manage</b> on the <b class="govuk-!-font-weight-bold">Reply-to email addresses</b> row.</li>
-    <li>Select <b class="govuk-!-font-weight-bold">Add reply-to address</b>.</li>
+    <li>Go to the <b class="bold">Email settings</b> section of the {{ service_link(current_service, 'main.service_settings', 'settings') }} page.</li>
+    <li>Select <b class="bold">Manage</b> on the <b class="bold">Reply-to email addresses</b> row.</li>
+    <li>Select <b class="bold">Add reply-to address</b>.</li>
   </ol> -->
 
   <h2 class="font-body-lg" id="text-message-sender">Change the text message sender</h2>
@@ -47,9 +47,9 @@
   <p>To change the text message sender from the default of ‘Notify.gov’:</p>
 
   <ol class="list list-number">
-    <li>Go to the <b class="govuk-!-font-weight-bold">Text message settings</b> section of the {{ service_link(current_service, 'main.service_settings', 'settings') }} page.</li>
-    <li>Select <b class="govuk-!-font-weight-bold">Manage</b> on the <b class="govuk-!-font-weight-bold">Text message senders</b> row.</li>
-    <li>Select <b class="govuk-!-font-weight-bold">Change</b> or <b class="govuk-!-font-weight-bold">Add text message sender</b>.</li>
+    <li>Go to the <b class="bold">Text message settings</b> section of the {{ service_link(current_service, 'main.service_settings', 'settings') }} page.</li>
+    <li>Select <b class="bold">Manage</b> on the <b class="bold">Text message senders</b> row.</li>
+    <li>Select <b class="bold">Change</b> or <b class="bold">Add text message sender</b>.</li>
 </ol>
 
 {% endblock %}
diff --git a/app/templates/views/guidance/create-and-send-messages.html b/app/templates/views/guidance/create-and-send-messages.html
index d921f5e70..68ecae86d 100644
--- a/app/templates/views/guidance/create-and-send-messages.html
+++ b/app/templates/views/guidance/create-and-send-messages.html
@@ -16,7 +16,7 @@
   <p>To send a batch of messages at once:</p>
   <ol class="list list-number">
     <li>Go to the {{ service_link(current_service, 'main.choose_template', 'templates') }} page and choose an existing template.</li>
-    <li>Select <b class="govuk-!-font-weight-bold">Send</b>.</li>
-    <li>If you’re sending emails, select <b class="govuk-!-font-weight-bold">Upload a list of email addresses</b>. If you’re sending text messages, select <b class="govuk-!-font-weight-bold">Upload a list of phone numbers</b>.</li>
+    <li>Select <b class="bold">Send</b>.</li>
+    <li>If you’re sending emails, select <b class="bold">Upload a list of email addresses</b>. If you’re sending text messages, select <b class="bold">Upload a list of phone numbers</b>.</li>
 
   {% endblock %}
diff --git a/app/templates/views/guidance/edit-and-format-messages.html b/app/templates/views/guidance/edit-and-format-messages.html
index 64126a970..6aeff21dc 100644
--- a/app/templates/views/guidance/edit-and-format-messages.html
+++ b/app/templates/views/guidance/edit-and-format-messages.html
@@ -23,7 +23,7 @@
 
   <ol class="list list-number">
     <li>Go to the {{ service_link(current_service, 'main.choose_template', 'templates') }} page.</li>
-    <li>Add a new template or choose an existing template and select <b class="govuk-!-font-weight-bold">Edit</b>.</li>
+    <li>Add a new template or choose an existing template and select <b class="bold">Edit</b>.</li>
   </ol>
 
   <!-- <p class="govuk-body">Email templates can include:</p>
@@ -60,9 +60,9 @@
 
   <ol class="list list-number">
     <li>Go to the {{ service_link(current_service, 'main.choose_template', 'templates') }} page.</li>
-    <li>Add a new template or choose an existing template and select <b class="govuk-!-font-weight-bold">Edit</b>.</li>
+    <li>Add a new template or choose an existing template and select <b class="bold">Edit</b>.</li>
     <li>Add a placeholder using double brackets. For example: Hello ((first&nbsp;name)), your reference is ((ref&nbsp;number)).</li>
-    <li>Select <b class="govuk-!-font-weight-bold">Save</b>.</li>
+    <li>Select <b class="bold">Save</b>.</li>
   </ol>
 
   <p class="govuk-body">When you send a message you can either:</p>
@@ -80,9 +80,9 @@
 
   <ol class="list list-number">
     <li>Go to the {{ service_link(current_service, 'main.choose_template', 'templates') }} page.</li>
-    <li>Add a new template or choose an existing template and select <b class="govuk-!-font-weight-bold">Edit</b>.</li>
+    <li>Add a new template or choose an existing template and select <b class="bold">Edit</b>.</li>
     <li>Use double brackets and ?? to define optional content. For example, if you only want to show something to people who are under 18: ((under18??Please get your application signed by a parent or guardian.))</li>
-    <li>Select <b class="govuk-!-font-weight-bold">Save</b>.</li>
+    <li>Select <b class="bold">Save</b>.</li>
   </ol>
 
   <p class="govuk-body">For each person you send this message to, specify ‘yes’ or ‘no’ to show or hide this content. You can either:</p>
diff --git a/app/templates/views/guidance/index.html b/app/templates/views/guidance/index.html
index 1dbbc363d..e73cd5cd5 100644
--- a/app/templates/views/guidance/index.html
+++ b/app/templates/views/guidance/index.html
@@ -37,7 +37,7 @@
   
   <ol class="list list-number">
     <li>Go to the {{ service_link(current_service, 'main.choose_template', 'templates') }} page.</li>
-    <li>Add a new template or choose an existing template and select <b class="govuk-!-font-weight-bold">Edit</b>.</li>
+    <li>Add a new template or choose an existing template and select <b class="bold">Edit</b>.</li>
   </ol>
   
   <h3 class="font-body-lg" id="links">Add links</h3>
@@ -68,10 +68,10 @@
   
   <ol class="list list-number">
     <li>Go to the {{ service_link(current_service, 'main.choose_template', 'templates') }} page.</li>
-    <li>Add a new template or choose an existing template and select <b class="govuk-!-font-weight-bold">Edit</b>.</li>
+    <li>Add a new template or choose an existing template and select <b class="bold">Edit</b>.</li>
     <li>Add a placeholder using double brackets. For example: Hello ((first&nbsp;name)), your reference is
       ((ref&nbsp;number)).</li>
-    <li>Select <b class="govuk-!-font-weight-bold">Save</b>.</li>
+    <li>Select <b class="bold">Save</b>.</li>
   </ol>
   
   <p>When you send a message you can either:</p>
@@ -89,10 +89,10 @@
   
   <ol class="list list-number">
     <li>Go to the {{ service_link(current_service, 'main.choose_template', 'templates') }} page.</li>
-    <li>Add a new template or choose an existing template and select <b class="govuk-!-font-weight-bold">Edit</b>.</li>
+    <li>Add a new template or choose an existing template and select <b class="bold">Edit</b>.</li>
     <li>Use double brackets and ?? to define optional content. For example, if you only want to show something to people
       who are under 18: ((under18??Please get your application signed by a parent or guardian.))</li>
-    <li>Select <b class="govuk-!-font-weight-bold">Save</b>.</li>
+    <li>Select <b class="bold">Save</b>.</li>
   </ol>
   
   <p>For each person you send this message to, specify ‘yes’ or ‘no’ to show or hide this content. You
@@ -114,11 +114,11 @@
   <p>To change the text message sender from the default of ‘Notify.gov’:</p>
   
   <ol class="list list-number">
-    <li>Go to the <b class="govuk-!-font-weight-bold">Text message settings</b> section of the {{
+    <li>Go to the <b class="bold">Text message settings</b> section of the {{
       service_link(current_service, 'main.service_settings', 'settings') }} page.</li>
-    <li>Select <b class="govuk-!-font-weight-bold">Manage</b> on the <b class="govuk-!-font-weight-bold">Text message
+    <li>Select <b class="bold">Manage</b> on the <b class="bold">Text message
         senders</b> row.</li>
-    <li>Select <b class="govuk-!-font-weight-bold">Change</b> or <b class="govuk-!-font-weight-bold">Add text message
+    <li>Select <b class="bold">Change</b> or <b class="bold">Add text message
         sender</b>.</li>
   </ol>
 
diff --git a/app/templates/views/inbound-sms-admin.html b/app/templates/views/inbound-sms-admin.html
index f7959d8a9..370abf3fb 100644
--- a/app/templates/views/inbound-sms-admin.html
+++ b/app/templates/views/inbound-sms-admin.html
@@ -48,7 +48,7 @@ Inbound SMS
               {% endif %}
               </td>
               <td>
-                  <a href="{{ url_for('main.service_dashboard', service_id=value.service.id) }}" class="usa-link govuk-!-font-size-24 govuk-!-font-weight-bold">{{ value.service.name }}</a>
+                  <a href="{{ url_for('main.service_dashboard', service_id=value.service.id) }}" class="usa-link govuk-!-font-size-24 bold">{{ value.service.name }}</a>
               </td>
           </tr>
           {% endfor %}
diff --git a/app/templates/views/organizations/organization/index.html b/app/templates/views/organizations/organization/index.html
index 376c37162..657dc1606 100644
--- a/app/templates/views/organizations/organization/index.html
+++ b/app/templates/views/organizations/organization/index.html
@@ -41,7 +41,7 @@
   </div>
 
   {% if search_form %}
-    <div class="govuk-!-margin-bottom-5">
+    <div>
       {{ live_search(
         target_selector='.organization-service',
         show=True,
@@ -54,8 +54,8 @@
   <h2 class="heading-small {% if search_form %}visually-hidden{% endif %}">By service</h2>
 
   {% for service in services %}
-    <div class="keyline-block govuk-!-margin-top-2 organization-service">
-      <h3 class="govuk-!-font-weight-bold govuk-!-font-size-24 govuk-!-margin-bottom-3 govuk-!-margin-top-1 live-search-relevant">
+    <div class="keyline-block organization-service">
+      <h3 class="live-search-relevant">
         <a href="{{ url_for('main.usage', service_id=service.service_id) }}" class="usa-link browse-list-link">{{ service.service_name  }}</a>
       </h3>
       <div class="grid-row">
@@ -85,16 +85,16 @@
       </div>
     </div>
   {% endfor %}
-  <div class="keyline-block govuk-!-margin-top-2"></div>
+  <div class="keyline-block"></div>
   {% if not services %}
-    <p class="govuk-body govuk-hint">
+    <p class="govuk-body usa-hint">
       {{ current_org.name }} has no live services on Notify.gov
     </p>
-    <div class="keyline-block govuk-!-margin-top-2"></div>
+    <div class="keyline-block"></div>
   {% else %}
     <div class="js-stick-at-bottom-when-scrolling">
-      <p class="govuk-!-margin-bottom-1">
-        <a href="{{ download_link }}" download="download" class="usa-link govuk-!-font-weight-bold">Download this report (<abbr title="Comma separated values">CSV</abbr>)</a>
+      <p>
+        <a href="{{ download_link }}" download="download" class="usa-link">Download this report (<abbr title="Comma separated values">CSV</abbr>)</a>
       </p>
     </div>
   {% endif %}
diff --git a/app/templates/views/platform-admin/services.html b/app/templates/views/platform-admin/services.html
index e3cd93f39..0f3cf60d8 100644
--- a/app/templates/views/platform-admin/services.html
+++ b/app/templates/views/platform-admin/services.html
@@ -23,7 +23,7 @@
 
         {% call row() %}
           {% call field(border=False, colspan=3) %}
-            <a href="{{ url_for('main.service_dashboard', service_id=service['id']) }}" class="file-list-filename-large usa-link govuk-!-padding-bottom-4">{{ service['name'] }}</a>
+            <a href="{{ url_for('main.service_dashboard', service_id=service['id']) }}" class="file-list-filename-large usa-link">{{ service['name'] }}</a>
             {% if not service['active'] %}
               <span class="heading-medium hint">&ensp;Archived</span>
             {% endif %}
diff --git a/app/templates/views/templates/_template_list.html b/app/templates/views/templates/_template_list.html
index 65b49c2bb..ec7672eb1 100644
--- a/app/templates/views/templates/_template_list.html
+++ b/app/templates/views/templates/_template_list.html
@@ -52,10 +52,10 @@
     </a>
     {% else %}
     <a href="{{ url_for('.view_template', service_id=current_service.id, template_id=item.id) }}"
-      class="usa-link usa-template-list-template">
+      class="usa-link template-list-template">
       <span class="live-search-relevant">
         {%- if current_service.api_keys -%}
-        <span class="govuk-!-display-none">{{ item.id }} </span>
+        <span class="display-none">{{ item.id }} </span>
         {%- endif -%}
         {{- format_item_name(item.name) -}}
       </span>
diff --git a/app/templates/views/templates/choose-reply.html b/app/templates/views/templates/choose-reply.html
index 526f2e277..691db0133 100644
--- a/app/templates/views/templates/choose-reply.html
+++ b/app/templates/views/templates/choose-reply.html
@@ -51,7 +51,7 @@
               <span class="live-search-relevant">{{ item.name }}</span>
             </a>
           {% else %}
-            <a class="usa-link usa-template-list-template" href="{{ url_for('.conversation_reply_with_template', service_id=current_service.id, template_id=item.id, notification_id=notification_id) }}">
+            <a class="usa-link template-list-template" href="{{ url_for('.conversation_reply_with_template', service_id=current_service.id, template_id=item.id, notification_id=notification_id) }}">
               <span class="live-search-relevant">{{ item.name }}</span>
             </a>
           {% endif %}
diff --git a/app/templates/views/trial-mode.html b/app/templates/views/trial-mode.html
index 6d7c5d912..6c4d9b8db 100644
--- a/app/templates/views/trial-mode.html
+++ b/app/templates/views/trial-mode.html
@@ -24,8 +24,8 @@
   </p>
   <ol class="list list-number">
     <li><a class="usa-link" href="{{ url_for('.sign_in') }}">Sign in to Notify</a>.</li>
-    <li>Go to the <b class="govuk-!-font-weight-bold">Settings</b> page.</li>
-    <li>Select <b class="govuk-!-font-weight-bold">Request to go live</b>.</li>
+    <li>Go to the <b class="bold">Settings</b> page.</li>
+    <li>Select <b class="bold">Request to go live</b>.</li>
   </ol>
     {% endif %}
  <p>
diff --git a/app/templates/views/two-factor-webauthn.html b/app/templates/views/two-factor-webauthn.html
index 20e65a337..eafa09706 100644
--- a/app/templates/views/two-factor-webauthn.html
+++ b/app/templates/views/two-factor-webauthn.html
@@ -22,7 +22,7 @@
 {% block maincolumn_content %}
 
     {{ govukErrorMessage({
-      "classes": "banner-dangerous govuk-!-display-none",
+      "classes": "banner-dangerous display-none",
       "html": (
         'There’s a problem with your security key' +
         '<p>Check you have the right key and try again. ' +
diff --git a/app/templates/views/user-profile/security-keys.html b/app/templates/views/user-profile/security-keys.html
index e07faa656..8dbb3c1c3 100644
--- a/app/templates/views/user-profile/security-keys.html
+++ b/app/templates/views/user-profile/security-keys.html
@@ -48,7 +48,7 @@
   <div class="grid-row">
 
     {{ govukErrorMessage({
-      "classes": "banner-dangerous govuk-!-display-none",
+      "classes": "banner-dangerous display-none",
       "html": (
         'There’s a problem with your security key' +
         '<p>Check you have the right key and try again. ' +
diff --git a/app/templates/views/verification-not-received.html b/app/templates/views/verification-not-received.html
index 6f0a5f7d9..9a6e1c62b 100644
--- a/app/templates/views/verification-not-received.html
+++ b/app/templates/views/verification-not-received.html
@@ -25,7 +25,7 @@
     <ul class="govuk-list govuk-list--bullet">
       <li>find a member of your team who has permission to manage settings, team and usage</li>
       <li>ask them to change the mobile number for your account</li>
-      <li>select <span class="govuk-body govuk-!-font-weight-bold">Resend security code</span></li>
+      <li>select <span class="govuk-body bold">Resend security code</span></li>
     </ul>
   </div>
 </div>
diff --git a/paas-failwhale/index.html b/paas-failwhale/index.html
index 86cc75db9..2e65fa947 100644
--- a/paas-failwhale/index.html
+++ b/paas-failwhale/index.html
@@ -98,31 +98,31 @@
     </main>
   </div>
 
-  <footer class="govuk-footer " role="contentinfo">
+  <footer class="usa-footer " role="contentinfo">
     <div class="govuk-width-container ">
-      <div class="govuk-footer__meta">
-        <div class="govuk-footer__meta-item govuk-footer__meta-item--grow">
+      <div class="usa-footer__meta">
+        <div class="usa-footer__meta-item usa-footer__meta-item--grow">
 
           <h2 class="usa-sr-only">Support links</h2>
-          <div class="govuk-footer__meta-custom">
+          <div class="usa-footer__meta-custom">
             Built by the <a href="https://www.gsa.gov/about-us/organization/federal-acquisition-service/technology-transformation-services/tts-solutions"
               class="usa-link">Technology Transformation Services</a>
           </div>
 
-          <svg role="presentation" focusable="false" class="govuk-footer__licence-logo"
+          <svg role="presentation" focusable="false" class="usa-footer__licence-logo"
             xmlns="http://www.w3.org/2000/svg" viewbox="0 0 483.2 195.7" height="17" width="41">
             <path fill="currentColor"
               d="M421.5 142.8V.1l-50.7 32.3v161.1h112.4v-50.7zm-122.3-9.6A47.12 47.12 0 0 1 221 97.8c0-26 21.1-47.1 47.1-47.1 16.7 0 31.4 8.7 39.7 21.8l42.7-27.2A97.63 97.63 0 0 0 268.1 0c-36.5 0-68.3 20.1-85.1 49.7A98 98 0 0 0 97.8 0C43.9 0 0 43.9 0 97.8s43.9 97.8 97.8 97.8c36.5 0 68.3-20.1 85.1-49.7a97.76 97.76 0 0 0 149.6 25.4l19.4 22.2h3v-87.8h-80l24.3 27.5zM97.8 145c-26 0-47.1-21.1-47.1-47.1s21.1-47.1 47.1-47.1 47.2 21 47.2 47S123.8 145 97.8 145" />
           </svg>
-          <span class="govuk-footer__licence-description">
+          <span class="usa-footer__licence-description">
             All content is available under the
             <a class="usa-link"
               href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/" rel="license">Open
               Government Licence v3.0</a>, except where otherwise stated
           </span>
         </div>
-        <!-- <div class="govuk-footer__meta-item">
-          <a class="govuk-footer__link govuk-footer__copyright-logo"
+        <!-- <div class="usa-footer__meta-item">
+          <a class="usa-footer__link usa-footer__copyright-logo"
             href="https://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/uk-government-licensing-framework/crown-copyright/">©
             US copyright</a>
         </div> -->
diff --git a/paas-failwhale/static_503/stylesheets/main.css b/paas-failwhale/static_503/stylesheets/main.css
index 096763c7c..829668016 100644
--- a/paas-failwhale/static_503/stylesheets/main.css
+++ b/paas-failwhale/static_503/stylesheets/main.css
@@ -3314,7 +3314,7 @@ a:focus {
     padding-top: 3px
 }
 
-.govuk-footer {
+.usa-footer {
     font-family: "nta", Arial, sans-serif;
     -webkit-font-smoothing: antialiased;
     -moz-osx-font-smoothing: grayscale;
@@ -3330,13 +3330,13 @@ a:focus {
 }
 
 @media print {
-    .govuk-footer {
+    .usa-footer {
         font-family: sans-serif
     }
 }
 
 @media (min-width: 40.0625em) {
-    .govuk-footer {
+    .usa-footer {
         font-size: 16px;
         font-size: 1rem;
         line-height: 1.25
@@ -3344,45 +3344,45 @@ a:focus {
 }
 
 @media print {
-    .govuk-footer {
+    .usa-footer {
         font-size: 14pt;
         line-height: 1.2
     }
 }
 
 @media (min-width: 40.0625em) {
-    .govuk-footer {
+    .usa-footer {
         padding-top: 40px
     }
 }
 
 @media (min-width: 40.0625em) {
-    .govuk-footer {
+    .usa-footer {
         padding-bottom: 25px
     }
 }
 
-.govuk-footer__link:focus {
+.usa-footer__link:focus {
     outline: 3px solid #ffbf47;
     outline-offset: 0;
     background-color: #ffbf47
 }
 
-.govuk-footer__link:link,
-.govuk-footer__link:visited {
+.usa-footer__link:link,
+.usa-footer__link:visited {
     color: #454a4c
 }
 
-.govuk-footer__link:hover,
-.govuk-footer__link:active {
+.usa-footer__link:hover,
+.usa-footer__link:active {
     color: #171819
 }
 
-.govuk-footer__link:focus {
+.usa-footer__link:focus {
     color: #0b0c0c
 }
 
-.govuk-footer__section-break {
+.usa-footer__section-break {
     margin: 0;
     margin-bottom: 30px;
     border: 0;
@@ -3390,12 +3390,12 @@ a:focus {
 }
 
 @media (min-width: 40.0625em) {
-    .govuk-footer__section-break {
+    .usa-footer__section-break {
         margin-bottom: 50px
     }
 }
 
-.govuk-footer__meta {
+.usa-footer__meta {
     display: -webkit-box;
     display: -webkit-flex;
     display: -ms-flexbox;
@@ -3415,13 +3415,13 @@ a:focus {
     justify-content: center
 }
 
-.govuk-footer__meta-item {
+.usa-footer__meta-item {
     margin-right: 15px;
     margin-bottom: 25px;
     margin-left: 15px
 }
 
-.govuk-footer__meta-item--grow {
+.usa-footer__meta-item--grow {
     -webkit-box-flex: 1;
     -webkit-flex: 1;
     -ms-flex: 1;
@@ -3429,30 +3429,30 @@ a:focus {
 }
 
 @media (max-width: 40.0525em) {
-    .govuk-footer__meta-item--grow {
+    .usa-footer__meta-item--grow {
         -webkit-flex-basis: 320px;
         -ms-flex-preferred-size: 320px;
         flex-basis: 320px
     }
 }
 
-.govuk-footer__licence-logo {
+.usa-footer__licence-logo {
     display: inline-block;
     margin-right: 10px;
     vertical-align: top
 }
 
 @media (max-width: 48.0525em) {
-    .govuk-footer__licence-logo {
+    .usa-footer__licence-logo {
         margin-bottom: 15px
     }
 }
 
-.govuk-footer__licence-description {
+.usa-footer__licence-description {
     display: inline-block
 }
 
-.govuk-footer__copyright-logo {
+.usa-footer__copyright-logo {
     display: inline-block;
     min-width: 125px;
     padding-top: 112px;
@@ -3469,46 +3469,46 @@ a:focus {
 only screen and (min-device-pixel-ratio: 2),
 only screen and (min-resolution: 192dpi),
 only screen and (min-resolution: 2dppx) {
-    .govuk-footer__copyright-logo {
+    .usa-footer__copyright-logo {
         background-image: url("/static_503/images/govuk-crest-2x.png")
     }
 }
 
-.govuk-footer__inline-list {
+.usa-footer__inline-list {
     margin-top: 0;
     margin-bottom: 15px;
     padding: 0
 }
 
-.govuk-footer__meta-custom {
+.usa-footer__meta-custom {
     margin-bottom: 20px
 }
 
-.govuk-footer__inline-list-item {
+.usa-footer__inline-list-item {
     display: inline-block;
     margin-right: 15px;
     margin-bottom: 5px
 }
 
-.govuk-footer__heading {
+.usa-footer__heading {
     margin-bottom: 25px;
     padding-bottom: 20px;
     border-bottom: 1px solid #bfc1c3
 }
 
 @media (min-width: 40.0625em) {
-    .govuk-footer__heading {
+    .usa-footer__heading {
         margin-bottom: 40px
     }
 }
 
 @media (max-width: 40.0525em) {
-    .govuk-footer__heading {
+    .usa-footer__heading {
         padding-bottom: 10px
     }
 }
 
-.govuk-footer__navigation {
+.usa-footer__navigation {
     display: -webkit-box;
     display: -webkit-flex;
     display: -ms-flexbox;
@@ -3520,7 +3520,7 @@ only screen and (min-resolution: 2dppx) {
     flex-wrap: wrap
 }
 
-.govuk-footer__section {
+.usa-footer__section {
     display: inline-block;
     margin-right: 15px;
     margin-bottom: 30px;
@@ -3536,7 +3536,7 @@ only screen and (min-resolution: 2dppx) {
 }
 
 @media (max-width: 48.0525em) {
-    .govuk-footer__section {
+    .usa-footer__section {
         -webkit-flex-basis: 200px;
         -ms-flex-preferred-size: 200px;
         flex-basis: 200px
@@ -3544,7 +3544,7 @@ only screen and (min-resolution: 2dppx) {
 }
 
 @media (min-width: 48.0625em) {
-    .govuk-footer__section:first-child {
+    .usa-footer__section:first-child {
         -webkit-box-flex: 2;
         -webkit-flex-grow: 2;
         -ms-flex-positive: 2;
@@ -3552,7 +3552,7 @@ only screen and (min-resolution: 2dppx) {
     }
 }
 
-.govuk-footer__list {
+.usa-footer__list {
     margin: 0;
     padding: 0;
     list-style: none;
@@ -3562,30 +3562,30 @@ only screen and (min-resolution: 2dppx) {
 }
 
 @media (min-width: 48.0625em) {
-    .govuk-footer__list--columns-2 {
+    .usa-footer__list--columns-2 {
         -webkit-column-count: 2;
         -moz-column-count: 2;
         column-count: 2
     }
 
-    .govuk-footer__list--columns-3 {
+    .usa-footer__list--columns-3 {
         -webkit-column-count: 3;
         -moz-column-count: 3;
         column-count: 3
     }
 }
 
-.govuk-footer__list-item {
+.usa-footer__list-item {
     margin-bottom: 15px
 }
 
 @media (min-width: 40.0625em) {
-    .govuk-footer__list-item {
+    .usa-footer__list-item {
         margin-bottom: 20px
     }
 }
 
-.govuk-footer__list-item:last-child {
+.usa-footer__list-item:last-child {
     margin-bottom: 0
 }
 
@@ -4877,7 +4877,7 @@ only screen and (min-resolution: 2dppx) {
 }
 
 @media (min-width: 48.0625em) {
-    .govuk-footer__list--columns-4 {
+    .usa-footer__list--columns-4 {
         -webkit-column-count: 4;
         -moz-column-count: 4;
         column-count: 4
diff --git a/paas-failwhale/static_503/stylesheets/print.css b/paas-failwhale/static_503/stylesheets/print.css
index 62fb07d7b..d4d9d49f7 100644
--- a/paas-failwhale/static_503/stylesheets/print.css
+++ b/paas-failwhale/static_503/stylesheets/print.css
@@ -1 +1 @@
-.govuk-link{font-family:"nta",Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}/*! Copyright (c) 2011 by Margaret Calvert & Henrik Kubel. All rights reserved. The font has been customised for exclusive use on gov.uk. This cut is not commercially available. */@font-face{font-family:"nta";src:url("/static_503/fonts/light-2c037cf7e1-v1.eot");src:url("/static_503/fonts/light-2c037cf7e1-v1.eot?#iefix") format("embedded-opentype"),url("/static_503/fonts/light-f38ad40456-v1.woff2") format("woff2"),url("/static_503/fonts/light-458f8ea81c-v1.woff") format("woff");font-weight:normal;font-style:normal;font-display:fallback}@font-face{font-family:"nta";src:url("/static_503/fonts/bold-fb2676462a-v1.eot");src:url("/static_503/fonts/bold-fb2676462a-v1.eot?#iefix") format("embedded-opentype"),url("/static_503/fonts/bold-a2452cb66f-v1.woff2") format("woff2"),url("/static_503/fonts/bold-f38c792ac2-v1.woff") format("woff");font-weight:bold;font-style:normal;font-display:fallback}@font-face{font-family:"ntatabularnumbers";src:url("/static_503/fonts/light-tabular-498ea8ffe2-v1.eot");src:url("/static_503/fonts/light-tabular-498ea8ffe2-v1.eot?#iefix") format("embedded-opentype"),url("/static_503/fonts/light-tabular-851b10ccdd-v1.woff2") format("woff2"),url("/static_503/fonts/light-tabular-62cc6f0a28-v1.woff") format("woff");font-weight:normal;font-style:normal;font-display:fallback}@font-face{font-family:"ntatabularnumbers";src:url("/static_503/fonts/bold-tabular-357fdfbcc3-v1.eot");src:url("/static_503/fonts/bold-tabular-357fdfbcc3-v1.eot?#iefix") format("embedded-opentype"),url("/static_503/fonts/bold-tabular-b89238d840-v1.woff2") format("woff2"),url("/static_503/fonts/bold-tabular-784c21afb8-v1.woff") format("woff");font-weight:bold;font-style:normal;font-display:fallback}@media print{.govuk-link{font-family:sans-serif}}.govuk-link:focus{outline:3px solid #ffbf47;outline-offset:0;background-color:#ffbf47}.govuk-link:link{color:#005ea5}.govuk-link:visited{color:#4c2c92}.govuk-link:hover{color:#2b8cc4}.govuk-link:active{color:#2b8cc4}.govuk-link:focus{color:#0b0c0c}@media print{.govuk-link[href^="/"]::after,.govuk-link[href^="http://"]::after,.govuk-link[href^="https://"]::after{content:" (" attr(href) ")";font-size:90%;word-wrap:break-word}}.govuk-link--muted:link,.govuk-link--muted:visited,.govuk-link--muted:hover,.govuk-link--muted:active{color:#6f777b}.govuk-link--muted:focus{color:#0b0c0c}.govuk-link--text-colour:link,.govuk-link--text-colour:visited,.govuk-link--text-colour:hover,.govuk-link--text-colour:active,.govuk-link--text-colour:focus{color:#0b0c0c}@media print{.govuk-link--text-colour:link,.govuk-link--text-colour:visited,.govuk-link--text-colour:hover,.govuk-link--text-colour:active,.govuk-link--text-colour:focus{color:#000}}.govuk-link--no-visited-state:link{color:#005ea5}.govuk-link--no-visited-state:visited{color:#005ea5}.govuk-link--no-visited-state:hover{color:#2b8cc4}.govuk-link--no-visited-state:active{color:#2b8cc4}.govuk-link--no-visited-state:focus{color:#0b0c0c}.govuk-list{font-family:"nta",Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:16px;font-size:1rem;line-height:1.25;color:#0b0c0c;margin-top:0;margin-bottom:15px;padding-left:0;list-style-type:none}@media print{.govuk-list{font-family:sans-serif}}@media (min-width: 40.0625em){.govuk-list{font-size:19px;font-size:1.1875rem;line-height:1.31579}}@media print{.govuk-list{font-size:14pt;line-height:1.15}}@media print{.govuk-list{color:#000}}@media (min-width: 40.0625em){.govuk-list{margin-bottom:20px}}.govuk-list .govuk-list{margin-top:10px}.govuk-list>li{margin-bottom:5px}.govuk-list--bullet{padding-left:20px;list-style-type:disc}.govuk-list--number{padding-left:20px;list-style-type:decimal}.govuk-list--bullet>li,.govuk-list--number>li{margin-bottom:0}@media (min-width: 40.0625em){.govuk-list--bullet>li,.govuk-list--number>li{margin-bottom:5px}}.govuk-template{background-color:#dee0e2;-webkit-text-size-adjust:100%;-moz-text-size-adjust:100%;-ms-text-size-adjust:100%;text-size-adjust:100%}@media screen{.govuk-template{overflow-y:scroll}}.govuk-template__body{margin:0;background-color:#fff}.govuk-heading-xl{color:#0b0c0c;font-family:"nta",Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:700;font-size:32px;font-size:2rem;line-height:1.09375;display:block;margin-top:0;margin-bottom:30px}@media print{.govuk-heading-xl{color:#000}}@media print{.govuk-heading-xl{font-family:sans-serif}}@media (min-width: 40.0625em){.govuk-heading-xl{font-size:48px;font-size:3rem;line-height:1.04167}}@media print{.govuk-heading-xl{font-size:32pt;line-height:1.15}}@media (min-width: 40.0625em){.govuk-heading-xl{margin-bottom:50px}}.govuk-heading-l{color:#0b0c0c;font-family:"nta",Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:700;font-size:24px;font-size:1.5rem;line-height:1.04167;display:block;margin-top:0;margin-bottom:20px}@media print{.govuk-heading-l{color:#000}}@media print{.govuk-heading-l{font-family:sans-serif}}@media (min-width: 40.0625em){.govuk-heading-l{font-size:36px;font-size:2.25rem;line-height:1.11111}}@media print{.govuk-heading-l{font-size:24pt;line-height:1.05}}@media (min-width: 40.0625em){.govuk-heading-l{margin-bottom:30px}}.govuk-heading-m{color:#0b0c0c;font-family:"nta",Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:700;font-size:18px;font-size:1.125rem;line-height:1.11111;display:block;margin-top:0;margin-bottom:15px}@media print{.govuk-heading-m{color:#000}}@media print{.govuk-heading-m{font-family:sans-serif}}@media (min-width: 40.0625em){.govuk-heading-m{font-size:24px;font-size:1.5rem;line-height:1.25}}@media print{.govuk-heading-m{font-size:18pt;line-height:1.15}}@media (min-width: 40.0625em){.govuk-heading-m{margin-bottom:20px}}.govuk-heading-s{color:#0b0c0c;font-family:"nta",Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:700;font-size:16px;font-size:1rem;line-height:1.25;display:block;margin-top:0;margin-bottom:15px}@media print{.govuk-heading-s{color:#000}}@media print{.govuk-heading-s{font-family:sans-serif}}@media (min-width: 40.0625em){.govuk-heading-s{font-size:19px;font-size:1.1875rem;line-height:1.31579}}@media print{.govuk-heading-s{font-size:14pt;line-height:1.15}}@media (min-width: 40.0625em){.govuk-heading-s{margin-bottom:20px}}.govuk-caption-xl{font-family:"nta",Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:18px;font-size:1.125rem;line-height:1.11111;display:block;margin-bottom:5px;color:#6f777b}@media print{.govuk-caption-xl{font-family:sans-serif}}@media (min-width: 40.0625em){.govuk-caption-xl{font-size:27px;font-size:1.6875rem;line-height:1.11111}}@media print{.govuk-caption-xl{font-size:18pt;line-height:1.15}}.govuk-caption-l{font-family:"nta",Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:18px;font-size:1.125rem;line-height:1.11111;display:block;margin-bottom:5px;color:#6f777b}@media print{.govuk-caption-l{font-family:sans-serif}}@media (min-width: 40.0625em){.govuk-caption-l{font-size:24px;font-size:1.5rem;line-height:1.25}}@media print{.govuk-caption-l{font-size:18pt;line-height:1.15}}@media (min-width: 40.0625em){.govuk-caption-l{margin-bottom:0}}.govuk-caption-m{font-family:"nta",Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:16px;font-size:1rem;line-height:1.25;display:block;color:#6f777b}@media print{.govuk-caption-m{font-family:sans-serif}}@media (min-width: 40.0625em){.govuk-caption-m{font-size:19px;font-size:1.1875rem;line-height:1.31579}}@media print{.govuk-caption-m{font-size:14pt;line-height:1.15}}.govuk-body-l,.govuk-body-lead{color:#0b0c0c;font-family:"nta",Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:18px;font-size:1.125rem;line-height:1.11111;margin-top:0;margin-bottom:20px}@media print{.govuk-body-l,.govuk-body-lead{color:#000}}@media print{.govuk-body-l,.govuk-body-lead{font-family:sans-serif}}@media (min-width: 40.0625em){.govuk-body-l,.govuk-body-lead{font-size:24px;font-size:1.5rem;line-height:1.25}}@media print{.govuk-body-l,.govuk-body-lead{font-size:18pt;line-height:1.15}}@media (min-width: 40.0625em){.govuk-body-l,.govuk-body-lead{margin-bottom:30px}}.govuk-body-m,.govuk-body{color:#0b0c0c;font-family:"nta",Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:16px;font-size:1rem;line-height:1.25;margin-top:0;margin-bottom:15px}@media print{.govuk-body-m,.govuk-body{color:#000}}@media print{.govuk-body-m,.govuk-body{font-family:sans-serif}}@media (min-width: 40.0625em){.govuk-body-m,.govuk-body{font-size:19px;font-size:1.1875rem;line-height:1.31579}}@media print{.govuk-body-m,.govuk-body{font-size:14pt;line-height:1.15}}@media (min-width: 40.0625em){.govuk-body-m,.govuk-body{margin-bottom:20px}}.govuk-body-s{color:#0b0c0c;font-family:"nta",Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:14px;font-size:.875rem;line-height:1.14286;margin-top:0;margin-bottom:15px}@media print{.govuk-body-s{color:#000}}@media print{.govuk-body-s{font-family:sans-serif}}@media (min-width: 40.0625em){.govuk-body-s{font-size:16px;font-size:1rem;line-height:1.25}}@media print{.govuk-body-s{font-size:14pt;line-height:1.2}}@media (min-width: 40.0625em){.govuk-body-s{margin-bottom:20px}}.govuk-body-xs{color:#0b0c0c;font-family:"nta",Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:12px;font-size:.75rem;line-height:1.25;margin-top:0;margin-bottom:15px}@media print{.govuk-body-xs{color:#000}}@media print{.govuk-body-xs{font-family:sans-serif}}@media (min-width: 40.0625em){.govuk-body-xs{font-size:14px;font-size:.875rem;line-height:1.42857}}@media print{.govuk-body-xs{font-size:12pt;line-height:1.2}}@media (min-width: 40.0625em){.govuk-body-xs{margin-bottom:20px}}.govuk-body-l+.govuk-heading-l,.govuk-body-lead+.govuk-heading-l{padding-top:5px}@media (min-width: 40.0625em){.govuk-body-l+.govuk-heading-l,.govuk-body-lead+.govuk-heading-l{padding-top:10px}}.govuk-body-m+.govuk-heading-l,.govuk-body+.govuk-heading-l,.govuk-body-s+.govuk-heading-l,.govuk-list+.govuk-heading-l{padding-top:15px}@media (min-width: 40.0625em){.govuk-body-m+.govuk-heading-l,.govuk-body+.govuk-heading-l,.govuk-body-s+.govuk-heading-l,.govuk-list+.govuk-heading-l{padding-top:20px}}.govuk-body-m+.govuk-heading-m,.govuk-body+.govuk-heading-m,.govuk-body-s+.govuk-heading-m,.govuk-list+.govuk-heading-m,.govuk-body-m+.govuk-heading-s,.govuk-body+.govuk-heading-s,.govuk-body-s+.govuk-heading-s,.govuk-list+.govuk-heading-s{padding-top:5px}@media (min-width: 40.0625em){.govuk-body-m+.govuk-heading-m,.govuk-body+.govuk-heading-m,.govuk-body-s+.govuk-heading-m,.govuk-list+.govuk-heading-m,.govuk-body-m+.govuk-heading-s,.govuk-body+.govuk-heading-s,.govuk-body-s+.govuk-heading-s,.govuk-list+.govuk-heading-s{padding-top:10px}}.govuk-section-break{margin:0;border:0}.govuk-section-break--xl{margin-top:30px;margin-bottom:30px}@media (min-width: 40.0625em){.govuk-section-break--xl{margin-top:50px}}@media (min-width: 40.0625em){.govuk-section-break--xl{margin-bottom:50px}}.govuk-section-break--l{margin-top:20px;margin-bottom:20px}@media (min-width: 40.0625em){.govuk-section-break--l{margin-top:30px}}@media (min-width: 40.0625em){.govuk-section-break--l{margin-bottom:30px}}.govuk-section-break--m{margin-top:15px;margin-bottom:15px}@media (min-width: 40.0625em){.govuk-section-break--m{margin-top:20px}}@media (min-width: 40.0625em){.govuk-section-break--m{margin-bottom:20px}}.govuk-section-break--visible{border-bottom:1px solid #bfc1c3}.govuk-form-group{margin-bottom:20px}.govuk-form-group:after{content:"";display:block;clear:both}@media (min-width: 40.0625em){.govuk-form-group{margin-bottom:30px}}.govuk-form-group .govuk-form-group:last-of-type{margin-bottom:0}.govuk-form-group--error{padding-left:15px;border-left:5px solid #b10e1e}.govuk-form-group--error .govuk-form-group{padding:0;border:0}.govuk-grid-row{margin-right:-15px;margin-left:-15px}.govuk-grid-row:after{content:"";display:block;clear:both}.govuk-grid-column-one-quarter{box-sizing:border-box;width:100%;padding:0 15px}@media (min-width: 40.0625em){.govuk-grid-column-one-quarter{width:25%;float:left}}.govuk-grid-column-one-third{box-sizing:border-box;width:100%;padding:0 15px}@media (min-width: 40.0625em){.govuk-grid-column-one-third{width:33.3333%;float:left}}.govuk-grid-column-one-half{box-sizing:border-box;width:100%;padding:0 15px}@media (min-width: 40.0625em){.govuk-grid-column-one-half{width:50%;float:left}}.govuk-grid-column-two-thirds{box-sizing:border-box;width:100%;padding:0 15px}@media (min-width: 40.0625em){.govuk-grid-column-two-thirds{width:66.6666%;float:left}}.govuk-grid-column-three-quarters{box-sizing:border-box;width:100%;padding:0 15px}@media (min-width: 40.0625em){.govuk-grid-column-three-quarters{width:75%;float:left}}.govuk-grid-column-full{box-sizing:border-box;width:100%;padding:0 15px}@media (min-width: 40.0625em){.govuk-grid-column-full{width:100%;float:left}}.govuk-grid-column-one-quarter-from-desktop{box-sizing:border-box;padding:0 15px}@media (min-width: 48.0625em){.govuk-grid-column-one-quarter-from-desktop{width:25%;float:left}}.govuk-grid-column-one-third-from-desktop{box-sizing:border-box;padding:0 15px}@media (min-width: 48.0625em){.govuk-grid-column-one-third-from-desktop{width:33.3333%;float:left}}.govuk-grid-column-one-half-from-desktop{box-sizing:border-box;padding:0 15px}@media (min-width: 48.0625em){.govuk-grid-column-one-half-from-desktop{width:50%;float:left}}.govuk-grid-column-two-thirds-from-desktop{box-sizing:border-box;padding:0 15px}@media (min-width: 48.0625em){.govuk-grid-column-two-thirds-from-desktop{width:66.6666%;float:left}}.govuk-grid-column-three-quarters-from-desktop{box-sizing:border-box;padding:0 15px}@media (min-width: 48.0625em){.govuk-grid-column-three-quarters-from-desktop{width:75%;float:left}}.govuk-grid-column-full-from-desktop{box-sizing:border-box;padding:0 15px}@media (min-width: 48.0625em){.govuk-grid-column-full-from-desktop{width:100%;float:left}}.govuk-main-wrapper{display:block;padding-top:20px;padding-bottom:20px}@media (min-width: 40.0625em){.govuk-main-wrapper{padding-top:40px;padding-bottom:40px}}.govuk-main-wrapper--l{padding-top:30px}@media (min-width: 40.0625em){.govuk-main-wrapper--l{padding-top:50px}}.govuk-width-container{max-width:960px;margin:0 15px}@supports (margin: max(calc(0px))){.govuk-width-container{margin-right:max(15px, calc(15px + env(safe-area-inset-right)));margin-left:max(15px, calc(15px + env(safe-area-inset-left)))}}@media (min-width: 40.0625em){.govuk-width-container{margin:0 30px}@supports (margin: max(calc(0px))){.govuk-width-container{margin-right:max(30px, calc(15px + env(safe-area-inset-right)));margin-left:max(30px, calc(15px + env(safe-area-inset-left)))}}}@media (min-width: 1020px){.govuk-width-container{margin:0 auto}@supports (margin: max(calc(0px))){.govuk-width-container{margin:0 auto}}}*{background:transparent;color:black;text-shadow:none;filter:none;-ms-filter:none}body{font-family:"nta",Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:12px;font-size:.75rem;line-height:1.25;margin:0;padding:0;width:100%}@media print{body{font-family:sans-serif}}@media (min-width: 40.0625em){body{font-size:14px;font-size:.875rem;line-height:1.42857}}@media print{body{font-size:12pt;line-height:1.2}}a,a:visited{word-wrap:break-word}a[href^="/"]:after,a[href^="http://"]:after,a[href^="https://"]:after{content:" (" attr(href) ")";font-size:90%}a[href^="javascript:"]:after,a[href^="#"]:after{content:""}img{max-width:100% !important}select{background:white}.govuk-header .govuk-header__logo{font-family:"nta",Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:16px;font-size:1rem;line-height:1.25;text-rendering:optimizeLegibility}@media print{.govuk-header .govuk-header__logo{font-family:sans-serif}}@media (min-width: 40.0625em){.govuk-header .govuk-header__logo{font-size:19px;font-size:1.1875rem;line-height:1.31579}}@media print{.govuk-header .govuk-header__logo{font-size:14pt;line-height:1.15}}.govuk-header .govuk-header__logo a,.govuk-header .govuk-header__logo a:visited{text-decoration:none}.govuk-header .govuk-header__logo a:after{content:""}.govuk-header .govuk-header__logo svg{width:45px;height:40px;position:relative;top:-3px;vertical-align:bottom}.usa-sr-only,.usa-sr-only-focusable,.notify-cookie-message,.govuk-skip-link,.govuk-footer{display:none !important}
+.govuk-link{font-family:"nta",Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}/*! Copyright (c) 2011 by Margaret Calvert & Henrik Kubel. All rights reserved. The font has been customised for exclusive use on gov.uk. This cut is not commercially available. */@font-face{font-family:"nta";src:url("/static_503/fonts/light-2c037cf7e1-v1.eot");src:url("/static_503/fonts/light-2c037cf7e1-v1.eot?#iefix") format("embedded-opentype"),url("/static_503/fonts/light-f38ad40456-v1.woff2") format("woff2"),url("/static_503/fonts/light-458f8ea81c-v1.woff") format("woff");font-weight:normal;font-style:normal;font-display:fallback}@font-face{font-family:"nta";src:url("/static_503/fonts/bold-fb2676462a-v1.eot");src:url("/static_503/fonts/bold-fb2676462a-v1.eot?#iefix") format("embedded-opentype"),url("/static_503/fonts/bold-a2452cb66f-v1.woff2") format("woff2"),url("/static_503/fonts/bold-f38c792ac2-v1.woff") format("woff");font-weight:bold;font-style:normal;font-display:fallback}@font-face{font-family:"ntatabularnumbers";src:url("/static_503/fonts/light-tabular-498ea8ffe2-v1.eot");src:url("/static_503/fonts/light-tabular-498ea8ffe2-v1.eot?#iefix") format("embedded-opentype"),url("/static_503/fonts/light-tabular-851b10ccdd-v1.woff2") format("woff2"),url("/static_503/fonts/light-tabular-62cc6f0a28-v1.woff") format("woff");font-weight:normal;font-style:normal;font-display:fallback}@font-face{font-family:"ntatabularnumbers";src:url("/static_503/fonts/bold-tabular-357fdfbcc3-v1.eot");src:url("/static_503/fonts/bold-tabular-357fdfbcc3-v1.eot?#iefix") format("embedded-opentype"),url("/static_503/fonts/bold-tabular-b89238d840-v1.woff2") format("woff2"),url("/static_503/fonts/bold-tabular-784c21afb8-v1.woff") format("woff");font-weight:bold;font-style:normal;font-display:fallback}@media print{.govuk-link{font-family:sans-serif}}.govuk-link:focus{outline:3px solid #ffbf47;outline-offset:0;background-color:#ffbf47}.govuk-link:link{color:#005ea5}.govuk-link:visited{color:#4c2c92}.govuk-link:hover{color:#2b8cc4}.govuk-link:active{color:#2b8cc4}.govuk-link:focus{color:#0b0c0c}@media print{.govuk-link[href^="/"]::after,.govuk-link[href^="http://"]::after,.govuk-link[href^="https://"]::after{content:" (" attr(href) ")";font-size:90%;word-wrap:break-word}}.govuk-link--muted:link,.govuk-link--muted:visited,.govuk-link--muted:hover,.govuk-link--muted:active{color:#6f777b}.govuk-link--muted:focus{color:#0b0c0c}.govuk-link--text-colour:link,.govuk-link--text-colour:visited,.govuk-link--text-colour:hover,.govuk-link--text-colour:active,.govuk-link--text-colour:focus{color:#0b0c0c}@media print{.govuk-link--text-colour:link,.govuk-link--text-colour:visited,.govuk-link--text-colour:hover,.govuk-link--text-colour:active,.govuk-link--text-colour:focus{color:#000}}.govuk-link--no-visited-state:link{color:#005ea5}.govuk-link--no-visited-state:visited{color:#005ea5}.govuk-link--no-visited-state:hover{color:#2b8cc4}.govuk-link--no-visited-state:active{color:#2b8cc4}.govuk-link--no-visited-state:focus{color:#0b0c0c}.govuk-list{font-family:"nta",Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:16px;font-size:1rem;line-height:1.25;color:#0b0c0c;margin-top:0;margin-bottom:15px;padding-left:0;list-style-type:none}@media print{.govuk-list{font-family:sans-serif}}@media (min-width: 40.0625em){.govuk-list{font-size:19px;font-size:1.1875rem;line-height:1.31579}}@media print{.govuk-list{font-size:14pt;line-height:1.15}}@media print{.govuk-list{color:#000}}@media (min-width: 40.0625em){.govuk-list{margin-bottom:20px}}.govuk-list .govuk-list{margin-top:10px}.govuk-list>li{margin-bottom:5px}.govuk-list--bullet{padding-left:20px;list-style-type:disc}.govuk-list--number{padding-left:20px;list-style-type:decimal}.govuk-list--bullet>li,.govuk-list--number>li{margin-bottom:0}@media (min-width: 40.0625em){.govuk-list--bullet>li,.govuk-list--number>li{margin-bottom:5px}}.govuk-template{background-color:#dee0e2;-webkit-text-size-adjust:100%;-moz-text-size-adjust:100%;-ms-text-size-adjust:100%;text-size-adjust:100%}@media screen{.govuk-template{overflow-y:scroll}}.govuk-template__body{margin:0;background-color:#fff}.govuk-heading-xl{color:#0b0c0c;font-family:"nta",Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:700;font-size:32px;font-size:2rem;line-height:1.09375;display:block;margin-top:0;margin-bottom:30px}@media print{.govuk-heading-xl{color:#000}}@media print{.govuk-heading-xl{font-family:sans-serif}}@media (min-width: 40.0625em){.govuk-heading-xl{font-size:48px;font-size:3rem;line-height:1.04167}}@media print{.govuk-heading-xl{font-size:32pt;line-height:1.15}}@media (min-width: 40.0625em){.govuk-heading-xl{margin-bottom:50px}}.govuk-heading-l{color:#0b0c0c;font-family:"nta",Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:700;font-size:24px;font-size:1.5rem;line-height:1.04167;display:block;margin-top:0;margin-bottom:20px}@media print{.govuk-heading-l{color:#000}}@media print{.govuk-heading-l{font-family:sans-serif}}@media (min-width: 40.0625em){.govuk-heading-l{font-size:36px;font-size:2.25rem;line-height:1.11111}}@media print{.govuk-heading-l{font-size:24pt;line-height:1.05}}@media (min-width: 40.0625em){.govuk-heading-l{margin-bottom:30px}}.govuk-heading-m{color:#0b0c0c;font-family:"nta",Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:700;font-size:18px;font-size:1.125rem;line-height:1.11111;display:block;margin-top:0;margin-bottom:15px}@media print{.govuk-heading-m{color:#000}}@media print{.govuk-heading-m{font-family:sans-serif}}@media (min-width: 40.0625em){.govuk-heading-m{font-size:24px;font-size:1.5rem;line-height:1.25}}@media print{.govuk-heading-m{font-size:18pt;line-height:1.15}}@media (min-width: 40.0625em){.govuk-heading-m{margin-bottom:20px}}.govuk-heading-s{color:#0b0c0c;font-family:"nta",Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:700;font-size:16px;font-size:1rem;line-height:1.25;display:block;margin-top:0;margin-bottom:15px}@media print{.govuk-heading-s{color:#000}}@media print{.govuk-heading-s{font-family:sans-serif}}@media (min-width: 40.0625em){.govuk-heading-s{font-size:19px;font-size:1.1875rem;line-height:1.31579}}@media print{.govuk-heading-s{font-size:14pt;line-height:1.15}}@media (min-width: 40.0625em){.govuk-heading-s{margin-bottom:20px}}.govuk-caption-xl{font-family:"nta",Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:18px;font-size:1.125rem;line-height:1.11111;display:block;margin-bottom:5px;color:#6f777b}@media print{.govuk-caption-xl{font-family:sans-serif}}@media (min-width: 40.0625em){.govuk-caption-xl{font-size:27px;font-size:1.6875rem;line-height:1.11111}}@media print{.govuk-caption-xl{font-size:18pt;line-height:1.15}}.govuk-caption-l{font-family:"nta",Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:18px;font-size:1.125rem;line-height:1.11111;display:block;margin-bottom:5px;color:#6f777b}@media print{.govuk-caption-l{font-family:sans-serif}}@media (min-width: 40.0625em){.govuk-caption-l{font-size:24px;font-size:1.5rem;line-height:1.25}}@media print{.govuk-caption-l{font-size:18pt;line-height:1.15}}@media (min-width: 40.0625em){.govuk-caption-l{margin-bottom:0}}.govuk-caption-m{font-family:"nta",Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:16px;font-size:1rem;line-height:1.25;display:block;color:#6f777b}@media print{.govuk-caption-m{font-family:sans-serif}}@media (min-width: 40.0625em){.govuk-caption-m{font-size:19px;font-size:1.1875rem;line-height:1.31579}}@media print{.govuk-caption-m{font-size:14pt;line-height:1.15}}.govuk-body-l,.govuk-body-lead{color:#0b0c0c;font-family:"nta",Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:18px;font-size:1.125rem;line-height:1.11111;margin-top:0;margin-bottom:20px}@media print{.govuk-body-l,.govuk-body-lead{color:#000}}@media print{.govuk-body-l,.govuk-body-lead{font-family:sans-serif}}@media (min-width: 40.0625em){.govuk-body-l,.govuk-body-lead{font-size:24px;font-size:1.5rem;line-height:1.25}}@media print{.govuk-body-l,.govuk-body-lead{font-size:18pt;line-height:1.15}}@media (min-width: 40.0625em){.govuk-body-l,.govuk-body-lead{margin-bottom:30px}}.govuk-body-m,.govuk-body{color:#0b0c0c;font-family:"nta",Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:16px;font-size:1rem;line-height:1.25;margin-top:0;margin-bottom:15px}@media print{.govuk-body-m,.govuk-body{color:#000}}@media print{.govuk-body-m,.govuk-body{font-family:sans-serif}}@media (min-width: 40.0625em){.govuk-body-m,.govuk-body{font-size:19px;font-size:1.1875rem;line-height:1.31579}}@media print{.govuk-body-m,.govuk-body{font-size:14pt;line-height:1.15}}@media (min-width: 40.0625em){.govuk-body-m,.govuk-body{margin-bottom:20px}}.govuk-body-s{color:#0b0c0c;font-family:"nta",Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:14px;font-size:.875rem;line-height:1.14286;margin-top:0;margin-bottom:15px}@media print{.govuk-body-s{color:#000}}@media print{.govuk-body-s{font-family:sans-serif}}@media (min-width: 40.0625em){.govuk-body-s{font-size:16px;font-size:1rem;line-height:1.25}}@media print{.govuk-body-s{font-size:14pt;line-height:1.2}}@media (min-width: 40.0625em){.govuk-body-s{margin-bottom:20px}}.govuk-body-xs{color:#0b0c0c;font-family:"nta",Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:12px;font-size:.75rem;line-height:1.25;margin-top:0;margin-bottom:15px}@media print{.govuk-body-xs{color:#000}}@media print{.govuk-body-xs{font-family:sans-serif}}@media (min-width: 40.0625em){.govuk-body-xs{font-size:14px;font-size:.875rem;line-height:1.42857}}@media print{.govuk-body-xs{font-size:12pt;line-height:1.2}}@media (min-width: 40.0625em){.govuk-body-xs{margin-bottom:20px}}.govuk-body-l+.govuk-heading-l,.govuk-body-lead+.govuk-heading-l{padding-top:5px}@media (min-width: 40.0625em){.govuk-body-l+.govuk-heading-l,.govuk-body-lead+.govuk-heading-l{padding-top:10px}}.govuk-body-m+.govuk-heading-l,.govuk-body+.govuk-heading-l,.govuk-body-s+.govuk-heading-l,.govuk-list+.govuk-heading-l{padding-top:15px}@media (min-width: 40.0625em){.govuk-body-m+.govuk-heading-l,.govuk-body+.govuk-heading-l,.govuk-body-s+.govuk-heading-l,.govuk-list+.govuk-heading-l{padding-top:20px}}.govuk-body-m+.govuk-heading-m,.govuk-body+.govuk-heading-m,.govuk-body-s+.govuk-heading-m,.govuk-list+.govuk-heading-m,.govuk-body-m+.govuk-heading-s,.govuk-body+.govuk-heading-s,.govuk-body-s+.govuk-heading-s,.govuk-list+.govuk-heading-s{padding-top:5px}@media (min-width: 40.0625em){.govuk-body-m+.govuk-heading-m,.govuk-body+.govuk-heading-m,.govuk-body-s+.govuk-heading-m,.govuk-list+.govuk-heading-m,.govuk-body-m+.govuk-heading-s,.govuk-body+.govuk-heading-s,.govuk-body-s+.govuk-heading-s,.govuk-list+.govuk-heading-s{padding-top:10px}}.govuk-section-break{margin:0;border:0}.govuk-section-break--xl{margin-top:30px;margin-bottom:30px}@media (min-width: 40.0625em){.govuk-section-break--xl{margin-top:50px}}@media (min-width: 40.0625em){.govuk-section-break--xl{margin-bottom:50px}}.govuk-section-break--l{margin-top:20px;margin-bottom:20px}@media (min-width: 40.0625em){.govuk-section-break--l{margin-top:30px}}@media (min-width: 40.0625em){.govuk-section-break--l{margin-bottom:30px}}.govuk-section-break--m{margin-top:15px;margin-bottom:15px}@media (min-width: 40.0625em){.govuk-section-break--m{margin-top:20px}}@media (min-width: 40.0625em){.govuk-section-break--m{margin-bottom:20px}}.govuk-section-break--visible{border-bottom:1px solid #bfc1c3}.govuk-form-group{margin-bottom:20px}.govuk-form-group:after{content:"";display:block;clear:both}@media (min-width: 40.0625em){.govuk-form-group{margin-bottom:30px}}.govuk-form-group .govuk-form-group:last-of-type{margin-bottom:0}.govuk-form-group--error{padding-left:15px;border-left:5px solid #b10e1e}.govuk-form-group--error .govuk-form-group{padding:0;border:0}.govuk-grid-row{margin-right:-15px;margin-left:-15px}.govuk-grid-row:after{content:"";display:block;clear:both}.govuk-grid-column-one-quarter{box-sizing:border-box;width:100%;padding:0 15px}@media (min-width: 40.0625em){.govuk-grid-column-one-quarter{width:25%;float:left}}.govuk-grid-column-one-third{box-sizing:border-box;width:100%;padding:0 15px}@media (min-width: 40.0625em){.govuk-grid-column-one-third{width:33.3333%;float:left}}.govuk-grid-column-one-half{box-sizing:border-box;width:100%;padding:0 15px}@media (min-width: 40.0625em){.govuk-grid-column-one-half{width:50%;float:left}}.govuk-grid-column-two-thirds{box-sizing:border-box;width:100%;padding:0 15px}@media (min-width: 40.0625em){.govuk-grid-column-two-thirds{width:66.6666%;float:left}}.govuk-grid-column-three-quarters{box-sizing:border-box;width:100%;padding:0 15px}@media (min-width: 40.0625em){.govuk-grid-column-three-quarters{width:75%;float:left}}.govuk-grid-column-full{box-sizing:border-box;width:100%;padding:0 15px}@media (min-width: 40.0625em){.govuk-grid-column-full{width:100%;float:left}}.govuk-grid-column-one-quarter-from-desktop{box-sizing:border-box;padding:0 15px}@media (min-width: 48.0625em){.govuk-grid-column-one-quarter-from-desktop{width:25%;float:left}}.govuk-grid-column-one-third-from-desktop{box-sizing:border-box;padding:0 15px}@media (min-width: 48.0625em){.govuk-grid-column-one-third-from-desktop{width:33.3333%;float:left}}.govuk-grid-column-one-half-from-desktop{box-sizing:border-box;padding:0 15px}@media (min-width: 48.0625em){.govuk-grid-column-one-half-from-desktop{width:50%;float:left}}.govuk-grid-column-two-thirds-from-desktop{box-sizing:border-box;padding:0 15px}@media (min-width: 48.0625em){.govuk-grid-column-two-thirds-from-desktop{width:66.6666%;float:left}}.govuk-grid-column-three-quarters-from-desktop{box-sizing:border-box;padding:0 15px}@media (min-width: 48.0625em){.govuk-grid-column-three-quarters-from-desktop{width:75%;float:left}}.govuk-grid-column-full-from-desktop{box-sizing:border-box;padding:0 15px}@media (min-width: 48.0625em){.govuk-grid-column-full-from-desktop{width:100%;float:left}}.govuk-main-wrapper{display:block;padding-top:20px;padding-bottom:20px}@media (min-width: 40.0625em){.govuk-main-wrapper{padding-top:40px;padding-bottom:40px}}.govuk-main-wrapper--l{padding-top:30px}@media (min-width: 40.0625em){.govuk-main-wrapper--l{padding-top:50px}}.govuk-width-container{max-width:960px;margin:0 15px}@supports (margin: max(calc(0px))){.govuk-width-container{margin-right:max(15px, calc(15px + env(safe-area-inset-right)));margin-left:max(15px, calc(15px + env(safe-area-inset-left)))}}@media (min-width: 40.0625em){.govuk-width-container{margin:0 30px}@supports (margin: max(calc(0px))){.govuk-width-container{margin-right:max(30px, calc(15px + env(safe-area-inset-right)));margin-left:max(30px, calc(15px + env(safe-area-inset-left)))}}}@media (min-width: 1020px){.govuk-width-container{margin:0 auto}@supports (margin: max(calc(0px))){.govuk-width-container{margin:0 auto}}}*{background:transparent;color:black;text-shadow:none;filter:none;-ms-filter:none}body{font-family:"nta",Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:12px;font-size:.75rem;line-height:1.25;margin:0;padding:0;width:100%}@media print{body{font-family:sans-serif}}@media (min-width: 40.0625em){body{font-size:14px;font-size:.875rem;line-height:1.42857}}@media print{body{font-size:12pt;line-height:1.2}}a,a:visited{word-wrap:break-word}a[href^="/"]:after,a[href^="http://"]:after,a[href^="https://"]:after{content:" (" attr(href) ")";font-size:90%}a[href^="javascript:"]:after,a[href^="#"]:after{content:""}img{max-width:100% !important}select{background:white}.govuk-header .govuk-header__logo{font-family:"nta",Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:16px;font-size:1rem;line-height:1.25;text-rendering:optimizeLegibility}@media print{.govuk-header .govuk-header__logo{font-family:sans-serif}}@media (min-width: 40.0625em){.govuk-header .govuk-header__logo{font-size:19px;font-size:1.1875rem;line-height:1.31579}}@media print{.govuk-header .govuk-header__logo{font-size:14pt;line-height:1.15}}.govuk-header .govuk-header__logo a,.govuk-header .govuk-header__logo a:visited{text-decoration:none}.govuk-header .govuk-header__logo a:after{content:""}.govuk-header .govuk-header__logo svg{width:45px;height:40px;position:relative;top:-3px;vertical-align:bottom}.usa-sr-only,.usa-sr-only-focusable,.notify-cookie-message,.govuk-skip-link,.usa-footer{display:none !important}
diff --git a/tests/app/main/views/organizations/test_organizations.py b/tests/app/main/views/organizations/test_organizations.py
index 255b2b18d..9669f35cc 100644
--- a/tests/app/main/views/organizations/test_organizations.py
+++ b/tests/app/main/views/organizations/test_organizations.py
@@ -84,7 +84,7 @@ def test_view_organization_shows_the_correct_organization(
     )
 
     assert normalize_spaces(page.select_one('h1').text) == 'Usage'
-    assert normalize_spaces(page.select_one('.govuk-hint').text) == (
+    assert normalize_spaces(page.select_one('.usa-hint').text) == (
         'Test 1 has no live services on Notify.gov'
     )
     assert not page.select('a[download]')
@@ -383,7 +383,7 @@ def test_organization_services_shows_live_services_and_usage(
     assert normalize_spaces(usage_rows[5].text) == "$42.00 spent on text messages"
 
     # Ensure there’s no ‘this org has no services message’
-    assert not page.select('.govuk-hint')
+    assert not page.select('.usa-hint')
 
 
 @freeze_time("2020-02-20 20:20")
@@ -912,7 +912,7 @@ def test_view_organization_settings(
         }
         if 'hint' in option:
             option_values['hint'] = normalize_spaces(
-                page.select_one('label[for={}] + .govuk-hint'.format(radios[index]['id'])).text)
+                page.select_one('label[for={}] + .usa-hint'.format(radios[index]['id'])).text)
         assert option_values == option
 
     if expected_selected:
diff --git a/tests/app/main/views/test_template_folders.py b/tests/app/main/views/test_template_folders.py
index a4570502a..060fc4f2b 100644
--- a/tests/app/main/views/test_template_folders.py
+++ b/tests/app/main/views/test_template_folders.py
@@ -502,7 +502,7 @@ def test_template_id_is_searchable_for_services_with_api_keys(
         normalize_spaces(item.text)
         for item in page.select(
             # Text which should be hidden from all users
-            r'.template-list-item .govuk-\!-display-none'
+            r'.template-list-item .display-none'
         )
     ] == [
         template_2["id"],
diff --git a/tests/javascripts/collapsibleCheckboxes.test.js b/tests/javascripts/collapsibleCheckboxes.test.js
index bea3c7432..ccc0b061a 100644
--- a/tests/javascripts/collapsibleCheckboxes.test.js
+++ b/tests/javascripts/collapsibleCheckboxes.test.js
@@ -45,7 +45,7 @@ describe('Collapsible fieldset', () => {
           <fieldset class="govuk-fieldset" id="folder_permissions" aria-describedby="users_with_permission-hint">
             <legend class="govuk-fieldset__legend govuk-fieldset__legend--s">
               Folders this team member can see
-              <span class="govuk-hint" id="users_with_permission-hint">
+              <span class="usa-hint" id="users_with_permission-hint">
                 <div class="selection-summary" role="region" aria-live="polite"></div>
               </span>
             </legend>
@@ -146,7 +146,7 @@ describe('Collapsible fieldset', () => {
 
     test("the hint is removed", () => {
 
-      expect(document.querySelector('.govuk-hint')).toBeNull();
+      expect(document.querySelector('.usa-hint')).toBeNull();
 
     });
 
diff --git a/tests/javascripts/errorBanner.test.js b/tests/javascripts/errorBanner.test.js
index ab59eaeb2..7acc7e822 100644
--- a/tests/javascripts/errorBanner.test.js
+++ b/tests/javascripts/errorBanner.test.js
@@ -17,21 +17,21 @@ describe("Error Banner", () => {
       <span class="usa-error-message banner-dangerous js-error-visible">
       </span>`;
       window.GOVUK.ErrorBanner.hideBanner();
-      expect(document.querySelector('.banner-dangerous').classList).toContain('govuk-!-display-none')
+      expect(document.querySelector('.banner-dangerous').classList).toContain('display-none')
     });
   });
 
   describe("The `showBanner` method", () => {
     beforeEach(() => {
       document.body.innerHTML = `
-        <span class="usa-error-message banner-dangerous js-error-visible govuk-!-display-none">
+        <span class="usa-error-message banner-dangerous js-error-visible display-none">
         </span>`;
 
       window.GOVUK.ErrorBanner.showBanner('Some Err');
     });
 
     test("Will show the element", () => {
-      expect(document.querySelector('.banner-dangerous').classList).not.toContain('govuk-!-display-none')
+      expect(document.querySelector('.banner-dangerous').classList).not.toContain('display-none')
     });
   });
 });
diff --git a/tests/javascripts/listEntry.test.js b/tests/javascripts/listEntry.test.js
index 73032c4de..2a7f623d5 100644
--- a/tests/javascripts/listEntry.test.js
+++ b/tests/javascripts/listEntry.test.js
@@ -67,7 +67,7 @@ describe("List entry", () => {
           Domain names
           </span>
         </legend>
-        <span id="domains-hint" class="govuk-hint">
+        <span id="domains-hint" class="usa-hint">
           For example cabinet-office.gov.uk
         </span>
         <div class="input-list" data-module="list-entry" data-list-item-name="domain" id="list-entry-domains">
diff --git a/tests/javascripts/updateContent.test.js b/tests/javascripts/updateContent.test.js
index dc09afa85..9c7cff087 100644
--- a/tests/javascripts/updateContent.test.js
+++ b/tests/javascripts/updateContent.test.js
@@ -302,7 +302,7 @@ describe('Update content', () => {
                   </span>
                 </div>
                 <div class="govuk-grid-column-one-half file-list-status">
-                  <p class="govuk-body govuk-!-margin-bottom-0 govuk-hint">
+                  <p class="govuk-body govuk-!-margin-bottom-0 usa-hint">
                     ${content.status}
                   </p>
                 </div>