diff --git a/.vscode/launch.json b/.vscode/launch.json
index 0b256a5732..6f5a8e84fb 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -43,7 +43,7 @@
       "request": "attach",
       "port": 9222,
       "sourceMaps": true,
-      "webRoot": "${workspaceRoot}/build",
+      "webRoot": "${workspaceRoot}",
       "timeout": 30000,
       "presentation": {
         "hidden": false,
diff --git a/package-lock.json b/package-lock.json
index bb20a42df9..aeb9f12788 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "batch-explorer",
-  "version": "2.15.0",
+  "version": "2.16.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "batch-explorer",
-      "version": "2.15.0",
+      "version": "2.16.0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/src/@batch-flask/ui/dialogs/prompt/prompt-dialog.html b/src/@batch-flask/ui/dialogs/prompt/prompt-dialog.html
index b134884608..3a378e0467 100644
--- a/src/@batch-flask/ui/dialogs/prompt/prompt-dialog.html
+++ b/src/@batch-flask/ui/dialogs/prompt/prompt-dialog.html
@@ -14,7 +14,7 @@
         </div>
 
         <bl-form-field class="form-element">
-            <input blInput [formControl]="promptControl" [attr.aria-label]="title">
+            <input blInput [formControl]="promptControl" [attr.aria-label]="title" aria-required="true">
         </bl-form-field>
         <bl-error controlName="prompt" [code]="entry.code" *ngFor="let entry of validatorMessages;trackBy: trackByFn">{{entry.message}}</bl-error>
     </ng-container>
diff --git a/src/app/components/misc/theme-colors/theme-colors.component.ts b/src/app/components/misc/theme-colors/theme-colors.component.ts
index 52e1b00d74..3ec4c14e58 100644
--- a/src/app/components/misc/theme-colors/theme-colors.component.ts
+++ b/src/app/components/misc/theme-colors/theme-colors.component.ts
@@ -32,7 +32,7 @@ export class ThemeColorsComponent implements OnDestroy {
                 return {
                     key,
                     value: actualColor,
-                    text: tinycolor.mostReadable(actualColor, [color, contrast]).toHexString(),
+                    text: tinycolor.mostReadable(actualColor, [color, contrast, "#000", "#fff"]).toHexString(),
                 };
             });
             this.changeDetector.markForCheck();
diff --git a/src/app/components/pool/action/add/os-picker/os-offer-tile/os-offer-tile.html b/src/app/components/pool/action/add/os-picker/os-offer-tile/os-offer-tile.html
index 997d143cdf..0039298586 100644
--- a/src/app/components/pool/action/add/os-picker/os-offer-tile/os-offer-tile.html
+++ b/src/app/components/pool/action/add/os-picker/os-offer-tile/os-offer-tile.html
@@ -16,7 +16,7 @@
     class="select-version"
     [matMenuTriggerFor]="menu"
     matTooltip="{{'os-offer-tile.select-version-button.tooltip' | i18n}}"
-    title="{{'os-offer-tile.select-version-button.tooltip' | i18n}}">
+    title="{{'os-offer-tile.select-version-button.tooltip' | i18n}} ({{prettyName}})">
     <i class="fa fa-cog"></i>
 </button>
 <mat-menu #menu="matMenu">
diff --git a/src/app/components/settings/auth-settings/auth-settings.html b/src/app/components/settings/auth-settings/auth-settings.html
index 94ee96fbf1..d7466f6071 100644
--- a/src/app/components/settings/auth-settings/auth-settings.html
+++ b/src/app/components/settings/auth-settings/auth-settings.html
@@ -1,5 +1,5 @@
 <div class="auth-settings-header">
-    <h1 tabindex="0" autofocus>{{'auth-settings.title' | i18n}}</h1>
+    <h1>{{'auth-settings.title' | i18n}}</h1>
     <div class="saved" *ngIf="saved" attr.aria-live="assertive">
         {{'auth-settings.saved' | i18n}}
     </div>
diff --git a/src/app/components/settings/settings.html b/src/app/components/settings/settings.html
index 14ddc682d3..7ed749e7a7 100644
--- a/src/app/components/settings/settings.html
+++ b/src/app/components/settings/settings.html
@@ -1,5 +1,5 @@
 <div class="settings-header">
-    <h1 tabindex="0" autofocus>{{'settings.title' | i18n}}</h1>
+    <h1>{{'settings.title' | i18n}}</h1>
     <div class="saved" *ngIf="saved" attr.aria-live="assertive">
         {{'settings.saved' | i18n}}
     </div>