diff --git a/.changeset/itchy-zoos-kick.md b/.changeset/itchy-zoos-kick.md
new file mode 100644
index 0000000000..2d0bf3e421
--- /dev/null
+++ b/.changeset/itchy-zoos-kick.md
@@ -0,0 +1,5 @@
+---
+"apostrophe": patch
+---
+
+Fix more admin UI a11y issues
diff --git a/packages/apostrophe/modules/@apostrophecms/area/ui/apos/components/AposBreadcrumbOperations.vue b/packages/apostrophe/modules/@apostrophecms/area/ui/apos/components/AposBreadcrumbOperations.vue
index 46f6c7851e..2ecb0e1b0e 100644
--- a/packages/apostrophe/modules/@apostrophecms/area/ui/apos/components/AposBreadcrumbOperations.vue
+++ b/packages/apostrophe/modules/@apostrophecms/area/ui/apos/components/AposBreadcrumbOperations.vue
@@ -119,7 +119,6 @@ export default {
         icon: 'plus-icon',
         type: 'group',
         modifiers: [ 'small', 'inline' ],
-        role: 'menuitem',
         class: 'apos-area-modify-controls__button',
         iconSize: 16,
         disableFocus: !this.isFocused
diff --git a/packages/apostrophe/modules/@apostrophecms/area/ui/apos/components/AposWidgetControls.vue b/packages/apostrophe/modules/@apostrophecms/area/ui/apos/components/AposWidgetControls.vue
index 8745ae5d2c..9c282b691b 100644
--- a/packages/apostrophe/modules/@apostrophecms/area/ui/apos/components/AposWidgetControls.vue
+++ b/packages/apostrophe/modules/@apostrophecms/area/ui/apos/components/AposWidgetControls.vue
@@ -90,7 +90,6 @@ export default {
         icon: 'plus-icon',
         type: 'group',
         modifiers: [ 'small', 'inline' ],
-        role: 'menuitem',
         class: 'apos-area-modify-controls__button',
         iconSize: 16,
         disableFocus: !this.tabbable
diff --git a/packages/apostrophe/modules/@apostrophecms/doc-type/ui/apos/logic/AposDocContextMenu.js b/packages/apostrophe/modules/@apostrophecms/doc-type/ui/apos/logic/AposDocContextMenu.js
index 12e5ddfe86..e766ba75cb 100644
--- a/packages/apostrophe/modules/@apostrophecms/doc-type/ui/apos/logic/AposDocContextMenu.js
+++ b/packages/apostrophe/modules/@apostrophecms/doc-type/ui/apos/logic/AposDocContextMenu.js
@@ -273,13 +273,13 @@ export default {
       });
     },
     moduleName() {
-      if (apos.modules[this.context.type].action === apos.modules['@apostrophecms/page'].action) {
+      if (apos.modules[this.context.type]?.action === apos.modules['@apostrophecms/page'].action) {
         return '@apostrophecms/page';
       }
       return this.context.type;
     },
     moduleOptions() {
-      return apos.modules[this.moduleName];
+      return apos.modules[this.moduleName] || {};
     },
     isUpdateOperation() {
       return !!this.context._id;
@@ -482,7 +482,9 @@ export default {
       );
     },
     preview(doc) {
-      window.open(doc._url, '_blank').focus();
+      // window.open() returns null when a popup blocker intercepts it,
+      // so guard before calling focus().
+      window.open(doc._url, '_blank')?.focus();
     },
     async copy(doc) {
       // If there are changes warn the user before discarding them before
diff --git a/packages/apostrophe/modules/@apostrophecms/i18n/i18n/en.json b/packages/apostrophe/modules/@apostrophecms/i18n/i18n/en.json
index 0adcf393d2..e93b9a68f8 100644
--- a/packages/apostrophe/modules/@apostrophecms/i18n/i18n/en.json
+++ b/packages/apostrophe/modules/@apostrophecms/i18n/i18n/en.json
@@ -205,6 +205,7 @@
   "editImageRelationshipTitle": "Adjust Image",
   "editRelationship": "Edit Relationship",
   "editRelationshipFor": "Edit Relationship for {{ title }}",
+  "editSubform": "Edit {{ label }}",
   "editType": "Edit {{ type }}",
   "editWidget": "Edit Widget",
   "editWidgetForeignTooltip": "Click to edit this content in its natural context",
@@ -569,6 +570,7 @@
   "richTextHighlight": "Mark",
   "richTextHorizontalRule": "Horizontal Rule",
   "richTextHorizontalRuleDescription": "Add a horizontal separator",
+  "richTextEditor": "Rich text editor",
   "richTextInsertMenuHeading": "Insert element...",
   "richTextItalic": "Italic",
   "richTextLink": "Link",
@@ -632,6 +634,7 @@
   "slugInUse": "Slug already in use",
   "someoneElseTookControl": "{{ who }} took control of this document in another tab or window. A document can only be edited in one place at a time.",
   "splitCell": "Split Cell",
+  "status": "Status",
   "style": "Style",
   "styleAlignment": "Alignment",
   "styleBackground": "Background",
diff --git a/packages/apostrophe/modules/@apostrophecms/image/ui/apos/components/AposMediaManagerEditor.vue b/packages/apostrophe/modules/@apostrophecms/image/ui/apos/components/AposMediaManagerEditor.vue
index b6598bcaa1..46eba052d1 100644
--- a/packages/apostrophe/modules/@apostrophecms/image/ui/apos/components/AposMediaManagerEditor.vue
+++ b/packages/apostrophe/modules/@apostrophecms/image/ui/apos/components/AposMediaManagerEditor.vue
@@ -14,7 +14,7 @@
           v-if="activeMedia.attachment && activeMedia.attachment._urls"
           class="apos-media-editor__thumb"
           :src="activeMedia.attachment._urls[restoreOnly ? 'one-sixth' : 'one-third']"
-          :alt="activeMedia.description"
+          :alt="activeMedia.description || ''"
         >
       </div>
       <ul class="apos-media-editor__details">
@@ -484,7 +484,7 @@ export default {
 
     & {
       line-height: var(--a-line-tallest);
-      color: var(--a-base-4);
+      color: var(--a-base-2);
     }
   }
 
diff --git a/packages/apostrophe/modules/@apostrophecms/layout-widget/ui/apos/components/AposGridColumn.vue b/packages/apostrophe/modules/@apostrophecms/layout-widget/ui/apos/components/AposGridColumn.vue
index 87ff04278a..8b13324d76 100644
--- a/packages/apostrophe/modules/@apostrophecms/layout-widget/ui/apos/components/AposGridColumn.vue
+++ b/packages/apostrophe/modules/@apostrophecms/layout-widget/ui/apos/components/AposGridColumn.vue
@@ -6,7 +6,6 @@
     :style="itemStyles"
     :class="widgetStyles.classes"
     class="apos-layout__item"
-    role="gridcell"
     data-apos-test="aposLayoutItem"
     :data-id="item._id"
     :data-tablet-full="props.tabletFullItems[item._id] || false"
diff --git a/packages/apostrophe/modules/@apostrophecms/layout-widget/ui/apos/components/AposGridManager.vue b/packages/apostrophe/modules/@apostrophecms/layout-widget/ui/apos/components/AposGridManager.vue
index e776b9aab8..f7dc396f71 100644
--- a/packages/apostrophe/modules/@apostrophecms/layout-widget/ui/apos/components/AposGridManager.vue
+++ b/packages/apostrophe/modules/@apostrophecms/layout-widget/ui/apos/components/AposGridManager.vue
@@ -14,7 +14,6 @@
       :key="item._id"
       ref="items"
       class="apos-layout__item"
-      role="gridcell"
       data-apos-test="aposManageLayoutItem"
       :data-id="item._id"
       :style="{
diff --git a/packages/apostrophe/modules/@apostrophecms/login/ui/apos/components/TheAposLogin.vue b/packages/apostrophe/modules/@apostrophecms/login/ui/apos/components/TheAposLogin.vue
index 1bb2223ff3..a22a2a86bf 100644
--- a/packages/apostrophe/modules/@apostrophecms/login/ui/apos/components/TheAposLogin.vue
+++ b/packages/apostrophe/modules/@apostrophecms/login/ui/apos/components/TheAposLogin.vue
@@ -10,6 +10,7 @@
         <div
           v-if="showNav"
           class="apos-login__nav"
+          role="navigation"
         >
           <a
             href="#"
@@ -22,7 +23,13 @@
           >{{ $t('apostrophe:loginHome') }}</a>
         </div>
       </transition>
-      <div class="apos-login__wrapper">
+      <div
+        class="apos-login__wrapper"
+        role="main"
+      >
+        <h1 class="apos-sr-only">
+          {{ $t('apostrophe:login') }}
+        </h1>
         <transition
           name="fade-body"
           mode="out-in"
@@ -55,6 +62,7 @@
         <div
           v-show="loaded"
           class="apos-login__footer"
+          role="contentinfo"
         >
           <AposLogo class="apos-login__logo" />
           <label
@@ -234,7 +242,7 @@ export default {
       overflow: hidden;
       margin-right: 0;
       margin-left: auto;
-      color: var(--a-base-5);
+      color: var(--a-base-2);
       text-overflow: clip;
       white-space: nowrap;
     }
diff --git a/packages/apostrophe/modules/@apostrophecms/login/ui/apos/components/TheAposLoginHeader.vue b/packages/apostrophe/modules/@apostrophecms/login/ui/apos/components/TheAposLoginHeader.vue
index 6a78ab3f4a..1e1b18d679 100644
--- a/packages/apostrophe/modules/@apostrophecms/login/ui/apos/components/TheAposLoginHeader.vue
+++ b/packages/apostrophe/modules/@apostrophecms/login/ui/apos/components/TheAposLoginHeader.vue
@@ -112,16 +112,16 @@ export default {
       text-transform: capitalize;
       padding: 6px 12px;
       color: var(--a-white);
-      background: var(--a-success);
+      background: var(--a-success-dark);
       border-radius: 5px;
     }
 
     &--development {
-      background: var(--a-danger);
+      background: var(--a-danger-button-hover);
     }
 
     &--success, &--staging {
-      background: var(--a-warning);
+      background: var(--a-warning-dark);
     }
   }
 
diff --git a/packages/apostrophe/modules/@apostrophecms/modal/ui/apos/components/AposModal.vue b/packages/apostrophe/modules/@apostrophecms/modal/ui/apos/components/AposModal.vue
index a83770ff35..7794e0a611 100644
--- a/packages/apostrophe/modules/@apostrophecms/modal/ui/apos/components/AposModal.vue
+++ b/packages/apostrophe/modules/@apostrophecms/modal/ui/apos/components/AposModal.vue
@@ -67,6 +67,7 @@
             <header
               v-if="!modal.disableHeader"
               class="apos-modal__header"
+              role="none"
             >
               <div class="apos-modal__header__main">
                 <div
@@ -133,6 +134,7 @@
             <footer
               v-if="hasSlot('footer')"
               class="apos-modal__footer"
+              role="none"
             >
               <div class="apos-modal__footer__inner">
                 <slot name="footer" />
diff --git a/packages/apostrophe/modules/@apostrophecms/modal/ui/apos/components/AposModalTabs.vue b/packages/apostrophe/modules/@apostrophecms/modal/ui/apos/components/AposModalTabs.vue
index fb6b47f56c..fa5d67f5bb 100644
--- a/packages/apostrophe/modules/@apostrophecms/modal/ui/apos/components/AposModalTabs.vue
+++ b/packages/apostrophe/modules/@apostrophecms/modal/ui/apos/components/AposModalTabs.vue
@@ -1,15 +1,20 @@
 <template>
   <div class="apos-modal-tabs">
-    <ul class="apos-modal-tabs__tabs">
+    <ul
+      class="apos-modal-tabs__tabs"
+      role="tablist"
+    >
       <li
         v-for="tab in tabs"
         v-show="tab.isVisible !== false"
         :key="tab.name"
         class="apos-modal-tabs__tab"
+        role="presentation"
       >
         <button
           :id="tab.name"
           class="apos-modal-tabs__btn"
+          role="tab"
           :aria-selected="tab.name === current ? true : false"
           @click="selectTab"
         >
diff --git a/packages/apostrophe/modules/@apostrophecms/piece-type/index.js b/packages/apostrophe/modules/@apostrophecms/piece-type/index.js
index 43b0f05208..e4eb14cc8c 100644
--- a/packages/apostrophe/modules/@apostrophecms/piece-type/index.js
+++ b/packages/apostrophe/modules/@apostrophecms/piece-type/index.js
@@ -73,7 +73,8 @@ module.exports = {
         },
         labels: {
           name: 'labels',
-          label: '',
+          label: 'apostrophe:status',
+          labelSrOnly: true,
           component: 'AposCellLabels'
         },
         updatedAt: {
diff --git a/packages/apostrophe/modules/@apostrophecms/piece-type/ui/apos/components/AposDocsManagerDisplay.vue b/packages/apostrophe/modules/@apostrophecms/piece-type/ui/apos/components/AposDocsManagerDisplay.vue
index a8c2645811..81df994620 100644
--- a/packages/apostrophe/modules/@apostrophecms/piece-type/ui/apos/components/AposDocsManagerDisplay.vue
+++ b/packages/apostrophe/modules/@apostrophecms/piece-type/ui/apos/components/AposDocsManagerDisplay.vue
@@ -4,8 +4,11 @@
       <tr>
         <th
           v-if="hasBatchOperations"
+          scope="col"
           class="apos-table__header"
-        />
+        >
+          <span class="apos-sr-only">{{ $t('apostrophe:selectAll') }}</span>
+        </th>
         <th
           v-for="header in headers"
           :key="header.label"
@@ -16,6 +19,7 @@
           <component
             :is="getEl(header)"
             class="apos-table__header-label"
+            :class="{ 'apos-sr-only': header.labelSrOnly }"
           >
             <component
               :is="icons[header.labelIcon]"
@@ -28,11 +32,12 @@
         </th>
         <th
           key="contextMenu"
+          scope="col"
           class="apos-table__header"
         >
           <component
             :is="getEl({})"
-            class="apos-table__header-label apos-is-hidden"
+            class="apos-table__header-label apos-sr-only"
           >
             {{ $t('apostrophe:moreOperations') }}
           </component>
diff --git a/packages/apostrophe/modules/@apostrophecms/recently-edited/ui/apos/components/AposCellTitle.vue b/packages/apostrophe/modules/@apostrophecms/recently-edited/ui/apos/components/AposCellTitle.vue
index f258d45650..af499ba285 100644
--- a/packages/apostrophe/modules/@apostrophecms/recently-edited/ui/apos/components/AposCellTitle.vue
+++ b/packages/apostrophe/modules/@apostrophecms/recently-edited/ui/apos/components/AposCellTitle.vue
@@ -15,6 +15,7 @@
       :href="item._url"
       class="apos-recently-edited__cell-link"
       data-apos-test="recently-edited-cell-link"
+      :aria-label="$t('apostrophe:preview')"
       @click.stop
     >
       <AposIndicator
diff --git a/packages/apostrophe/modules/@apostrophecms/rich-text-widget/ui/apos/components/AposRichTextWidgetEditor.vue b/packages/apostrophe/modules/@apostrophecms/rich-text-widget/ui/apos/components/AposRichTextWidgetEditor.vue
index 70aa682eb7..df58ce31c0 100644
--- a/packages/apostrophe/modules/@apostrophecms/rich-text-widget/ui/apos/components/AposRichTextWidgetEditor.vue
+++ b/packages/apostrophe/modules/@apostrophecms/rich-text-widget/ui/apos/components/AposRichTextWidgetEditor.vue
@@ -1,7 +1,6 @@
 <template>
   <div
     :id="widgetId"
-    :aria-controls="`insert-menu-${modelValue._id}`"
     :style="widgetStyles.inline"
     :class="widgetStyles.classes"
     @keyup="handleUIKeyup"
@@ -43,7 +42,12 @@
       ref="insertMenu"
       plugin-key="insertMenu"
       :class="insertMenuClasses"
-      :tippy-options="{ duration: 100, zIndex: 999, placement: 'bottom-start' }"
+      :tippy-options="{
+        duration: 100,
+        zIndex: 999,
+        placement: 'bottom-start',
+        aria: { content: null, expanded: false }
+      }"
       :should-show="showFloatingMenu"
       :editor="editor"
       role="listbox"
@@ -229,7 +233,11 @@ export default {
         inertia: true,
         placement: 'bottom',
         hideOnClick: false,
-        onHide: this.onBubbleHide
+        onHide: this.onBubbleHide,
+        aria: {
+          content: null,
+          expanded: false
+        }
       };
     },
     // Note that context menu class-list expects a string
@@ -264,7 +272,11 @@ export default {
         placement: 'top',
         offset: [ 0, 35 ],
         moveTransition: 'transform 0s ease-out',
-        appendTo: document.body
+        appendTo: document.body,
+        aria: {
+          content: null,
+          expanded: false
+        }
       };
     },
     moduleOptions() {
@@ -468,6 +480,11 @@ export default {
         autofocus: this.autofocus,
         onUpdate: this.editorUpdate,
         extensions,
+        editorProps: {
+          attributes: {
+            'aria-label': this.$t('apostrophe:richTextEditor')
+          }
+        },
 
         // The following events are triggered:
         //  - before the placeholder configuration function, when loading the page
diff --git a/packages/apostrophe/modules/@apostrophecms/schema/ui/apos/components/AposInputDateAndTime.vue b/packages/apostrophe/modules/@apostrophecms/schema/ui/apos/components/AposInputDateAndTime.vue
index fce0147520..44339fe433 100644
--- a/packages/apostrophe/modules/@apostrophecms/schema/ui/apos/components/AposInputDateAndTime.vue
+++ b/packages/apostrophe/modules/@apostrophecms/schema/ui/apos/components/AposInputDateAndTime.vue
@@ -15,13 +15,17 @@
           @toggle="toggle"
         />
         <input
+          :id="uid"
           v-model="date"
           class="apos-input apos-input--date"
           :class="classes"
           type="date"
           @change="setDateAndTime"
         >
-        <span class="apos-input--label">
+        <span
+          :id="`${uid}-at`"
+          class="apos-input--label"
+        >
           {{ $t('apostrophe:at') }}
         </span>
         <input
@@ -29,6 +33,7 @@
           class="apos-input apos-input--time"
           :class="classes"
           type="time"
+          :aria-labelledby="`${uid} ${uid}-at`"
           @change="setDateAndTime"
         >
       </div>
@@ -60,7 +65,7 @@ export default {
     &--disabled {
       background-color: var(--a-white);
       border-color: var(--a-base-8);
-      color: var(--a-base-4);
+      color: var(--a-base-2);
     }
 
     &--label {
diff --git a/packages/apostrophe/modules/@apostrophecms/schema/ui/apos/components/AposInputSelect.vue b/packages/apostrophe/modules/@apostrophecms/schema/ui/apos/components/AposInputSelect.vue
index 472566c453..d5f5568452 100644
--- a/packages/apostrophe/modules/@apostrophecms/schema/ui/apos/components/AposInputSelect.vue
+++ b/packages/apostrophe/modules/@apostrophecms/schema/ui/apos/components/AposInputSelect.vue
@@ -8,6 +8,7 @@
   >
     <template #body>
       <AposSelect
+        :uid="uid"
         :icon="icon"
         :choices="choices"
         :classes="classes"
diff --git a/packages/apostrophe/modules/@apostrophecms/schema/ui/apos/components/AposInputWrapper.vue b/packages/apostrophe/modules/@apostrophecms/schema/ui/apos/components/AposInputWrapper.vue
index a24e4d7573..0a809b6ae3 100644
--- a/packages/apostrophe/modules/@apostrophecms/schema/ui/apos/components/AposInputWrapper.vue
+++ b/packages/apostrophe/modules/@apostrophecms/schema/ui/apos/components/AposInputWrapper.vue
@@ -211,7 +211,7 @@ export default {
   & {
     margin: 0 0 $spacing-base;
     line-height: var(--a-line-tall);
-    color: var(--a-base-3);
+    color: var(--a-base-2);
   }
 }
 
diff --git a/packages/apostrophe/modules/@apostrophecms/schema/ui/apos/components/AposSubform.vue b/packages/apostrophe/modules/@apostrophecms/schema/ui/apos/components/AposSubform.vue
index d4ce0b010b..810cb28165 100644
--- a/packages/apostrophe/modules/@apostrophecms/schema/ui/apos/components/AposSubform.vue
+++ b/packages/apostrophe/modules/@apostrophecms/schema/ui/apos/components/AposSubform.vue
@@ -74,6 +74,7 @@
       </div>
       <button
         class="apos-subform__preview-trigger"
+        :aria-label="editSubformLabel"
         @click="toggleExpanded"
         @mouseenter="triggerHover = true"
         @mouseleave="triggerHover = false"
diff --git a/packages/apostrophe/modules/@apostrophecms/schema/ui/apos/logic/AposSubform.js b/packages/apostrophe/modules/@apostrophecms/schema/ui/apos/logic/AposSubform.js
index ee4e218f00..74e2d6731c 100644
--- a/packages/apostrophe/modules/@apostrophecms/schema/ui/apos/logic/AposSubform.js
+++ b/packages/apostrophe/modules/@apostrophecms/schema/ui/apos/logic/AposSubform.js
@@ -67,6 +67,16 @@ export default {
     },
     serverError() {
       return this.error || !!this.serverErrors;
+    },
+    subformLabel() {
+      return this.$t(
+        this.subform.label ||
+          this.subform.schema?.[0]?.label ||
+          'apostrophe:notAvailable'
+      );
+    },
+    editSubformLabel() {
+      return this.$t('apostrophe:editSubform', { label: this.subformLabel });
     }
   },
 
diff --git a/packages/apostrophe/modules/@apostrophecms/styles/ui/apos/components/TheAposStyles.vue b/packages/apostrophe/modules/@apostrophecms/styles/ui/apos/components/TheAposStyles.vue
index 5ff471d584..443a46cb22 100644
--- a/packages/apostrophe/modules/@apostrophecms/styles/ui/apos/components/TheAposStyles.vue
+++ b/packages/apostrophe/modules/@apostrophecms/styles/ui/apos/components/TheAposStyles.vue
@@ -19,6 +19,7 @@
                 v-if="currentPath.length"
                 key="btn"
                 class="apos-styles__header-navigate-btn"
+                :aria-label="$t('apostrophe:back')"
                 @mousedown.stop=""
                 @click="navigateLeft"
               >
diff --git a/packages/apostrophe/modules/@apostrophecms/ui/ui/apos/components/AposButtonGroup.vue b/packages/apostrophe/modules/@apostrophecms/ui/ui/apos/components/AposButtonGroup.vue
index 8c9b99291c..c775f496ff 100644
--- a/packages/apostrophe/modules/@apostrophecms/ui/ui/apos/components/AposButtonGroup.vue
+++ b/packages/apostrophe/modules/@apostrophecms/ui/ui/apos/components/AposButtonGroup.vue
@@ -2,7 +2,7 @@
   <div
     class="apos-button-group"
     :class="modifierClass"
-    role="menubar"
+    role="toolbar"
   >
     <div class="apos-button-group__inner">
       <slot />
diff --git a/packages/apostrophe/modules/@apostrophecms/ui/ui/apos/components/AposCellLastEdited.vue b/packages/apostrophe/modules/@apostrophecms/ui/ui/apos/components/AposCellLastEdited.vue
index cf79c94891..192a7d80c1 100644
--- a/packages/apostrophe/modules/@apostrophecms/ui/ui/apos/components/AposCellLastEdited.vue
+++ b/packages/apostrophe/modules/@apostrophecms/ui/ui/apos/components/AposCellLastEdited.vue
@@ -70,6 +70,6 @@ export default {
 
 <style lang="scss" scoped>
   .apos-table__cell-field--relative-time {
-    color: var(--a-base-4);
+    color: var(--a-base-2);
   }
 </style>
diff --git a/packages/apostrophe/modules/@apostrophecms/ui/ui/apos/components/AposSelect.vue b/packages/apostrophe/modules/@apostrophecms/ui/ui/apos/components/AposSelect.vue
index 4e081c7406..e3b96a28b8 100644
--- a/packages/apostrophe/modules/@apostrophecms/ui/ui/apos/components/AposSelect.vue
+++ b/packages/apostrophe/modules/@apostrophecms/ui/ui/apos/components/AposSelect.vue
@@ -4,6 +4,7 @@
     :class="wrapperClasses"
   >
     <select
+      :id="uid"
       class="apos-input apos-input--select"
       :class="classes"
       :uid="uid"
diff --git a/packages/apostrophe/modules/@apostrophecms/ui/ui/apos/components/AposSlat.vue b/packages/apostrophe/modules/@apostrophecms/ui/ui/apos/components/AposSlat.vue
index b17ecda436..7d5ca444ce 100644
--- a/packages/apostrophe/modules/@apostrophecms/ui/ui/apos/components/AposSlat.vue
+++ b/packages/apostrophe/modules/@apostrophecms/ui/ui/apos/components/AposSlat.vue
@@ -9,7 +9,7 @@
       'apos-is-selected': selected,
       'apos-is-disabled': disabled,
     }"
-    :aria-pressed="engaged"
+    :aria-current="engaged"
     role="listitem"
     :aria-labelledby="parent"
     @keydown.space="toggleEngage"
diff --git a/packages/apostrophe/modules/@apostrophecms/ui/ui/apos/components/AposSubformPreview.vue b/packages/apostrophe/modules/@apostrophecms/ui/ui/apos/components/AposSubformPreview.vue
index 9b161c5c6e..816d763f01 100644
--- a/packages/apostrophe/modules/@apostrophecms/ui/ui/apos/components/AposSubformPreview.vue
+++ b/packages/apostrophe/modules/@apostrophecms/ui/ui/apos/components/AposSubformPreview.vue
@@ -140,7 +140,7 @@ function inferFieldValues(schema, values, $t) {
     & {
       display: inline-block;
       line-height: 1;
-      color: var(--a-base-3);
+      color: var(--a-base-2);
     }
   }
 }
diff --git a/packages/apostrophe/modules/@apostrophecms/ui/ui/apos/components/AposTreeHeader.vue b/packages/apostrophe/modules/@apostrophecms/ui/ui/apos/components/AposTreeHeader.vue
index c9abd2d456..09e358e29b 100644
--- a/packages/apostrophe/modules/@apostrophecms/ui/ui/apos/components/AposTreeHeader.vue
+++ b/packages/apostrophe/modules/@apostrophecms/ui/ui/apos/components/AposTreeHeader.vue
@@ -120,7 +120,7 @@ export default {
 @import '../scss/shared/_table-rows';
 
 .apos-tree__header {
-  color: var(--a-base-3);
+  color: var(--a-base-2);
 }
 
 .apos-tree__header.apos-tree__header--hidden {
diff --git a/packages/apostrophe/modules/@apostrophecms/ui/ui/apos/scss/global/_theme.scss b/packages/apostrophe/modules/@apostrophecms/ui/ui/apos/scss/global/_theme.scss
index 0a6b8f3142..87ec3085e8 100644
--- a/packages/apostrophe/modules/@apostrophecms/ui/ui/apos/scss/global/_theme.scss
+++ b/packages/apostrophe/modules/@apostrophecms/ui/ui/apos/scss/global/_theme.scss
@@ -3,6 +3,7 @@
   --a-danger: #eb443b;
   --a-danger-fade: #eb443b30;
   --a-success: #00bf9a;
+  --a-success-dark: #006650;
   --a-success-fade: #00bf9a30;
   --a-warning: #ffce00;
   --a-warning-dark: #a75c07;
diff --git a/packages/login-totp/ui/apos/components/AposTotp.scss b/packages/login-totp/ui/apos/components/AposTotp.scss
index d71596b733..dd76a91a01 100644
--- a/packages/login-totp/ui/apos/components/AposTotp.scss
+++ b/packages/login-totp/ui/apos/components/AposTotp.scss
@@ -47,7 +47,7 @@
 
     & {
       margin: 0;
-      color: var(--a-base-5);
+      color: var(--a-base-2);
     }
   }
 
diff --git a/packages/login-totp/ui/apos/components/AposTotp.vue b/packages/login-totp/ui/apos/components/AposTotp.vue
index c8c9cfadaa..1905237e0b 100644
--- a/packages/login-totp/ui/apos/components/AposTotp.vue
+++ b/packages/login-totp/ui/apos/components/AposTotp.vue
@@ -1,11 +1,11 @@
 <template>
   <div class="apos-totp">
-    <h3
+    <h2
       class="apos-totp__title"
       :class="{'apos-totp__title--success': token && success}"
     >
       {{ token ? $t('aposTotp:loginTitleSetup') : $t('aposTotp:loginTitle') }}
-    </h3>
+    </h2>
     <div
       v-if="token && !success"
       class="apos-totp__setup"