diff --git a/app/assets/javascripts/listEntry.js b/app/assets/javascripts/listEntry.js
index 5f98600e1..15c7405fe 100644
--- a/app/assets/javascripts/listEntry.js
+++ b/app/assets/javascripts/listEntry.js
@@ -17,6 +17,7 @@
     this.minEntries = 2;
     this.listItemName = this.$wrapper.data('listItemName');
     this.getSharedAttributes();
+    this.getOriginalClasses();
 
     this.getValues();
     this.maxEntries = this.entries.length;
@@ -26,30 +27,31 @@
   };
   ListEntry.optionalAttributes = ['aria-describedby'];
   ListEntry.prototype.entryTemplate = Hogan.compile(
-    '<div class="list-entry">' +
-      '<label for="{{{id}}}" class="govuk-input--numbered__label">' +
+    '<div class="list-entry margin-bottom-2">' +
+      '<label for="{{{id}}}" class="usa-label">' +
         '<span class="usa-sr-only">{{listItemName}} number </span>{{number}}.' +
       '</label>' +
       '<input' +
+        ' class="usa-input {{classes}}"' +
         ' name="{{name}}"' +
         ' id="{{id}}"' +
         ' {{#value}}value="{{value}}{{/value}}"' +
         ' {{{sharedAttributes}}}' +
       '/>' +
       '{{#button}}' +
-        '<button type="button" class="usa-button input-list__button--remove">' +
+        '<button type="button" class="usa-button--unstyled text-primary margin-top-1 input-list__button--remove">' +
           'Remove<span class="usa-sr-only"> {{listItemName}} number {{number}}</span>' +
         '</button>' +
       '{{/button}}' +
     '</div>'
   );
   ListEntry.prototype.addButtonTemplate = Hogan.compile(
-    '<button type="button" class="usa-button input-list__button--add">Add another {{listItemName}} ({{entriesLeft}} remaining)</button>'
+    '<button type="button" class="usa-button usa-button--outline input-list__button--add margin-top-2">Add another {{listItemName}} ({{entriesLeft}} remaining)</button>'
   );
   ListEntry.prototype.getSharedAttributes = function () {
     var $inputs = this.$wrapper.find('input'),
         attributeTemplate = Hogan.compile(' {{name}}="{{value}}"'),
-        generatedAttributes = ['id', 'name', 'value'],
+        generatedAttributes = ['id', 'name', 'value', 'class'],
         attributes = [],
         attrIdx,
         elmAttributes,
@@ -94,6 +96,27 @@
 
     this.sharedAttributes = (attributes.length) ? getAttributesHTML(attributes) : '';
   };
+  ListEntry.prototype.getOriginalClasses = function () {
+    var $firstInput = this.$wrapper.find('input').first();
+    if ($firstInput.length) {
+      var classList = $firstInput.attr('class');
+      if (classList) {
+        // Remove any GOV.UK or USA numbered classes, keep others
+        this.additionalClasses = classList
+          .split(' ')
+          .filter(function(cls) {
+            return cls &&
+                   !cls.match(/^(govuk-input|usa-input)/) &&
+                   cls !== 'usa-input--numbered';
+          })
+          .join(' ');
+      } else {
+        this.additionalClasses = '';
+      }
+    } else {
+      this.additionalClasses = '';
+    }
+  };
   ListEntry.prototype.getValues = function () {
     this.entries = [];
     this.$wrapper.find('input').each(function (idx, elm) {
@@ -182,7 +205,8 @@
             'name' : this.getId(entryNumber),
             'value' : entry,
             'listItemName' : this.listItemName,
-            'sharedAttributes': this.sharedAttributes
+            'sharedAttributes': this.sharedAttributes,
+            'classes': this.additionalClasses
           };
 
       if (entryNumber > 1) {
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index b3e8bc3f5..758030e2c 100644
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -7,9 +7,6 @@ $(() => GOVUK.modules.start());
 
 $(() => $('.error-message, .usa-error-message').eq(0).parent('label').next('input').trigger('focus'));
 
-$(() => $('.govuk-header__container').on('click', function() {
-  $(this).css('border-color', '#005ea5');
-}));
 
 // Applies our expanded focus style to the siblings of links when that link is wrapped in a heading.
 //
diff --git a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
index da85cb5ba..f8c40f2ad 100644
--- a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
+++ b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
@@ -1092,3 +1092,8 @@ nav.nav {
 .selection-content .usa-form-group--nested li.usa-checkbox {
   margin-top: 0;
 }
+
+// Global styling for radio button legends
+fieldset legend.usa-legend {
+  font-weight: 700;
+}
diff --git a/app/templates/components/checkboxes.html b/app/templates/components/checkboxes.html
new file mode 100644
index 000000000..4ae3d720a
--- /dev/null
+++ b/app/templates/components/checkboxes.html
@@ -0,0 +1,20 @@
+{% from "components/select-input.html" import select, select_list, select_nested, select_wrapper, select_input %}
+
+{% macro checkboxes(field, hint=None, disable=[], option_hints={}, hide_legend=False) %}
+  {{ select(field, hint, disable, option_hints, hide_legend, input="checkbox") }}
+{% endmacro %}
+
+
+{% macro checkbox_list(options, child_map, disable=[], option_hints={}) %}
+  {{ select_list(options, child_map, disable, option_hints, input="checkbox") }}
+{% endmacro %}
+
+
+{% macro checkboxes_nested(field, child_map, hint=None, disable=[], option_hints={}, hide_legend=False) %}
+  {{ select_nested(field, child_map, hint, disable, option_hints, hide_legend, input="checkbox") }}
+{% endmacro %}
+
+
+{% macro checkbox(option, disable=[], option_hints={}, data_target=None, as_list_item=False) %}
+  {{ select_input(option, disable, option_hints, data_target, as_list_item, input="checkbox") }}
+{% endmacro %}
diff --git a/app/templates/components/list-entry.html b/app/templates/components/list-entry.html
index 1788c5210..5e8a7bcaa 100644
--- a/app/templates/components/list-entry.html
+++ b/app/templates/components/list-entry.html
@@ -36,9 +36,9 @@
             {% set autocomplete = "" %}
           {% endif %}
           {% if entry.errors %}
-            {% set label_classes = "usa-input--numbered__label usa-input--numbered__label--error" %}
+            {% set label_classes = "usa-label usa-label--error" %}
           {% else %}
-            {% set label_classes = "usa-input--numbered__label" %}
+            {% set label_classes = "usa-label" %}
           {% endif %}
           {% set field_name = field.name + "-" + loop.index|string %}
           {{ entry(param_extensions={
@@ -48,7 +48,7 @@
               "html": '<span class="usa-sr-only">' + item_name + ' number </span>' + loop.index|string + '.',
               "classes": label_classes
             },
-            "classes": "usa-input--numbered ",
+            "classes": "usa-input",
             "value": field.data[loop.index0],
             "autocomplete": autocomplete
           }) }}
diff --git a/app/templates/components/previous-next-navigation.html b/app/templates/components/previous-next-navigation.html
index 6b9c5c4ab..1c84f74a9 100644
--- a/app/templates/components/previous-next-navigation.html
+++ b/app/templates/components/previous-next-navigation.html
@@ -1,30 +1,30 @@
 {% macro previous_next_navigation(previous_page, next_page) %}
   {% if previous_page or next_page %}
-    <nav class="govuk-previous-and-next-navigation" role="navigation" aria-label="Pagination">
-      <ul class="group">
+    <nav class="usa-pagination margin-y-5 text-left" role="navigation" aria-label="Pagination">
+      <ul class="usa-pagination__list flex-justify-start">
         {% if previous_page %}
-          <li class="previous-page">
-            <a class="usa-link" href="{{previous_page['url']}}" rel="previous" >
-              <span class="pagination-part-title">
-                <svg class="pagination-icon" xmlns="http://www.w3.org/2000/svg" height="13" width="17" viewBox="0 0 17 13">
-                  <path fill="currentColor" d="m6.5938-0.0078125-6.7266 6.7266 6.7441 6.4062 1.377-1.449-4.1856-3.9768h12.896v-2h-12.984l4.2931-4.293-1.414-1.414z"/>
-                </svg>
+          <li class="usa-pagination__item usa-pagination__arrow">
+            <a class="usa-pagination__link usa-pagination__previous-page" href="{{previous_page['url']}}" rel="previous">
+              <svg class="usa-icon" xmlns="http://www.w3.org/2000/svg" height="13" width="17" viewBox="0 0 17 13">
+                <path fill="currentColor" d="m6.5938-0.0078125-6.7266 6.7266 6.7441 6.4062 1.377-1.449-4.1856-3.9768h12.896v-2h-12.984l4.2931-4.293-1.414-1.414z"/>
+              </svg>
+              <span class="usa-pagination__link-text">
                 {{previous_page['title']}}
               </span>
-              <span class="pagination-label">{{previous_page['label']}}</span>
+              <span class="usa-sr-only">{{previous_page['label']}}</span>
             </a>
           </li>
         {% endif %}
         {% if next_page %}
-          <li class="next-page">
-            <a class="usa-link" href="{{next_page['url']}}" rel="next">
-              <span class="pagination-part-title">
+          <li class="usa-pagination__item usa-pagination__arrow">
+            <a class="usa-pagination__link usa-pagination__next-page" href="{{next_page['url']}}" rel="next">
+              <span class="usa-pagination__link-text">
                 {{next_page['title']}}
-                <svg class="pagination-icon" xmlns="http://www.w3.org/2000/svg" height="13" width="17" viewBox="0 0 17 13">
-                  <path fill="currentColor" d="m10.107-0.0078125-1.4136 1.414 4.2926 4.293h-12.986v2h12.896l-4.1855 3.9766 1.377 1.4492 6.7441-6.4062-6.7246-6.7266z"/>
-                </svg>
               </span>
-              <span class="pagination-label">{{next_page['label']}}</span>
+              <svg class="usa-icon" xmlns="http://www.w3.org/2000/svg" height="13" width="17" viewBox="0 0 17 13">
+                <path fill="currentColor" d="m10.107-0.0078125-1.4136 1.414 4.2926 4.293h-12.986v2h12.896l-4.1855 3.9766 1.377 1.4492 6.7441-6.4062-6.7246-6.7266z"/>
+              </svg>
+              <span class="usa-sr-only">{{next_page['label']}}</span>
             </a>
           </li>
         {% endif %}
diff --git a/app/templates/components/select-input.html b/app/templates/components/select-input.html
index e5d4d4ee5..0c7fd59ea 100644
--- a/app/templates/components/select-input.html
+++ b/app/templates/components/select-input.html
@@ -64,9 +64,9 @@
 {% endmacro %}
 
 {% macro select_input(option, disable=[], option_hints={}, data_target=None, as_list_item=False, input="radio") %}
-  <div class="usa-radio" {% if data_target %}data-target="{{ data_target }}"{% endif %}>
+  <div class="usa-{{ input }}" {% if data_target %}data-target="{{ data_target }}"{% endif %}>
     <input
-      id="{{ option.id }}" class="usa-radio__input" name="{{ option.name }}" type="{{ input }}" value="{{ option.data }}"
+      id="{{ option.id }}" class="usa-{{ input }}__input" name="{{ option.name }}" type="{{ input }}" value="{{ option.data }}"
       {% if option.data in disable %}
         disabled
       {% endif %}
@@ -74,7 +74,7 @@
         checked
       {% endif %}
     >
-    <label class="usa-radio__label" for="{{ option.id }}">
+    <label class="usa-{{ input }}__label" for="{{ option.id }}">
       {{ option.label.text }}
       {% if option_hints[option.data] %}
         <span class="usa-hint">
diff --git a/app/templates/views/api/keys/create.html b/app/templates/views/api/keys/create.html
index 0827a85e7..f7cd002d2 100644
--- a/app/templates/views/api/keys/create.html
+++ b/app/templates/views/api/keys/create.html
@@ -4,6 +4,7 @@
 {% from "components/banner.html" import banner_wrapper %}
 {% from "components/form.html" import form_wrapper %}
 {% from "components/components/back-link/macro.njk" import usaBackLink %}
+{% from "components/radios.html" import radios %}
 
 {% block service_page_title %}
   Create an API key
@@ -19,7 +20,19 @@
 
   {% call form_wrapper() %}
     {{ form.key_name }}
-    {{ form.key_type }}
+    <div class="margin-top-4 margin-bottom-3">
+      <div class="api-key-radios">
+        {% if current_service.trial_mode %}
+          {{ radios(
+            form.key_type,
+            disable=['normal'],
+            option_hints={'normal': 'Not available because your service is in <a class="usa-link" href="/features/trial-mode">trial mode</a>'|safe}
+          ) }}
+        {% else %}
+          {{ radios(form.key_type) }}
+        {% endif %}
+      </div>
+    </div>
     {{ page_footer('Continue') }}
   {% endcall %}
 
diff --git a/app/templates/views/find-users/auth_type.html b/app/templates/views/find-users/auth_type.html
index c68fa0782..03133dbf1 100644
--- a/app/templates/views/find-users/auth_type.html
+++ b/app/templates/views/find-users/auth_type.html
@@ -3,6 +3,7 @@
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
 {% from "components/components/back-link/macro.njk" import usaBackLink %}
+{% from "components/radios.html" import radios %}
 
 {% block per_page_title %}
   Set auth type for {{ user.name }}
@@ -19,7 +20,9 @@
       {{ page_header('Set auth type for ' + user.name) }}
 
       {% call form_wrapper() %}
-        {{ form.auth_type }}
+        <div class="auth-type-radios">
+          {{ radios(form.auth_type) }}
+        </div>
         {{ page_footer('Save') }}
       {% endcall %}
     </div>
diff --git a/app/templates/views/manage-users/permissions.html b/app/templates/views/manage-users/permissions.html
index 968f3c157..e2bbb4851 100644
--- a/app/templates/views/manage-users/permissions.html
+++ b/app/templates/views/manage-users/permissions.html
@@ -11,13 +11,15 @@
 {% endif %}
 
 {% if service_has_email_auth %}
-  {% if not mobile_number %}
-    {{ radios(
-      form.login_authentication,
-      disable=['sms_auth'],
-      option_hints={'sms_auth': 'Not available because this team member has not added a phone&nbsp;number to their profile'|safe}
-    ) }}
-  {% else %}
-    {{ radios(form.login_authentication) }}
-  {% endif %}
+  <div class="login-auth-radios margin-top-4">
+    {% if not mobile_number %}
+      {{ radios(
+        form.login_authentication,
+        disable=['sms_auth'],
+        option_hints={'sms_auth': 'Not available because this team member has not added a phone&nbsp;number to their profile'|safe}
+      ) }}
+    {% else %}
+      {{ radios(form.login_authentication) }}
+    {% endif %}
+  </div>
 {% endif %}
diff --git a/app/templates/views/register-from-invite.html b/app/templates/views/register-from-invite.html
index bc2c78c9a..9fb7cb229 100644
--- a/app/templates/views/register-from-invite.html
+++ b/app/templates/views/register-from-invite.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/radios.html" import radios %}
 
 {% block per_page_title %}
 Create an account
@@ -40,7 +41,7 @@ Create an account
       {{ page_footer("Continue") }}
       {{form.service}}
       {{form.email_address}}
-      {{form.auth_type}}
+      {{ radios(form.auth_type) }}
     {% endcall %}
   </div>
 </div>
diff --git a/app/templates/views/register.html b/app/templates/views/register.html
index 09356cbfe..55aef0598 100644
--- a/app/templates/views/register.html
+++ b/app/templates/views/register.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/radios.html" import radios %}
 
 {% block per_page_title %}
 Create an account
@@ -26,7 +27,7 @@ Create an account
         }) }}
       </div>
       {{ form.password(param_extensions={"hint": {"text": "At least 8 characters"}, "autocomplete": "new-password"}) }}
-      {{form.auth_type}}
+      {{ radios(form.auth_type) }}
       {{ page_footer("Continue") }}
     {% endcall %}
   </div>
diff --git a/app/templates/views/service-settings/data-retention/add.html b/app/templates/views/service-settings/data-retention/add.html
index bd20e5f7e..3c9499d69 100644
--- a/app/templates/views/service-settings/data-retention/add.html
+++ b/app/templates/views/service-settings/data-retention/add.html
@@ -3,6 +3,7 @@
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
 {% from "components/components/back-link/macro.njk" import usaBackLink %}
+{% from "components/radios.html" import radios %}
 
 {% block service_page_title %}
   Set data retention
@@ -16,7 +17,9 @@
     {{ page_header('Set data retention') }}
 
     {% call form_wrapper() %}
-      {{ form.notification_type }}
+      <div class="notification-type-radios">
+        {{ radios(form.notification_type) }}
+      </div>
       {{ form.days_of_retention }}
       {{ page_footer('Add') }}
     {% endcall %}
diff --git a/app/templates/views/service-settings/link-service-to-organization.html b/app/templates/views/service-settings/link-service-to-organization.html
index 222c3951f..8d847a333 100644
--- a/app/templates/views/service-settings/link-service-to-organization.html
+++ b/app/templates/views/service-settings/link-service-to-organization.html
@@ -4,6 +4,7 @@
 {% from "components/live-search.html" import live_search %}
 {% from "components/form.html" import form_wrapper %}
 {% from "components/components/back-link/macro.njk" import usaBackLink %}
+{% from "components/radios.html" import radios %}
 
 {% set page_title = "Link service to organization" %}
 
@@ -26,7 +27,9 @@
   ) }}
   {% call form_wrapper(data_force_focus=True) %}
     {% if has_organizations %}
-      {{ form.organizations }}
+      <div class="organizations-radios">
+        {{ radios(form.organizations) }}
+      </div>
       {{ sticky_page_footer('Save') }}
     {% else %}
       <p class="hint"> No organizations </p>
diff --git a/app/templates/views/set-up-your-profile.html b/app/templates/views/set-up-your-profile.html
index e131aff2f..9a0e11cfc 100644
--- a/app/templates/views/set-up-your-profile.html
+++ b/app/templates/views/set-up-your-profile.html
@@ -2,6 +2,7 @@
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
 {% from "components/components/select/macro.njk" import usaSelect -%}
+{% from "components/radios.html" import radios %}
 
 {% block per_page_title %}
 Set up your profile
@@ -68,7 +69,7 @@ Set up your profile
       ]
       })
       }}-->
-      {{form.auth_type}}
+      {{ radios(form.auth_type) }}
       {{ page_footer("Save") }}
     {% endcall %}
   </div>
diff --git a/app/templates/views/templates/_template_list.html b/app/templates/views/templates/_template_list.html
index 6fc0baeec..e29131473 100644
--- a/app/templates/views/templates/_template_list.html
+++ b/app/templates/views/templates/_template_list.html
@@ -1,3 +1,5 @@
+{% from "components/checkboxes.html" import checkboxes %}
+
 {% macro format_item_name(name, separators=True) -%}
   {%- if name is string -%}
     {{- name -}}
diff --git a/app/templates/views/templates/set-sender.html b/app/templates/views/templates/set-sender.html
index 2bb9a4162..5995343fe 100644
--- a/app/templates/views/templates/set-sender.html
+++ b/app/templates/views/templates/set-sender.html
@@ -2,6 +2,7 @@
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
 {% from "components/components/back-link/macro.njk" import usaBackLink %}
+{% from "components/radios.html" import radios %}
 
 {% block service_page_title %}
   {{ sender_context.title }}
@@ -15,15 +16,7 @@
 
   <div class="grid-row">
     {% call form_wrapper() %}
-      {{ form.sender(param_extensions={
-        'fieldset': {
-          'legend': {
-            'isPageHeading': True,
-            'text': sender_context.title
-          }
-        },
-        'classes': 'grid-col-9'
-      }) }}
+      {{ radios(form.sender) }}
       <div class="grid-col-9">
         {{ page_footer('Continue') }}
       </div>
diff --git a/app/templates/views/templates/set-template-sender.html b/app/templates/views/templates/set-template-sender.html
index 289ff222f..9936b851c 100644
--- a/app/templates/views/templates/set-template-sender.html
+++ b/app/templates/views/templates/set-template-sender.html
@@ -2,6 +2,7 @@
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
 {% from "components/components/back-link/macro.njk" import usaBackLink %}
+{% from "components/radios.html" import radios %}
 
 {% set page_title = 'Set letter contact block' %}
 
@@ -17,18 +18,9 @@
 
   <div class="grid-row">
     {% call form_wrapper() %}
-      {{ form.sender(param_extensions={
-        'fieldset': {
-          'legend': {
-            'isPageHeading': True,
-            'text': page_title
-          }
-        },
-        'classes': 'grid-col-9'
-      }) }}
+      {{ radios(form.sender) }}
       <div class="grid-col-9">
         {{ page_footer('Continue') }}
-        <a class="usa-link" href="{{ url_for('.service_add_letter_contact', service_id=current_service.id, from_template=template_id) }}">Add new sender</a>
     </div>
     {% endcall %}
   </div>
diff --git a/backstop_data/bitmaps_reference/backstop_test_API_Guest_List_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_API_Guest_List_0_document_0_desktop.png
new file mode 100644
index 000000000..baa9e2d02
Binary files /dev/null and b/backstop_data/bitmaps_reference/backstop_test_API_Guest_List_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_API_Keys_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_API_Keys_0_document_0_desktop.png
index 262db6187..2f7e74d6c 100644
Binary files a/backstop_data/bitmaps_reference/backstop_test_API_Keys_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_API_Keys_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_API_Keys_Create_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_API_Keys_Create_0_document_0_desktop.png
index 1710a11c7..00125b5b6 100644
Binary files a/backstop_data/bitmaps_reference/backstop_test_API_Keys_Create_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_API_Keys_Create_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_About_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_About_0_document_0_desktop.png
index 75d6870af..d514c2f0f 100644
Binary files a/backstop_data/bitmaps_reference/backstop_test_About_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_About_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_Change_User_Auth_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Change_User_Auth_0_document_0_desktop.png
index b2e7c30fc..bb470a095 100644
Binary files a/backstop_data/bitmaps_reference/backstop_test_Change_User_Auth_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_Change_User_Auth_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_Choose_Service_-_Accounts_1_ausa-buttonhrefadd-service_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Choose_Service_-_Accounts_1_ausa-buttonhrefadd-service_0_desktop.png
index df8b6ccc3..a3a1a2b03 100644
Binary files a/backstop_data/bitmaps_reference/backstop_test_Choose_Service_-_Accounts_1_ausa-buttonhrefadd-service_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_Choose_Service_-_Accounts_1_ausa-buttonhrefadd-service_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_Choose_Template_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Choose_Template_0_document_0_desktop.png
index ed36e8bc1..16477aaf9 100644
Binary files a/backstop_data/bitmaps_reference/backstop_test_Choose_Template_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_Choose_Template_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_Data_Retention_Add_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Data_Retention_Add_0_document_0_desktop.png
new file mode 100644
index 000000000..f8dea36d1
Binary files /dev/null and b/backstop_data/bitmaps_reference/backstop_test_Data_Retention_Add_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_Email_Not_Received_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Email_Not_Received_0_document_0_desktop.png
index 4ea571447..6f873ed87 100644
Binary files a/backstop_data/bitmaps_reference/backstop_test_Email_Not_Received_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_Email_Not_Received_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_Invite_User_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Invite_User_0_document_0_desktop.png
index 2c427b325..7107461be 100644
Binary files a/backstop_data/bitmaps_reference/backstop_test_Invite_User_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_Invite_User_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_Link_Service_to_Organization_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Link_Service_to_Organization_0_document_0_desktop.png
new file mode 100644
index 000000000..b0fdfd898
Binary files /dev/null and b/backstop_data/bitmaps_reference/backstop_test_Link_Service_to_Organization_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_Notifygov_Sign_In_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Notifygov_Sign_In_0_document_0_desktop.png
index 4ea571447..6f873ed87 100644
Binary files a/backstop_data/bitmaps_reference/backstop_test_Notifygov_Sign_In_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_Notifygov_Sign_In_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_Performance_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Performance_0_document_0_desktop.png
index 2491d61d8..3b2a0db92 100644
Binary files a/backstop_data/bitmaps_reference/backstop_test_Performance_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_Performance_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_Platform_Admin_Live_Services_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Platform_Admin_Live_Services_0_document_0_desktop.png
index 4de5b957e..e96632104 100644
Binary files a/backstop_data/bitmaps_reference/backstop_test_Platform_Admin_Live_Services_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_Platform_Admin_Live_Services_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_Platform_Admin_User_Auth_Type_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Platform_Admin_User_Auth_Type_0_document_0_desktop.png
new file mode 100644
index 000000000..bb470a095
Binary files /dev/null and b/backstop_data/bitmaps_reference/backstop_test_Platform_Admin_User_Auth_Type_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_SMS_Template_Preview_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_SMS_Template_Preview_0_document_0_desktop.png
index f36e2d62c..eca353619 100644
Binary files a/backstop_data/bitmaps_reference/backstop_test_SMS_Template_Preview_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_SMS_Template_Preview_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_Send_One_Off_Step_2_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Send_One_Off_Step_2_0_document_0_desktop.png
index f36e2d62c..eca353619 100644
Binary files a/backstop_data/bitmaps_reference/backstop_test_Send_One_Off_Step_2_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_Send_One_Off_Step_2_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_Service_SMS_Prefix_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Service_SMS_Prefix_0_document_0_desktop.png
index ccf200f46..53e79ee6d 100644
Binary files a/backstop_data/bitmaps_reference/backstop_test_Service_SMS_Prefix_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_Service_SMS_Prefix_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_Service_Send_Files_By_Email_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Service_Send_Files_By_Email_0_document_0_desktop.png
index a1e7939ae..91b6f083f 100644
Binary files a/backstop_data/bitmaps_reference/backstop_test_Service_Send_Files_By_Email_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_Service_Send_Files_By_Email_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_Service_Settings_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Service_Settings_0_document_0_desktop.png
index 81a6f823a..c298dd2fa 100644
Binary files a/backstop_data/bitmaps_reference/backstop_test_Service_Settings_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_Service_Settings_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_Set_Template_Letter_Sender_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Set_Template_Letter_Sender_0_document_0_desktop.png
new file mode 100644
index 000000000..51af137ab
Binary files /dev/null and b/backstop_data/bitmaps_reference/backstop_test_Set_Template_Letter_Sender_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_Set_Template_Sender_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Set_Template_Sender_0_document_0_desktop.png
new file mode 100644
index 000000000..db45f0738
Binary files /dev/null and b/backstop_data/bitmaps_reference/backstop_test_Set_Template_Sender_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_Team_Members_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Team_Members_0_document_0_desktop.png
index 65094dfbf..76fe8a299 100644
Binary files a/backstop_data/bitmaps_reference/backstop_test_Team_Members_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_Team_Members_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_Text_Not_Received_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Text_Not_Received_0_document_0_desktop.png
index 4ea571447..6f873ed87 100644
Binary files a/backstop_data/bitmaps_reference/backstop_test_Text_Not_Received_0_document_0_desktop.png and b/backstop_data/bitmaps_reference/backstop_test_Text_Not_Received_0_document_0_desktop.png differ
diff --git a/backstop_data/bitmaps_reference/backstop_test_Uploads_0_document_0_desktop.png b/backstop_data/bitmaps_reference/backstop_test_Uploads_0_document_0_desktop.png
new file mode 100644
index 000000000..a2e89fa15
Binary files /dev/null and b/backstop_data/bitmaps_reference/backstop_test_Uploads_0_document_0_desktop.png differ
diff --git a/tests/javascripts/listEntry.test.js b/tests/javascripts/listEntry.test.js
index 99357a65c..d2409d03b 100644
--- a/tests/javascripts/listEntry.test.js
+++ b/tests/javascripts/listEntry.test.js
@@ -50,10 +50,10 @@ describe("List entry", () => {
         result += `
             <div class="list-entry">
               <div class="usa-form-group">
-                <label for="domains-${idx + 1}" class="usa-radio__label govuk-input--numbered__label">
+                <label for="domains-${idx + 1}" class="usa-label">
                   <span class="usa-sr-only">domain number </span>${idx + 1}.
                 </label>
-                <input type="text" name="domains-${idx + 1}" id="domains-${idx + 1}" class="govuk-input govuk-input--numbered " autocomplete="off">
+                <input type="text" name="domains-${idx + 1}" id="domains-${idx + 1}" class="usa-input" autocomplete="off">
               </div>
             </div>`;
       }
@@ -249,7 +249,7 @@ describe("List entry", () => {
       triggerEvent(inputList.querySelectorAll('.input-list__button--remove')[0], 'click');
 
       const newNums = Array.from(
-                        inputList.querySelectorAll('.govuk-input--numbered__label')
+                        inputList.querySelectorAll('.usa-label')
                       )
                       .map((itemNum, idx) => {
                         return parseInt(itemNum.lastChild.nodeValue, 10);
diff --git a/urls.js b/urls.js
index 5b4d7021e..c53398bb9 100644
--- a/urls.js
+++ b/urls.js
@@ -14,22 +14,26 @@ const routes = {
     { label: 'Email Not Received', path: '/email-not-received' },
     { label: 'Text Not Received', path: '/text-not-received' },
     { label: 'Performance', path: '/performance' },
+    // Registration pages with radio buttons
+    // Note: /register returns 404, registration is handled through login.gov
+    // { label: 'Register', path: '/register' },
+    // { label: 'Register From Invite', path: '/register/from-invite/example-token' },
   ],
 
   authenticated: [
     {
       label: 'SMS Template Preview',
-      path: '/services/e6de050d-bd56-4f49-b44b-cb789c4f79fd/send/a4e530e7-cae2-4e24-a1e9-752141a0b58e/one-off/step-0',
+      path: '/services/829ac564-59e9-47c5-ad69-e91315641c31/send/9c2b7a55-8785-4dc6-84d6-eb0e0615590d/one-off/step-0',
     },
     // Pages with govuk buttons that need testing
     {
       label: 'API Keys',
-      path: '/services/e6de050d-bd56-4f49-b44b-cb789c4f79fd/api/keys',
+      path: '/services/829ac564-59e9-47c5-ad69-e91315641c31/api/keys',
     },
     // Pages to test radio buttons before converting govukRadios to USWDS
     {
       label: 'API Keys Create',
-      path: '/services/e6de050d-bd56-4f49-b44b-cb789c4f79fd/api/keys/create',
+      path: '/services/829ac564-59e9-47c5-ad69-e91315641c31/api/keys/create',
     },
     {
       label: 'Change User Auth',
@@ -41,42 +45,76 @@ const routes = {
     },
     {
       label: 'Service Settings',
-      path: '/services/e6de050d-bd56-4f49-b44b-cb789c4f79fd/service-settings',
+      path: '/services/829ac564-59e9-47c5-ad69-e91315641c31/service-settings',
     },
     {
       label: 'Service Send Files By Email',
-      path: '/services/e6de050d-bd56-4f49-b44b-cb789c4f79fd/service-settings/send-files-by-email',
+      path: '/services/829ac564-59e9-47c5-ad69-e91315641c31/service-settings/send-files-by-email',
     },
     {
       label: 'Service SMS Prefix',
-      path: '/services/e6de050d-bd56-4f49-b44b-cb789c4f79fd/service-settings/sms-prefix',
+      path: '/services/829ac564-59e9-47c5-ad69-e91315641c31/service-settings/sms-prefix',
     },
     {
       label: 'Send One Off Step 2',
-      path: '/services/e6de050d-bd56-4f49-b44b-cb789c4f79fd/send/a4e530e7-cae2-4e24-a1e9-752141a0b58e/one-off/step-2',
+      path: '/services/829ac564-59e9-47c5-ad69-e91315641c31/send/9c2b7a55-8785-4dc6-84d6-eb0e0615590d/one-off/step-2',
     },
     {
       label: 'Choose Template',
-      path: '/services/e6de050d-bd56-4f49-b44b-cb789c4f79fd/templates',
+      path: '/services/829ac564-59e9-47c5-ad69-e91315641c31/templates',
     },
     {
       label: 'Team Members',
-      path: '/services/e6de050d-bd56-4f49-b44b-cb789c4f79fd/users',
+      path: '/services/829ac564-59e9-47c5-ad69-e91315641c31/users',
     },
     {
       label: 'Invite User',
-      path: '/services/e6de050d-bd56-4f49-b44b-cb789c4f79fd/users/invite',
+      path: '/services/829ac564-59e9-47c5-ad69-e91315641c31/users/invite',
     },
-    // Platform admin pages with checkboxes
     {
       label: 'Platform Admin Live Services',
       path: '/platform-admin/live-services',
     },
-    // Organization pages
     {
       label: 'Add Organization',
       path: '/organizations/add',
     },
+    {
+      label: 'Uploads',
+      path: '/services/829ac564-59e9-47c5-ad69-e91315641c31/uploads',
+    },
+    {
+      label: 'API Guest List',
+      path: '/services/829ac564-59e9-47c5-ad69-e91315641c31/api/guest-list',
+    },
+    // User profile and auth pages with radio buttons
+    // Note: /set-up-your-profile requires special auth flow from login.gov
+    // {
+    //   label: 'Set Up Your Profile',
+    //   path: '/set-up-your-profile',
+    // },
+    {
+      label: 'Platform Admin User Auth Type',
+      path: '/users/6af522d0-2915-4e52-83a3-3690455a5fe6/change_auth',
+    },
+    // Service settings pages with radio buttons
+    {
+      label: 'Data Retention Add',
+      path: '/services/829ac564-59e9-47c5-ad69-e91315641c31/data-retention/add',
+    },
+    {
+      label: 'Link Service to Organization',
+      path: '/services/829ac564-59e9-47c5-ad69-e91315641c31/service-settings/link-service-to-organization',
+    },
+    // Template sender pages with radio buttons
+    {
+      label: 'Set Template Sender',
+      path: '/services/829ac564-59e9-47c5-ad69-e91315641c31/send/9c2b7a55-8785-4dc6-84d6-eb0e0615590d/set-sender',
+    },
+    {
+      label: 'Set Template Letter Sender',
+      path: '/services/829ac564-59e9-47c5-ad69-e91315641c31/templates/9c2b7a55-8785-4dc6-84d6-eb0e0615590d/set-template-sender',
+    },
   ],
 
   // Using Notify section