From c0956ab483aca05acde5c03901b516c3ce85fff3 Mon Sep 17 00:00:00 2001
From: Stephanie Leary <stephanie.leary@equinoxOLI.org>
Date: Wed, 22 Feb 2023 11:43:14 -0600
Subject: [PATCH] LP2000482 Bootstrap 5: form-label class for every <label>

Signed-off-by: Stephanie Leary <stephanie.leary@equinoxOLI.org>
---
 .../app/share/fm-editor/fm-editor.component.html   |  2 +-
 .../share/grid/grid-filter-control.component.html  | 20 ++---
 .../src/app/share/grid/grid-toolbar.component.html |  2 +-
 .../org-family-select.component.html               |  4 +-
 .../app/share/translate/translate.component.html   |  8 +-
 .../src/app/staff/acq/asn/receive.component.html   | 16 ++--
 .../batch-update-copies-dialog.component.html      |  4 +-
 .../acq/lineitem/bib-finder-dialog.component.html  |  2 +-
 .../app/staff/acq/lineitem/copies.component.html   |  4 +-
 .../export-attributes-dialog.component.html        |  2 +-
 .../acq/lineitem/lineitem-list.component.html      | 10 +--
 .../lineitem/link-invoice-dialog.component.html    |  4 +-
 .../lineitem/manage-claims-dialog.component.html   |  6 +-
 .../app/staff/acq/lineitem/notes.component.html    |  2 +-
 .../app/staff/acq/picklist/upload.component.html   | 52 ++++++-------
 .../eg2/src/app/staff/acq/po/create.component.html | 10 +--
 .../eg2/src/app/staff/acq/po/notes.component.html  |  2 +-
 .../src/app/staff/acq/po/summary.component.html    |  2 +-
 .../acq-provider-search-form.component.html        |  2 +-
 .../acq/provider/provider-holdings.component.html  |  2 +-
 .../acq/search/acq-search-form.component.html      |  4 +-
 .../currency/exchange-rates-dialog.component.html  |  2 +-
 ...distribution-formula-edit-dialog.component.html |  4 +-
 .../edi-attr-set-edit-dialog.component.html        |  4 +-
 .../acq/funds/fund-details-dialog.component.html   |  2 +-
 .../acq/funds/fund-rollover-dialog.component.html  | 10 +--
 .../acq/funds/fund-transfer-dialog.component.html  |  6 +-
 ...nding-source-transactions-dialog.component.html |  2 +-
 .../course-associate-material.component.html       | 18 ++---
 .../course-associate-users.component.html          |  4 +-
 .../shelving_location_groups.component.html        |  4 +-
 .../clone-portal-entries-dialog.component.html     |  6 +-
 .../admin/local/survey/survey-edit.component.html  |  4 +-
 .../local/triggers/trigger-edit.component.html     |  2 +-
 .../coded-value-maps/composite-new.component.html  |  4 +-
 .../admin/server/org-unit-type.component.html      | 14 ++--
 .../admin/server/perm-group-tree.component.html    | 14 ++--
 .../src/app/staff/booking/capture.component.html   |  2 +-
 .../create-reservation-dialog.component.html       | 14 ++--
 .../booking/create-reservation.component.html      | 16 ++--
 .../booking/manage-reservations.component.html     |  6 +-
 .../src/app/staff/booking/pickup.component.html    |  4 +-
 .../src/app/staff/booking/pull-list.component.html |  4 +-
 .../src/app/staff/booking/return.component.html    |  4 +-
 .../app/staff/cat/authority/browse.component.html  |  2 +-
 .../app/staff/cat/vandelay/export.component.html   | 16 ++--
 .../app/staff/cat/vandelay/import.component.html   | 48 ++++++------
 .../staff/cat/vandelay/queue-list.component.html   |  2 +-
 .../app/staff/cat/volcopy/config.component.html    | 88 +++++++++++-----------
 .../app/staff/cat/volcopy/vol-edit.component.html  | 14 ++--
 .../app/staff/cat/volcopy/volcopy.component.html   |  4 +-
 .../src/app/staff/catalog/hold/hold.component.html | 28 +++----
 .../eg2/src/app/staff/catalog/prefs.component.html | 10 +--
 .../record/part-merge-dialog.component.html        |  2 +-
 .../app/staff/catalog/result/record.component.html |  2 +-
 .../staff/catalog/result/results.component.html    |  2 +-
 .../app/staff/catalog/search-form.component.html   | 16 ++--
 .../app/staff/circ/checkin/checkin.component.html  |  6 +-
 .../src/app/staff/circ/patron/bills.component.html | 12 +--
 .../app/staff/circ/patron/checkout.component.html  |  2 +-
 .../src/app/staff/circ/patron/edit.component.html  | 26 +++----
 .../circ/patron/hold-notify-update.component.html  |  2 +-
 .../app/staff/circ/patron/messages.component.html  |  4 +-
 .../src/app/staff/circ/patron/perms.component.html |  2 +-
 .../staff/circ/patron/test-password.component.html |  6 +-
 .../src/app/staff/circ/renew/renew.component.html  |  6 +-
 .../src/eg2/src/app/staff/login.component.html     |  6 +-
 .../staff/reporter/simple/sr-editor.component.html |  4 +-
 .../staff/reporter/simple/sr-field.component.html  |  4 +-
 .../simple/sr-output-options.component.html        | 18 ++---
 .../src/app/staff/sandbox/sandbox.component.html   |  2 +-
 .../share/barcodes/barcode-select.component.html   |  2 +-
 .../billing/credit-card-dialog.component.html      | 24 +++---
 .../share/buckets/bucket-dialog.component.html     |  2 +-
 .../staff/share/circ/events-dialog.component.html  |  2 +-
 .../share/circ/open-circ-dialog.component.html     |  2 +-
 .../holdings/conjoined-items-dialog.component.html |  2 +-
 .../holdings/copy-alerts-dialog.component.html     |  6 +-
 .../holdings/copy-notes-dialog.component.html      |  2 +-
 .../holdings/replace-barcode-dialog.component.html |  2 +-
 .../staff/share/holds/cancel-dialog.component.html |  4 +-
 .../app/staff/share/holds/manage.component.html    | 26 +++----
 .../staff/share/holds/note-dialog.component.html   |  8 +-
 .../staff/share/holds/notify-dialog.component.html |  4 +-
 .../authority-linking-dialog.component.html        |  6 +-
 .../staff/share/marc-edit/editor.component.html    |  2 +-
 .../marc-edit/phys-char-dialog.component.html      |  4 +-
 .../share/marc-edit/rich-editor.component.html     |  2 +-
 .../simplified-editor.component.html               |  4 +-
 .../staff/share/op-change/op-change.component.html |  6 +-
 .../staff/share/patron/merge-dialog.component.html |  4 +-
 .../app/staff/share/patron/search.component.html   |  2 +-
 Open-ILS/src/extras/opensearchportal.html          | 18 ++---
 93 files changed, 389 insertions(+), 389 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.html b/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.html
index 98e46f081a..499ec24fc4 100644
--- a/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.html
+++ b/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.html
@@ -27,7 +27,7 @@
       <ng-container *ngIf="record">
       <div class="form-group row" *ngFor="let field of fields">
         <div class="col-lg-3">
-          <label for="{{idPrefix}}-{{field.name}}">{{field.label}}</label>
+          <label class="form-label" for="{{idPrefix}}-{{field.name}}">{{field.label}}</label>
           <eg-help-popover [placement]="'right'" *ngIf="field.helpText" helpText="{{field.helpTextValue}}"></eg-help-popover>
         </div>
         <div class="col-lg-9">
diff --git a/Open-ILS/src/eg2/src/app/share/grid/grid-filter-control.component.html b/Open-ILS/src/eg2/src/app/share/grid/grid-filter-control.component.html
index c1a3e64433..25d8e0a968 100644
--- a/Open-ILS/src/eg2/src/app/share/grid/grid-filter-control.component.html
+++ b/Open-ILS/src/eg2/src/app/share/grid/grid-filter-control.component.html
@@ -94,7 +94,7 @@
           <div ngbDropdownMenu class="eg-grid-filter-menu">
             <div class="dropdown-item">
               <div>
-                <label for="eg-filter-op-select-{{col.name}}" i18n>Operator</label>
+                <label class="form-label" for="eg-filter-op-select-{{col.name}}" i18n>Operator</label>
                 <select id="eg-filter-op-select-{{col.name}}" class="form-control" 
                   [(ngModel)]="col.filterOperator" (change)="operatorChanged(col)">
                   <option value="=" i18n>Is exactly</option>
@@ -133,7 +133,7 @@
           <div ngbDropdownMenu class="eg-grid-filter-menu">
             <div class="dropdown-item">
               <div>
-                <label for="eg-filter-op-select-{{col.name}}" i18n>Operator</label>
+                <label class="form-label" for="eg-filter-op-select-{{col.name}}" i18n>Operator</label>
                 <ng-container *ngTemplateOutlet="numericOperators"></ng-container>
               </div>
               <div class="pt-2">
@@ -157,7 +157,7 @@
           <div ngbDropdownMenu class="eg-grid-filter-menu">
             <div class="dropdown-item">
               <div>
-                <label for="eg-filter-op-select-{{col.name}}" i18n>Operator</label>
+                <label class="form-label" for="eg-filter-op-select-{{col.name}}" i18n>Operator</label>
                 <ng-container *ngTemplateOutlet="numericOperators"></ng-container>
               </div>
               <div class="pt-2">
@@ -181,7 +181,7 @@
           <div ngbDropdownMenu class="eg-grid-filter-menu">
             <div class="dropdown-item">
               <div>
-                <label for="eg-filter-op-select-{{col.name}}" i18n>Operator</label>
+                <label class="form-label" for="eg-filter-op-select-{{col.name}}" i18n>Operator</label>
                 <ng-container *ngTemplateOutlet="numericOperators"></ng-container>
               </div>
               <div class="pt-2">
@@ -205,7 +205,7 @@
           <div ngbDropdownMenu class="eg-grid-filter-menu">
             <div class="dropdown-item">
               <div>
-                <label for="eg-filter-op-select-{{col.name}}" i18n>Operator</label>
+                <label class="form-label" for="eg-filter-op-select-{{col.name}}" i18n>Operator</label>
                 <ng-container *ngTemplateOutlet="numericOperators"></ng-container>
               </div>
               <div class="pt-2">
@@ -232,7 +232,7 @@
           <div ngbDropdownMenu class="eg-grid-filter-menu">
             <div class="dropdown-item">
               <div>
-                <label for="eg-filter-op-select-{{col.name}}" i18n>Operator</label>
+                <label class="form-label" for="eg-filter-op-select-{{col.name}}" i18n>Operator</label>
                 <select id="eg-filter-op-select-{{col.name}}" class="form-control" 
                   [(ngModel)]="col.filterOperator" (change)="operatorChanged(col)">
                   <option value="=" i18n>Is exactly</option>
@@ -251,7 +251,7 @@
                   (onChangeAsYmd)="applyFilterCommon(col)"
                   [disabled]="col.filterInputDisabled || context.dataSource.requestingData"></eg-date-select>
                 <div [hidden]="col.filterOperator !== 'between'" class="form-inline form-group">
-                  <label for="eg-filter-end-date-select-{{col.name}}" style="width: 3em;" i18n>and</label>
+                  <label class="form-label" for="eg-filter-end-date-select-{{col.name}}" style="width: 3em;" i18n>and</label>
                   <eg-date-select [hidden]="col.filterOperator !== 'between'" #dateSelectTwo
                     (onChangeAsYmd)="applyFilterCommon(col)"
                     [disabled]="col.filterInputDisabled || context.dataSource.requestingData"
@@ -274,7 +274,7 @@
           <div ngbDropdownMenu class="eg-grid-filter-menu">
             <div class="dropdown-item">
               <div>
-                <label for="eg-filter-op-select-{{col.name}}" i18n>Operator</label>
+                <label class="form-label" for="eg-filter-op-select-{{col.name}}" i18n>Operator</label>
                 <select id="eg-filter-op-select-{{col.name}}" class="form-control" 
                   [(ngModel)]="col.filterOperator" (change)="operatorChanged(col)">
                   <option value="=" i18n>Is (or includes)</option>
@@ -286,13 +286,13 @@
                   <input type="checkbox"
                     [(ngModel)]="col.filterIncludeOrgAncestors"
                     class="form-check-input" id="include-ancestors">
-                  <label class="form-check-label" for="include-ancestors" i18n>+ Ancestors</label>
+                  <label class="form-label form-check-label" for="include-ancestors" i18n>+ Ancestors</label>
                 </div>
                 <div class="form-check">
                   <input type="checkbox"
                     [(ngModel)]="col.filterIncludeOrgDescendants"
                     class="form-check-input" id="include-descendants">
-                  <label class="form-check-label" for="include-descendants" i18n>+ Descendants</label>
+                  <label class="form-label form-check-label" for="include-descendants" i18n>+ Descendants</label>
                 </div>
               </div>
               <div class="pt-2">
diff --git a/Open-ILS/src/eg2/src/app/share/grid/grid-toolbar.component.html b/Open-ILS/src/eg2/src/app/share/grid/grid-toolbar.component.html
index bdadb4a2c7..e7128fa516 100644
--- a/Open-ILS/src/eg2/src/app/share/grid/grid-toolbar.component.html
+++ b/Open-ILS/src/eg2/src/app/share/grid/grid-toolbar.component.html
@@ -27,7 +27,7 @@
     <div class="form-check form-check-inline"
       *ngIf="gridContext.toolbarCheckboxes.length">
       <ng-container *ngFor="let cb of gridContext.toolbarCheckboxes">
-        <label class="form-check-label">
+        <label class="form-label form-check-label">
           <input class="form-check-input" type="checkbox"
             [(ngModel)]="cb.isChecked"
             (click)="cb.onChange.emit($event.target.checked)"/>
diff --git a/Open-ILS/src/eg2/src/app/share/org-family-select/org-family-select.component.html b/Open-ILS/src/eg2/src/app/share/org-family-select/org-family-select.component.html
index cb8575e690..a9a9261df5 100644
--- a/Open-ILS/src/eg2/src/app/share/org-family-select/org-family-select.component.html
+++ b/Open-ILS/src/eg2/src/app/share/org-family-select/org-family-select.component.html
@@ -15,14 +15,14 @@
         formControlName="includeAncestors"
         (blur)="propagateTouch()"
         class="form-check-input" id="{{domId}}-include-ancestors">
-      <label class="form-check-label" for="{{domId}}-include-ancestors" i18n>+ Ancestors</label>
+      <label class="form-label form-check-label" for="{{domId}}-include-ancestors" i18n>+ Ancestors</label>
     </div>
     <div class="form-check m-0 pt-0" style="min-height:.8rem" *ngIf="!hideDescendantSelector">
       <input type="checkbox"
         formControlName="includeDescendants"
         (blur)="propagateTouch()"
         class="form-check-input" id="{{domId}}-include-descendants">
-      <label class="form-check-label" for="{{domId}}-include-descendants" i18n>+ Descendants</label>
+      <label class="form-label form-check-label" for="{{domId}}-include-descendants" i18n>+ Descendants</label>
     </div>
   </div>
 </form>
diff --git a/Open-ILS/src/eg2/src/app/share/translate/translate.component.html b/Open-ILS/src/eg2/src/app/share/translate/translate.component.html
index 8fe0995d5f..b0447dda04 100644
--- a/Open-ILS/src/eg2/src/app/share/translate/translate.component.html
+++ b/Open-ILS/src/eg2/src/app/share/translate/translate.component.html
@@ -8,7 +8,7 @@
   </div>
   <div class="modal-body form-common form-validated" *ngIf="idlObj">
     <div class="form-group row">
-      <label class="col-lg-4 text-end fw-bold" 
+      <label class="form-label col-lg-4 text-end fw-bold" 
         i18n>Field Name</label>
       <input 
         type="text" 
@@ -17,7 +17,7 @@
         value="{{idlClassDef.field_map[field].label}}">
     </div>
     <div class="form-group row">
-      <label class="col-lg-4 text-end fw-bold" 
+      <label class="form-label col-lg-4 text-end fw-bold" 
         i18n>Current Value</label>
       <input 
         type="text" 
@@ -26,7 +26,7 @@
         value="{{idlObj[field]()}}">
     </div>
     <div class="form-group row">
-      <label class="col-lg-4 text-end fw-bold" 
+      <label class="form-label col-lg-4 text-end fw-bold" 
         i18n>Select Locale</label>
       <select class="form-control col-lg-7" 
         (change)="localeChanged($event)"
@@ -37,7 +37,7 @@
       </select>
     </div>
     <div class="form-group row">
-      <label class="col-lg-4 text-end fw-bold" i18n>Translation</label>
+      <label class="form-label col-lg-4 text-end fw-bold" i18n>Translation</label>
       <input 
         id='translation-input'
         type="text" 
diff --git a/Open-ILS/src/eg2/src/app/staff/acq/asn/receive.component.html b/Open-ILS/src/eg2/src/app/staff/acq/asn/receive.component.html
index 81f127ab01..facb6d77b9 100644
--- a/Open-ILS/src/eg2/src/app/staff/acq/asn/receive.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/asn/receive.component.html
@@ -17,7 +17,7 @@
       <div class="form-check form-check-inline ms-2">
         <input class="form-check-input" type="checkbox" 
           id="receive-on-scan" [(ngModel)]="receiveOnScan"/>
-        <label class="form-check-label" for="receive-on-scan">Receive on Scan</label>
+        <label class="form-label form-check-label" for="receive-on-scan">Receive on Scan</label>
       </div>
     </div>
   </div>
@@ -45,13 +45,13 @@ across different vendors to match a container code.
 <div *ngIf="container" class="mt-3 mb-3 p-1 shadow-sm common-form striped-odd">
   <div class="row">
     <div class="col-lg-2">
-      <label for="container-code" i18n>Container Code: </label>
+      <label class="form-label" for="container-code" i18n>Container Code: </label>
     </div>
     <div class="col-lg-2">
       <div id="container-code">{{container.container_code()}}</div>
     </div>
     <div class="col-lg-2">
-      <label for="container-provider" i18n>Provider: </label>
+      <label class="form-label" for="container-provider" i18n>Provider: </label>
     </div>
     <div class="col-lg-2">
       <div>
@@ -63,7 +63,7 @@ across different vendors to match a container code.
       </div>
     </div>
     <div class="col-lg-2">
-      <label for="entry-count" i18n>Affected Lineitems: </label>
+      <label class="form-label" for="entry-count" i18n>Affected Lineitems: </label>
     </div>
     <div class="col-lg-2">
       <div id="entry-count">{{entries.length}}</div>
@@ -71,19 +71,19 @@ across different vendors to match a container code.
   </div>
   <div class="row">
     <div class="col-lg-2">
-      <label for="container-lading-number" i18n>Lading #: </label>
+      <label class="form-label" for="container-lading-number" i18n>Lading #: </label>
     </div>
     <div class="col-lg-2">
       <div id="container-lading-number">{{container.lading_number()}}</div>
     </div>
     <div class="col-lg-2">
-      <label for="container-recv-date" i18n>Receive Date: </label>
+      <label class="form-label" for="container-recv-date" i18n>Receive Date: </label>
     </div>
     <div class="col-lg-2">
       <div id="container-recv-date">{{container.recv_date() | date:'short'}}</div>
     </div>
     <div class="col-lg-2">
-      <label for="entry-count" i18n>Affected Items: </label>
+      <label class="form-label" for="entry-count" i18n>Affected Items: </label>
     </div>
     <div class="col-lg-2">
       <div id="entry-count">{{affectedItemsCount()}}</div>
@@ -91,7 +91,7 @@ across different vendors to match a container code.
   </div>
   <div class="row">
     <div class="col-lg-2">
-      <label for="container-note" i18n>Notes: </label>
+      <label class="form-label" for="container-note" i18n>Notes: </label>
     </div>
     <div class="col-lg-4">
       <div class="ms-1">{{container.note()}}</div>
diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/batch-update-copies-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/batch-update-copies-dialog.component.html
index 89c11485d5..8f0a8cc917 100644
--- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/batch-update-copies-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/batch-update-copies-dialog.component.html
@@ -25,13 +25,13 @@
       <div class="row mt-3 mb-1">
         <div class="col-lg-12 form-inline">
 
-          <label class="ms-3" for='copy-count-input' i18n>Item Count: </label>
+          <label class="form-label ms-3" for='copy-count-input' i18n>Item Count: </label>
           <input class="form-control-sm ms-3 small"
             id='copy-count-input'
             [(ngModel)]="copyCount" [ngModelOptions]="{standalone: true}" type="text"/>
 
           <span class="ms-3" i18n> | </span>
-          <label class="ms-3" for='distrib-formula-cbox' i18n>Distribution Formulas</label>
+          <label class="form-label ms-3" for='distrib-formula-cbox' i18n>Distribution Formulas</label>
           <span class="ms-3">
             <eg-combobox idlClass="acqdf" [idlQueryAnd]="formulaFilter"
               [asyncSupportsEmptyTermClick]="true" [startsWith]="true"
diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/bib-finder-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/bib-finder-dialog.component.html
index a4bd011f04..243aa01f9d 100644
--- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/bib-finder-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/bib-finder-dialog.component.html
@@ -8,7 +8,7 @@
     <div class="modal-body">
       <h4 i18n>Line Item: {{liId}}</h4>
       <div class="input-group">
-        <label for="searchQuery" class="me-1" i18n>Search catalog for</label>
+        <label for="searchQuery" class="form-label me-1" i18n>Search catalog for</label>
         <input type="text" [(ngModel)]="queryString" [ngModelOptions]="{standalone: true}"
           class="form-control" id="searchQuery">
         <button type="submit" (click)="submitSearch()" class="btn btn-primary"
diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/copies.component.html b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/copies.component.html
index 7902160f8a..4978c66200 100644
--- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/copies.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/copies.component.html
@@ -9,7 +9,7 @@
 <div class="row mt-3 mb-1">
   <div class="col-lg-12 form-inline">
 
-    <label class="ms-3" for='copy-count-input' i18n>Item Count: </label>
+    <label class="form-label ms-3" for='copy-count-input' i18n>Item Count: </label>
     <input class="form-control-sm ms-3 small" 
       id='copy-count-input' [disabled]="liLocked"
       [(ngModel)]="copyCount" type="text" (keyup.enter)="applyCount()"/>
@@ -19,7 +19,7 @@
 
     <span class="ms-3" i18n> | </span>
 
-    <label class="ms-3" for='distrib-formula-cbox' i18n>Distribution Formulas</label>
+    <label class="form-label ms-3" for='distrib-formula-cbox' i18n>Distribution Formulas</label>
     <span class="ms-3">
       <eg-combobox idlClass="acqdf" [idlQueryAnd]="formulaFilter" 
         [asyncSupportsEmptyTermClick]="true" [startsWith]="true"
diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/export-attributes-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/export-attributes-dialog.component.html
index 6f74186783..ceeb687008 100644
--- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/export-attributes-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/export-attributes-dialog.component.html
@@ -15,7 +15,7 @@
         values for selected line item(s).
       </h4>
       <div class="form-group form-inline">
-        <label for="export-attr-select" class="form-check-label me-1">Filter by:</label>
+        <label for="export-attr-select" class="form-label form-check-label me-1">Filter by:</label>
         <select name="export-attr-select" id="export-attr-select"
           [(ngModel)]="selectedAttr"
           class="form-control">
diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.html b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.html
index 65ab9eda92..eff32aa76b 100644
--- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.html
@@ -86,7 +86,7 @@
     <div class="form-check me-2">
       <input class="form-check-input" type="checkbox"
         id="vendor-public" [(ngModel)]="noteIsPublic">
-      <label class="form-check-label" for="vendor-public">
+      <label class="form-label form-check-label" for="vendor-public">
         Note is vendor-public
       </label>
     </div>
@@ -119,7 +119,7 @@
       <div class="form-check">
         <input class="form-check-input" id='toggle-page-cbox'
           [(ngModel)]="batchSelectPage" (change)="toggleSelectAll(false)" type="checkbox"/>
-        <label class="form-check-label" for='toggle-page-cbox' i18n>Line Items In Page</label>
+        <label class="form-label form-check-label" for='toggle-page-cbox' i18n>Line Items In Page</label>
       </div>
     </div>
 
@@ -127,7 +127,7 @@
       <div class="form-check">
         <input class="form-check-input" id='toggle-all-cbox'
           [(ngModel)]="batchSelectAll" (change)="toggleSelectAll(true)" type="checkbox"/>
-        <label class="form-check-label" for='toggle-all-cbox' i18n>All Line Items</label>
+        <label class="form-label form-check-label" for='toggle-all-cbox' i18n>All Line Items</label>
       </div>
     </div>
 
@@ -190,7 +190,7 @@
      <form>
       <div class="d-flex justify-content-center flex-column h-100">
         <div class="form-group form-inline">
-          <label for="filter-field-select" class="form-check-label me-1">Filter by:</label>
+          <label for="filter-field-select" class="form-label form-check-label me-1">Filter by:</label>
           <select name="filter-field-select" id="filter-field-select"
             [ngModel]="filterField" (ngModelChange)="filterFieldChange($event)"
             class="form-control">
@@ -247,7 +247,7 @@
     <div class="col-lg-12 d-flex">
       <div class="d-flex justify-content-center flex-column h-100">
         <div class="form-group form-inline">
-          <label for="sort-order-select" class="form-check-label me-1">Sort by:</label>
+          <label for="sort-order-select" class="form-label form-check-label me-1">Sort by:</label>
           <select name="sort-order-select" id="sort-order-select"
             [ngModel]="sortOrder" (ngModelChange)="sortOrderChange($event)"
             class="form-control">
diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/link-invoice-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/link-invoice-dialog.component.html
index 592a63218c..d9506504fe 100644
--- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/link-invoice-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/link-invoice-dialog.component.html
@@ -13,7 +13,7 @@
       </h4>
       <div class="d-flex">
         <div class="flex-1">
-          <label for="provider-input" i18n>Provider</label>
+          <label class="form-label" for="provider-input" i18n>Provider</label>
         </div>
         <div class="flex-3">
           <eg-combobox domId="provider-input" [(ngModel)]="provider" 
@@ -28,7 +28,7 @@
       </div>
       <div class="d-flex mt-2">
         <div class="flex-1">
-          <label for="invoice-input" i18n>Invoice</label>
+          <label class="form-label" for="invoice-input" i18n>Invoice</label>
         </div>
         <div class="flex-3">
           <eg-combobox domId="invoice-input" [(ngModel)]="invoice" 
diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/manage-claims-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/manage-claims-dialog.component.html
index 4120d2f4bd..66aaff7005 100644
--- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/manage-claims-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/manage-claims-dialog.component.html
@@ -31,7 +31,7 @@
         <ng-container *ngIf="!lid.recv_time() && !lid.cancel_reason()">Not received</ng-container>
       </div>
       <ng-container *ngIf="claimEventTypes.length > 0">
-        <label for="selectClaimEventTypes" i18n>Select Claim Action(s)</label>
+        <label class="form-label" for="selectClaimEventTypes" i18n>Select Claim Action(s)</label>
         <select class="form-control"  multiple="true" [size]="claimEventTypes.length"
           [(ngModel)]="selectedClaimEventTypes" [ngModelOptions]="{standalone: true}" id="selectClaimEventTypes">
           <option *ngFor="let clet of claimEventTypes" [value]="clet.id()" i18n>
@@ -40,11 +40,11 @@
           </option>
         </select>
       </ng-container>
-      <label for="claimType" i18n>Claim Type</label>
+      <label class="form-label" for="claimType" i18n>Claim Type</label>
       <eg-combobox domId="claimType" name="claimType" 
         [asyncSupportsEmptyTermClick]="true"
         idlClass="acqclt" [(ngModel)]="claimType" [ngModelOptions]="{standalone: true}"></eg-combobox>
-      <label for="note" i18n>Claim Note</label>
+      <label class="form-label" for="note" i18n>Claim Note</label>
       <input class="form-control" type="text" i18n-placeholder placeholder="Note" [(ngModel)]="note"
         [ngModelOptions]="{standalone: true}" id="note">
     </div>
diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/notes.component.html b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/notes.component.html
index 4391fdaa23..a681aab6d8 100644
--- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/notes.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/notes.component.html
@@ -7,7 +7,7 @@
     <div class="form-check ms-2">
       <input class="form-check-input" type="checkbox" 
         [(ngModel)]="vendorPublic" id="vendor-public-cbox">
-      <label class="form-check-label" for="vendor-public-cbox" i18n>
+      <label class="form-label form-check-label" for="vendor-public-cbox" i18n>
         Vendor Public
       </label>
     </div>
diff --git a/Open-ILS/src/eg2/src/app/staff/acq/picklist/upload.component.html b/Open-ILS/src/eg2/src/app/staff/acq/picklist/upload.component.html
index 3ca7ff39ca..f2e75969a7 100644
--- a/Open-ILS/src/eg2/src/app/staff/acq/picklist/upload.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/picklist/upload.component.html
@@ -16,8 +16,8 @@
 <div class="common-form striped-odd form-validated ms-3 me-3">
   <div class="row">
     <div class="col-lg-3">
-      <label for="template-select" i18n *ngIf="mode !== 'getImportParams'">Apply/Create Form Template</label>
-      <label for="template-select" i18n *ngIf="mode === 'getImportParams'">Apply Form Template</label>
+      <label class="form-label" for="template-select" i18n *ngIf="mode !== 'getImportParams'">Apply/Create Form Template</label>
+      <label class="form-label" for="template-select" i18n *ngIf="mode === 'getImportParams'">Apply Form Template</label>
     </div>
     <div class="col-lg-3">
       <eg-combobox #formTemplateSelector
@@ -46,7 +46,7 @@
   <h2>Purchase Order</h2>
   <div class="row">
     <div class="col-lg-3">
-      <label for="provider-select" i18n>Provider</label>
+      <label class="form-label" for="provider-select" i18n>Provider</label>
     </div>
   
     <div class="col-lg-3">
@@ -62,7 +62,7 @@
     </div>
 
     <div class="col-lg-3">
-      <label for="create-po" i18n>Create Purchase Order</label>
+      <label class="form-label" for="create-po" i18n>Create Purchase Order</label>
   </div>
   <div class="col-lg-3">
     <input class="form-check-input" type="checkbox" 
@@ -72,7 +72,7 @@
 </div>
   <div class="row">
     <div class="col-lg-3">
-      <label for="type-select" i18n>Ordering Agency</label>
+      <label class="form-label" for="type-select" i18n>Ordering Agency</label>
     </div>
       <div class="col-lg-3">
         <eg-org-select
@@ -83,7 +83,7 @@
       </div>
 
       <div class="col-lg-3">
-        <label for="activate-po" i18n>Activate Purchase Order</label>
+        <label class="form-label" for="activate-po" i18n>Activate Purchase Order</label>
     </div>
     
     <div class="col-lg-3">
@@ -95,7 +95,7 @@
 
   <div class="row">
     <div class="col-lg-3">
-      <label for="year-select" i18n>Fiscal Year</label>
+      <label class="form-label" for="year-select" i18n>Fiscal Year</label>
     </div>
     <div class="col-lg-3">
       <eg-combobox #fiscalYearSelector
@@ -110,7 +110,7 @@
 
   <div class="row">
     <div class="col-lg-3">
-      <label for="sl-select" i18n>Add to Selection List?</label>
+      <label class="form-label" for="sl-select" i18n>Add to Selection List?</label>
     </div>
     <div class="col-lg-3">
       <eg-combobox #selectionListSelector
@@ -128,7 +128,7 @@
 
   <div class="row">
     <div class="col-lg-3">
-      <label for="source-select" i18n>Record Source</label>
+      <label class="form-label" for="source-select" i18n>Record Source</label>
     </div>
     <div class="col-lg-3">
       <eg-combobox #bibSourceSelector
@@ -139,7 +139,7 @@
       </eg-combobox>
     </div>
     <div class="col-lg-3">
-      <label for="import-non-matching" i18n>Import Non-Matching Records</label>
+      <label class="form-label" for="import-non-matching" i18n>Import Non-Matching Records</label>
   </div>
   <div class="col-lg-3">
     <input class="form-check-input" type="checkbox" 
@@ -150,7 +150,7 @@
  
   <div class="row">
     <div class="col-lg-3">
-      <label for="match-set-select" i18n>Record Match Set</label>
+      <label class="form-label" for="match-set-select" i18n>Record Match Set</label>
     </div>
     <div class="col-lg-3">
       <eg-combobox #matchSetSelector
@@ -162,7 +162,7 @@
       </eg-combobox>
     </div>
     <div class="col-lg-3">
-      <label for="merge-on-exact" i18n>Merge On Exact Match (901c)</label>
+      <label class="form-label" for="merge-on-exact" i18n>Merge On Exact Match (901c)</label>
   </div>
   <div class="col-lg-3">
     <input class="form-check-input" type="checkbox" 
@@ -172,7 +172,7 @@
 
   <div class="row">
     <div class="col-lg-3">
-      <label for="merge-profiles" i18n>Merge Profile</label>
+      <label class="form-label" for="merge-profiles" i18n>Merge Profile</label>
     </div>
     <div class="col-lg-3">
       <eg-combobox #mergeProfileSelector
@@ -183,7 +183,7 @@
       </eg-combobox>
     </div>
     <div class="col-lg-3">
-        <label for="merge-on-single" i18n>Merge On Single Match</label>
+        <label class="form-label" for="merge-on-single" i18n>Merge On Single Match</label>
     </div>
     <div class="col-lg-3">
       <input class="form-check-input" type="checkbox" 
@@ -192,7 +192,7 @@
   </div>
   <div class="row">
     <div class="col-lg-3">
-      <label for="insuff-merge-profiles" i18n>
+      <label class="form-label" for="insuff-merge-profiles" i18n>
         Insufficient Quality Fall-Through Profile
     </label>
     </div>
@@ -205,7 +205,7 @@
       </eg-combobox>
     </div>
     <div class="col-lg-3">
-      <label for="merge-on-best" i18n>Merge On Best Match</label>
+      <label class="form-label" for="merge-on-best" i18n>Merge On Best Match</label>
     </div>
     <div class="col-lg-3">
       <input class="form-check-input" type="checkbox" 
@@ -214,7 +214,7 @@
   </div>
   <div class="row">
     <div class="col-lg-3">
-      <label for="min-quality-ratio" i18n>
+      <label class="form-label" for="min-quality-ratio" i18n>
         Best/Single Match Minimum Quality Ratio
       </label>
     </div>
@@ -224,7 +224,7 @@
     </div>
     <ng-container *ngIf="mode !== 'getImportParams'">
     <div class="col-lg-3">
-      <label for="load-items" i18n>Load Items for Imported Records</label>
+      <label class="form-label" for="load-items" i18n>Load Items for Imported Records</label>
     </div>
     <div class="col-lg-3">
       <input class="form-check-input" type="checkbox" 
@@ -237,7 +237,7 @@
   <h2 *ngIf="mode !== 'getImportParams'">This Upload</h2>
   <div class="row">
     <div class="col-lg-3">
-      <label for="queue-select" i18n>Select or Create a Queue</label>
+      <label class="form-label" for="queue-select" i18n>Select or Create a Queue</label>
     </div>
     <div class="col-lg-3">
       <eg-combobox [entries]="formatEntries('activeQueues')"
@@ -251,7 +251,7 @@
   </div>
   <div class="row" *ngIf="!importSelection() && mode !== 'getImportParams'">
     <div class="col-lg-3">
-      <label for="upload-file" i18n>File to Upload:</label>
+      <label class="form-label" for="upload-file" i18n>File to Upload:</label>
     </div>
     <div class="col-lg-3">
       <input #fileSelector (change)="fileSelected($event)" 
@@ -260,7 +260,7 @@
   </div>
   <div class="row" *ngIf="importSelection()">
     <div class="col-lg-3">
-      <label>Import Selected</label>
+      <label class="form-label">Import Selected</label>
     </div>
     <div class="col-lg-3">
       <span *ngIf="!importSelection().importQueue" i18n>
@@ -290,7 +290,7 @@
   </div>
   <div class="row" [hidden]="!isUploading || uploadComplete">
     <div class="col-lg-3">
-      <label i18n>Upload File to Server</label>
+      <label class="form-label" i18n>Upload File to Server</label>
     </div>
     <div class="col-lg-6">
       <eg-progress-inline #uploadProgress></eg-progress-inline>
@@ -299,13 +299,13 @@
  
 
   <div class="col-lg-6 offset-lg-3" [hidden]="!uploadProcessing || uploadComplete">
-    <h2><label i18n><i>Processing...</i></label></h2>
+    <h2><label class="form-label" i18n><i>Processing...</i></label></h2>
   </div>
 
   <div class="row" [hidden]="!uploadComplete">
     <ng-container *ngIf="uploadError">
       <div class="col-lg-6 offset-lg-3">
-        <h2><label i18n>Upload Error!</label></h2>
+        <h2><label class="form-label" i18n>Upload Error!</label></h2>
         <div class="row">
           <div class="col alert-danger" i18n>Error {{uploadErrorCode}} ({{uploadErrorText}})</div>
         </div>
@@ -313,10 +313,10 @@
     </ng-container>
     <ng-container *ngIf="!uploadError">
       <div class="col-lg-6 offset-lg-3">
-        <h2><label i18n>Upload Complete!</label></h2>
+        <h2><label class="form-label" i18n>Upload Complete!</label></h2>
         <div class="row" [hidden]="!uploadComplete">
           <div class="col-2">
-            <label i18n>Go to:</label>
+            <label class="form-label" i18n>Go to:</label>
           </div>
           <div class="col-2"><a routerLink="/staff/cat/vandelay/queue/{{recordType}}/{{activeQueueId}}" target="_blank" i18n>Queue</a></div>
           <div class="col-2" [hidden]="!selectedSelectionList"><a routerLink="/staff/acq/picklist/{{activeSelectionListId}}" target="_blank">Selection List</a></div>
diff --git a/Open-ILS/src/eg2/src/app/staff/acq/po/create.component.html b/Open-ILS/src/eg2/src/app/staff/acq/po/create.component.html
index f65caa52be..130ef76afb 100644
--- a/Open-ILS/src/eg2/src/app/staff/acq/po/create.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/po/create.component.html
@@ -11,13 +11,13 @@
     <hr class="p-1" />
   </div>
   <div class="form-group">
-    <label for="order-agency-input" i18n>Ordering Agency</label>
+    <label class="form-label" for="order-agency-input" i18n>Ordering Agency</label>
     <eg-org-select (onChange)="orgChange($event)" domId="order-agency-input"
       [limitPerms]="['CREATE_PURCHASE_ORDER']">
     </eg-org-select>
   </div>
   <div class="form-group">
-    <label for="name-input" i18n>Name (optional)</label>
+    <label class="form-label" for="name-input" i18n>Name (optional)</label>
     <input id="name-input" class="form-control" type="text" [ngModel]="poName"
       (ngModelChange)="poName = $event; checkDuplicatePoName()"
     />
@@ -27,7 +27,7 @@
     <a target="_blank" routerLink="/staff/acq/po/{{dupeResults.dupePoId}}">View PO</a>
   </div>
   <div class="form-group">
-    <label for="name-input" i18n>Provider</label>
+    <label class="form-label" for="name-input" i18n>Provider</label>
     <eg-combobox domId="provider-input" [(ngModel)]="provider"
       [asyncSupportsEmptyTermClick]="true"
       idlIncludeLibraryInLabel="owner"
@@ -37,14 +37,14 @@
   <div class="form-group form-check">
     <input type="checkbox" class="form-check-input" 
       [(ngModel)]="prepaymentRequired" id="prepayment-required">
-    <label class="form-check-label" for="prepayment-required" i18n>
+    <label class="form-label form-check-label" for="prepayment-required" i18n>
       Prepayment Required
     </label>
   </div>
   <div class="form-group form-check" *ngIf="lineitems.length">
     <input type="checkbox" class="form-check-input" 
       [(ngModel)]="createAssets" id="create-assets">
-    <label class="form-check-label" for="create-assets" i18n>
+    <label class="form-label form-check-label" for="create-assets" i18n>
       Import Bibs and Create Copies
     </label>
   </div>
diff --git a/Open-ILS/src/eg2/src/app/staff/acq/po/notes.component.html b/Open-ILS/src/eg2/src/app/staff/acq/po/notes.component.html
index da025b128e..5a8944b0ea 100644
--- a/Open-ILS/src/eg2/src/app/staff/acq/po/notes.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/po/notes.component.html
@@ -7,7 +7,7 @@
     <div class="form-check ms-2">
       <input class="form-check-input" type="checkbox" 
         [(ngModel)]="vendorPublic" id="vendor-public-cbox">
-      <label class="form-check-label" for="vendor-public-cbox" i18n>
+      <label class="form-label form-check-label" for="vendor-public-cbox" i18n>
         Vendor Public
       </label>
     </div>
diff --git a/Open-ILS/src/eg2/src/app/staff/acq/po/summary.component.html b/Open-ILS/src/eg2/src/app/staff/acq/po/summary.component.html
index 65d6b1cf55..44c9000653 100644
--- a/Open-ILS/src/eg2/src/app/staff/acq/po/summary.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/po/summary.component.html
@@ -148,7 +148,7 @@
           <div class="form-check form-check-inline" *ngIf="po().state() === 'new' || po().state() === 'pending'">
             <input class="ms-0 form-check-input" type="checkbox" (change)="setCanActivate()"
               id="zero-copy-cbox" [(ngModel)]="zeroCopyActivate"/>
-            <label class="form-check-label" for="zero-copy-cbox" i18n>
+            <label class="form-label form-check-label" for="zero-copy-cbox" i18n>
               Allow Activation with Zero-Item Line Items?
             </label>
           </div>
diff --git a/Open-ILS/src/eg2/src/app/staff/acq/provider/acq-provider-search-form.component.html b/Open-ILS/src/eg2/src/app/staff/acq/provider/acq-provider-search-form.component.html
index 91a9c36c1b..5cfb469207 100644
--- a/Open-ILS/src/eg2/src/app/staff/acq/provider/acq-provider-search-form.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/provider/acq-provider-search-form.component.html
@@ -52,7 +52,7 @@
       <input i18n-placeholder placeholder="URL" [ngModelOptions]="{standalone: true}" [(ngModel)]="providerURL" type="text" class="form-control" />
     </div>
     <div class="col-lg form-group">
-      <label for="acqproIsActive" i18n>Active?</label>
+      <label class="form-label" for="acqproIsActive" i18n>Active?</label>
       <select class="form-control" id="acqproIsActive" [ngModelOptions]="{standalone: true}" [(ngModel)]="providerIsActive">
         <option i18n value="active">Yes</option>
         <option i18n value="inactive">No</option>
diff --git a/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-holdings.component.html b/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-holdings.component.html
index 889a4bdc86..706401d95b 100644
--- a/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-holdings.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-holdings.component.html
@@ -25,7 +25,7 @@
 
 <form *ngIf="provider" #holdingTagForm="ngForm">
   <div class="form-group row">
-    <label for="holdings-tag" class="col-auto col-form-label" i18n>Holdings Tag</label>
+    <label for="holdings-tag" class="form-label col-auto col-form-label" i18n>Holdings Tag</label>
     <div class="col-auto">
       <input id="holdings-tag" type="text" [(ngModel)]="provider._holding_tag" name="holding_tag" class="form-control" />
     </div>
diff --git a/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search-form.component.html b/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search-form.component.html
index e1d7a57571..3a245b7cd1 100644
--- a/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search-form.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search-form.component.html
@@ -5,7 +5,7 @@
 <form>
   <div class="row mb-1">
     <div class="col form-group form-inline">
-      <label i18n>Search for records matching
+      <label class="form-label" i18n>Search for records matching
       <select class="form-inline ms-1 me-1" id="acq-search-conjunction" [ngModelOptions]="{standalone: true}" [(ngModel)]="searchConjunction">
         <option value="all">all</option>
         <option value="any">any</option>
@@ -158,7 +158,7 @@
       <input class="form-check-input" type="checkbox" id="retrieve-immediately"
              (change)="saveRunImmediately()"
              [ngModelOptions]="{standalone: true}" [(ngModel)]="runImmediately"/>
-      <label for="retrieve-immediately" class="form-check-label" i18n>Retrieve Results Immediately</label>
+      <label for="retrieve-immediately" class="form-label form-check-label" i18n>Retrieve Results Immediately</label>
     </div>
   </div>
 </form>
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/acq/currency/exchange-rates-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/admin/acq/currency/exchange-rates-dialog.component.html
index 680150ce06..09b6a0dc6a 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/acq/currency/exchange-rates-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/acq/currency/exchange-rates-dialog.component.html
@@ -15,7 +15,7 @@
     </div>
     <form #exrForm="ngForm" role="form" [hidden]="otherCurrencies?.length < 1" class="form-validated">
       <div class="form-group row mt-2" *ngFor="let ratio of ratios">
-        <label for="exr-{{ratio.to_currency().code()}}" class="col-sm-4 col-form-label">
+        <label for="exr-{{ratio.to_currency().code()}}" class="form-label col-sm-4 col-form-label">
           {{ratio.to_currency().code()}} ({{ratio.to_currency().label()}})
         </label>
         <div class="col-sm-3">
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/acq/distribution_formula/distribution-formula-edit-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/admin/acq/distribution_formula/distribution-formula-edit-dialog.component.html
index 7c0330fac9..6e8a6e51f5 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/acq/distribution_formula/distribution-formula-edit-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/acq/distribution_formula/distribution-formula-edit-dialog.component.html
@@ -9,7 +9,7 @@
   <div class="modal-body">
     <form #myForm="ngForm" role="form" class="form-validated">
       <div class="form-group row mt-2" *ngIf="formula">
-        <label for="formula-name" class="col-sm-1 col-form-label" i18n>Formula Name
+        <label for="formula-name" class="form-label col-sm-1 col-form-label" i18n>Formula Name
         </label>
         <div class="col-sm-2">
           <input class="form-control" type="text" id="formula-name"
@@ -17,7 +17,7 @@
             [ngModel]="formula.name()" name="name"
             (ngModelChange)="formula.name($event)">
         </div>
-        <label for="formula-owner" class="col-sm-1 col-form-owner" i18n>Formula Owner
+        <label for="formula-owner" class="form-label col-sm-1 col-form-owner" i18n>Formula Owner
         </label>
         <div class="col-sm-2">
           <eg-org-select
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/acq/edi_attr_set/edi-attr-set-edit-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/admin/acq/edi_attr_set/edi-attr-set-edit-dialog.component.html
index 629f828137..c987be3fcb 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/acq/edi_attr_set/edi-attr-set-edit-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/acq/edi_attr_set/edi-attr-set-edit-dialog.component.html
@@ -9,7 +9,7 @@
   <div class="modal-body">
     <form #myForm="ngForm" role="form" class="form-validated">
       <div class="form-group row mt-2" *ngIf="attrSet">
-        <label for="attr-set-label" class="col-sm-3 col-form-label" i18n>Attribute Set Label
+        <label for="attr-set-label" class="form-label col-sm-3 col-form-label" i18n>Attribute Set Label
         </label>
         <div class="col-sm-3">
           <input class="form-control" type="text" id="attr-set-label"
@@ -29,7 +29,7 @@
         <tr *ngFor="let inp of attrInputs">
           <td><input type="checkbox" [(ngModel)]="inp.selected"
                id="attr-map-{{inp.key}}" name="attr-map-{{inp.key}}"></td>
-          <td><label for="attr-map-{{inp.key}}">{{inp.key}}</label></td>
+          <td><label class="form-label" for="attr-map-{{inp.key}}">{{inp.key}}</label></td>
           <td>{{inp.label}}</td>
         </tr>
       </table>
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-details-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-details-dialog.component.html
index 0a2ff55adf..1709bc5c01 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-details-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-details-dialog.component.html
@@ -3,7 +3,7 @@
 
 <ng-template #summaryField let-field="field" let-value="value" let-rawValue="rawValue">
   <div class="col-2">
-    <label style="fw: bold" for="fund-{{field}}">{{idlDef.field_map[field].label}}</label>
+    <label class="form-label fw-bold" for="fund-{{field}}">{{idlDef.field_map[field].label}}</label>
   </div>
   <div class="col-2">
     <span id="fund-{{field}}" [ngClass]="{'negative-money-amount': checkNegativeAmount(rawValue)}">
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-rollover-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-rollover-dialog.component.html
index e243a800d5..5fa0c88881 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-rollover-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-rollover-dialog.component.html
@@ -11,7 +11,7 @@
   <div class="modal-body" [hidden]="!doneLoading">
     <form #rolloverForm="ngForm" role="form" class="form-validated">
       <div class="row col">
-        <label for="year" class="my-1 me-1" i18n>Year</label>
+        <label for="year" class="form-label my-1 me-1" i18n>Year</label>
         <eg-combobox [entries]="years" *ngIf="years"
           [required]="true" [selectedId]="year"
           (onChange)="year = $event ? $event.id : null">
@@ -22,7 +22,7 @@
         <input type="checkbox" name="includeDescendants" id="includeDescendants"
           class="form-check-input"
           [(ngModel)]="includeDescendants">
-        <label for="includeDescendants" class="form-check-label" i18n>Include funds from descendant Org Units</label>
+        <label for="includeDescendants" class="form-label form-check-label" i18n>Include funds from descendant Org Units</label>
       </div>
       <hr>
       <h4 i18n>Fund Propagation</h4>
@@ -40,7 +40,7 @@
         <input type="checkbox" name="doCloseout" id="doCloseout"
           class="form-check-input"
           [(ngModel)]="doCloseout">
-        <label for="doCloseout" class="form-check-label" i18n>Perform Fiscal Year Close-Out</label>
+        <label for="doCloseout" class="form-label form-check-label" i18n>Perform Fiscal Year Close-Out</label>
         <eg-help-popover helpText="Perform Fiscal Year Close-Out deactivates funds for the selected fiscal year. It will also move unspent and encumbered funds to the corresponding fund for the next fiscal year if that fund is configured to Propagate and Rollover." i18n-helpText></eg-help-popover>
         <span class="alert-warning" *ngIf="doCloseout && !dryRun">Will do a Close-Out for real. If you need to double-check first, check the "Dry Run" checkbox.</span>
       </div>
@@ -48,7 +48,7 @@
         <input type="checkbox" name="limitToEncumbrances" id="limitToEncumbrances"
           class="form-check-input"
           [(ngModel)]="limitToEncumbrances">
-        <label for="limitToEncumbrances" class="form-check-label" i18n>Limit Fiscal Year Close-Out to Encumbrances</label>
+        <label for="limitToEncumbrances" class="form-label form-check-label" i18n>Limit Fiscal Year Close-Out to Encumbrances</label>
         <eg-help-popover helpText="This option will limit the Perform Fiscal Year Close-Out procedure to only move encumbrances to the corresponding fund for the next fiscal year. Any unspent money in the funds will not roll over." i18n-helpText></eg-help-popover>
       </div>
       <hr>
@@ -56,7 +56,7 @@
         <input type="checkbox" name="dryRun" id="dryRun"
           class="form-check-input"
           [(ngModel)]="dryRun">
-        <label for="dryRun" class="form-check-label" i18n>Dry Run &mdash; no data will be changed</label>
+        <label for="dryRun" class="form-label form-check-label" i18n>Dry Run &mdash; no data will be changed</label>
         <eg-help-popover helpText="Select Dry Run to see a preview of the changes that would occur based on the selected actions. Data will not be changed when Dry Run is selected." i18n-helpText></eg-help-popover>
       </div>
     </form>
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-transfer-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-transfer-dialog.component.html
index f4b82c76f2..7e74cde15c 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-transfer-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-transfer-dialog.component.html
@@ -10,7 +10,7 @@
   <div class="modal-body" [hidden]="!doneLoading">
     <form #xfrForm="ngForm" role="form" class="form-validated common-form striped-odd">
       <div class="form-group row mt-2">
-        <label for="dest-fund" class="col-sm-4 col-form-label" i18n>Destination Fund</label>
+        <label for="dest-fund" class="form-label col-sm-4 col-form-label" i18n>Destination Fund</label>
         <div class="col-sm-8">
           <eg-combobox #fundSelector [asyncSupportsEmptyTermClick]="true"
           name="dest_fund" id="dest-fund" [mandatory]="true"
@@ -19,7 +19,7 @@
         </div>
       </div>
       <div class="form-group row">
-        <label for="source_amount" class="col-sm-4 col-form-label" i18n>Source Amount</label>
+        <label for="source_amount" class="form-label col-sm-4 col-form-label" i18n>Source Amount</label>
         <div class="col-sm-8">
           <input class="form-control" type="number" name="source_amount" id="source_amount" [(ngModel)]="sourceAmount" required>
         </div>
@@ -31,7 +31,7 @@
         </div>
       </div>
       <div class="form-group row">
-        <label for="note" class="col-sm-4 col-form-label" i18n>Note</label>
+        <label for="note" class="form-label col-sm-4 col-form-label" i18n>Note</label>
         <div class="col-sm-8">
           <input class="form-control" type="text" name="note" id="note" [(ngModel)]="note">
         </div>
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/funding-source-transactions-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/funding-source-transactions-dialog.component.html
index 9d847fe7a0..1889ec77da 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/funding-source-transactions-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/funding-source-transactions-dialog.component.html
@@ -3,7 +3,7 @@
 
 <ng-template #summaryField let-field="field" let-value="value">
   <div class="col-2">
-    <label style="fw: bold" for="fund-{{field}}">{{idlDef.field_map[field].label}}</label>
+    <label class="form-label fw-bold" for="fund-{{field}}">{{idlDef.field_map[field].label}}</label>
   </div>
   <div class="col-2">
     <span id="fund-{{field}}">
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.html
index 59d5da8db3..49d93ca2ba 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.html
@@ -37,7 +37,7 @@
                 <div class="d-flex" [ngClass]="isDialog() ? 'col-md-6' : 'col-md-12'">
                   <div class="input-group">
                     <div class="input-group-text">
-                      <label for="associate-item-barcode" class="input-group-text" i18n>Barcode</label>
+                      <label for="associate-item-barcode" class="form-label input-group-text" i18n>Barcode</label>
                     </div>
                     <input type="text" class="flex-grow-1" id="associate-item-barcode"
                       [(ngModel)]="barcodeInput" (click)="$event.target.select()"
@@ -48,7 +48,7 @@
                 <div class="d-flex" [ngClass]="isDialog() ? 'col-md-6' : 'col-md-12 mt-3'">
                   <div class="input-group">
                     <div class="input-group-text">
-                      <label for="associate-item-relationship" class="input-group-text" i18n>Relationship</label>
+                      <label for="associate-item-relationship" class="form-label input-group-text" i18n>Relationship</label>
                     </div>
                     <input type="text" [(ngModel)]="relationshipInput" id="associate-item-relationship"
                       [disabled]="currentCourse && (courseIsArchived || currentCourse.is_archived()) === 't'" placeholder-i18n
@@ -68,7 +68,7 @@
                   <div class="input-group">
                     <div class="input-group-text">
                       <div class="input-group-text">
-                        <label for="associate-item-temp-call-number" i18n>Call Number</label>
+                        <label class="form-label" for="associate-item-temp-call-number" i18n>Call Number</label>
                       </div>
                     </div>
                     <input type="text" [(ngModel)]="tempCallNumber" id="associate-item-temp-call-number"
@@ -87,7 +87,7 @@
                   <div class="input-group">
                     <div class="input-group-text">
                       <div class="input-group-text">
-                        <label for="temp-circ-mod" i18n>Circulation Modifier</label>
+                        <label class="form-label" for="temp-circ-mod" i18n>Circulation Modifier</label>
                       </div>
                     </div>
                     <eg-combobox i18n-placeholder placeholder="Circulation Modifier..." idlClass="ccm" idlField="name"
@@ -111,7 +111,7 @@
                   <div class="input-group">
                     <div class="input-group-text">
                       <div class="input-group-text">
-                        <label for="temp-item-status" i18n>Item Status</label>
+                        <label class="form-label" for="temp-item-status" i18n>Item Status</label>
                       </div>
                     </div>
                     <eg-combobox i18n-placeholder placeholder="Item Status..." idlClass="ccs" idlField="name"
@@ -133,7 +133,7 @@
                   <div class="input-group">
                     <div class="input-group-text">
                       <div class="input-group-text">
-                        <label for="temp-location" i18n>Shelving Location</label>
+                        <label class="form-label" for="temp-location" i18n>Shelving Location</label>
                       </div>
                     </div>
                     <eg-item-location-select permFilter="MANAGE_RESERVES" class="flex-grow-1" domId="temp-location"
@@ -166,7 +166,7 @@
               <div class="d-flex" [ngClass]="isDialog() ? 'col-md-6' : 'col-md-12 mt-3'">
                 <div class="input-group">
                   <div class="input-group-text">
-                    <label class="input-group-text" for="brief-relationship" i18n>Relationship</label>
+                    <label class="form-label input-group-text" for="brief-relationship" i18n>Relationship</label>
                   </div>
                   <input type="text" [(ngModel)]="relationshipInput" id="brief-relationship"
                     [disabled]="currentCourse && (courseIsArchived || currentCourse.is_archived()) === 't'" placeholder-i18n
@@ -198,7 +198,7 @@
                 <div class="d-flex" [ngClass]="isDialog() ? 'col-md-6' : 'col-md-12 mt-3'">
                   <div class="input-group">
                     <div class="input-group-text">
-                      <label for="bib-id" class="input-group-text" i18n>Bibliographic Record ID</label>
+                      <label for="bib-id" class="form-label input-group-text" i18n>Bibliographic Record ID</label>
                     </div>
                     <input type="text" [(ngModel)]="bibId" id="bib-id"
                       [disabled]="currentCourse && (courseIsArchived || currentCourse.is_archived()) === 't'" class="flex-grow-1" />
@@ -207,7 +207,7 @@
                 <div class="d-flex" [ngClass]="isDialog() ? 'col-md-6' : 'col-md-12 mt-3'">
                   <div class="input-group">
                     <div class="input-group-text">
-                      <label class="input-group-text" for="electronic-relationship" i18n>Relationship</label>
+                      <label class="form-label input-group-text" for="electronic-relationship" i18n>Relationship</label>
                     </div>
                     <input type="text" [(ngModel)]="relationshipInput" id="electronic-relationship"
                       [disabled]="currentCourse && (courseIsArchived || currentCourse.is_archived()) === 't'" class="flex-grow-1" />
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-users.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-users.component.html
index c846d4434f..ac254f5818 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-users.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-users.component.html
@@ -24,7 +24,7 @@
         <div class="d-flex"  [ngClass]="isDialog() ? 'col-md-6' : 'col-md-12'">
           <div class="input-group">
             <div class="input-group-text">
-              <label for="associate-user-barcode" class="input-group-text" i18n>Patron Barcode</label>
+              <label for="associate-user-barcode"  class="form-label input-group-text" i18n>Patron Barcode</label>
             </div>
             <input type="text" class="flex-grow-1" id="associate-user-barcode"
               [(ngModel)]="userBarcode" (click)="$event.target.select()"
@@ -40,7 +40,7 @@
         <div class="d-flex" [ngClass]="isDialog() ? 'col-md-6' : 'col-md-12 mt-3'">
           <div class="input-group">
             <div class="input-group-text">
-              <label for="associate-user-role" class="input-group-text" i18n>Role</label>
+              <label for="associate-user-role"  class="form-label input-group-text" i18n>Role</label>
             </div>
             <eg-combobox idlClass="acmr" [(ngModel)]="userRoleInput"
             [asyncSupportsEmptyTermClick]="true"
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/shelving_location_groups/shelving_location_groups.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/shelving_location_groups/shelving_location_groups.component.html
index 6aeecb2f12..a6022a75d7 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/shelving_location_groups/shelving_location_groups.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/shelving_location_groups/shelving_location_groups.component.html
@@ -116,7 +116,7 @@
                                 [(ngModel)]="group.checked"
                                 [checked]="group.checked"
                                 id="{{group.label}}" /> 
-                                <label for="{{group.label}}">
+                                <label class="form-label" for="{{group.label}}">
                                     {{group.shortname}} &nbsp; {{group.name}}
                                 </label>
                             </td>
@@ -146,7 +146,7 @@
                                     [(ngModel)]="location.checked"
                                     [checked]="location.checked"
                                     id="{{location.label}}" /> 
-                                    <label for="{{location.label}}">
+                                    <label class="form-label" for="{{location.label}}">
                                         {{location.shortname}} &nbsp; {{location.name}}
                                     </label>
                                 </td>
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/staff_portal_page/clone-portal-entries-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/staff_portal_page/clone-portal-entries-dialog.component.html
index 6975fbc4a9..124190d36f 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/staff_portal_page/clone-portal-entries-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/staff_portal_page/clone-portal-entries-dialog.component.html
@@ -7,7 +7,7 @@
   <div class="modal-body">
     <form #cloneForm="ngForm" role="form" class="form-validated common-form striped-odd">
       <div class="form-group row mt-2">
-        <label for="source_library" class="col-sm-6 col-form-label" i18n>Source Library</label>
+        <label for="source_library" class="form-label col-sm-6 col-form-label" i18n>Source Library</label>
         <div class="col-sm-6">
           <eg-org-select
             placeholder="Source Library..."
@@ -19,7 +19,7 @@
         </div>
       </div>
       <div class="form-group row mt-2">
-        <label for="target_library" class="col-sm-6 col-form-label" i18n>Target Library</label>
+        <label for="target_library" class="form-label col-sm-6 col-form-label" i18n>Target Library</label>
         <div class="col-sm-6">
           <eg-org-select
             placeholder="Target Library..."
@@ -31,7 +31,7 @@
         </div>
       </div>
       <div class="form-group row mt-2">
-        <label for="overwrite_target" class="col-sm-6 col-form-label" i18n>Clear Entries at Target Library?</label>
+        <label for="overwrite_target" class="form-label col-sm-6 col-form-label" i18n>Clear Entries at Target Library?</label>
         <div class="col-sm-6">
           <input type="checkbox" id="overwrite_target" name="overwrite_target" [(ngModel)]="result.overwrite_target" />
         </div>
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/survey/survey-edit.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/survey/survey-edit.component.html
index 51a378c571..efc709192e 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/survey/survey-edit.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/survey/survey-edit.component.html
@@ -30,7 +30,7 @@
                     </eg-staff-banner>
                 <div *ngFor="let question of localArray; let questionIndex = index;">
                     <div class="mb-3 mt-3 p-2 bg-light input-group">
-                        <label class="input-group-text">
+                        <label class="form-label input-group-text">
                             <b>Question</b>
                         </label>
                         <input type="text" [(ngModel)]="question.words" class="form-control"
@@ -77,7 +77,7 @@
                     </div>
                 </div>
                 <div class="mb-3 mt-3 p-2 bg-light input-group">
-                    <label class="input-group-text">
+                    <label class="form-label input-group-text">
                         <b>New Question</b>
                     </label>
                     <input #newQuestionInput 
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/triggers/trigger-edit.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/triggers/trigger-edit.component.html
index 1e4c09fbb1..08c88264c2 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/triggers/trigger-edit.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/triggers/trigger-edit.component.html
@@ -93,7 +93,7 @@
         <a role="tab" ngbNavLink i18n>Run Tests</a>
         <ng-template ngbNavContent>
             <h3 class="mb-3">Run Tests</h3>
-            <label id="barcode">Barcode of Circulating Copy </label>
+            <label class="form-label" id="barcode">Barcode of Circulating Copy </label>
             <input aria-labelledby="barcode" type="text" [(ngModel)]="barcode"
                 (keyup.enter)="runTest(barcode)" class="ms-2" />
             <div></div>
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/coded-value-maps/composite-new.component.html b/Open-ILS/src/eg2/src/app/staff/admin/server/coded-value-maps/composite-new.component.html
index 670fbc1287..aa240708ca 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/server/coded-value-maps/composite-new.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/server/coded-value-maps/composite-new.component.html
@@ -11,7 +11,7 @@
     <ng-container *ngIf="values.pointType==='attr'">
       <div class="row mb-1">
         <div class="col-lg-4">
-          <label id="type" class="col-form-label" i18n>Select Attribute Type:</label>
+          <label id="type" class="form-label col-form-label" i18n>Select Attribute Type:</label>
         </div>
         <div class="col-lg-8">
           <eg-combobox [entries]="attrTypes" [required]="true" aria-labelledby="type"
@@ -21,7 +21,7 @@
       </div>
       <div class="row mb-1">
         <div class="col-lg-4">
-          <label id="value" class="col-form-label" i18n>Select Value:</label>
+          <label id="value" class="form-label col-form-label" i18n>Select Value:</label>
         </div>
         <div class="col-lg-8">
           <eg-combobox #valComboBox [entries]="attrVals" [required]="true" aria-labelledby="value"
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/org-unit-type.component.html b/Open-ILS/src/eg2/src/app/staff/admin/server/org-unit-type.component.html
index 10351a04e9..9e474abcb9 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/server/org-unit-type.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/server/org-unit-type.component.html
@@ -36,7 +36,7 @@
     <div *ngIf="selected" class="common-form striped-even">
       <div class="row">
         <div class="col-lg-3">
-          <label i18n>Actions for Selected: </label>
+          <label class="form-label" i18n>Actions for Selected: </label>
         </div>
         <div class="col-lg-9">
           <button class="btn btn-info me-2" (click)="edit()" i18n>Edit</button>
@@ -48,7 +48,7 @@
       <div class="row">
         <!-- TODO: use FmRecordEditPaneComponent once it exists -->
         <div class="col-lg-4">
-          <label i18n>Name: </label>
+          <label class="form-label" i18n>Name: </label>
         </div>
         <div class="col-lg-8 fw-bold">
           {{selected.callerData.aout.name()}}
@@ -56,7 +56,7 @@
       </div>
       <div class="row">
         <div class="col-lg-4">
-          <label i18n>Label: </label>
+          <label class="form-label" i18n>Label: </label>
         </div>
         <div class="col-lg-8 fw-bold">
           {{selected.callerData.aout.opac_label()}}
@@ -64,7 +64,7 @@
       </div>
       <div class="row">
         <div class="col-lg-4">
-          <label i18n>Can Have Users: </label>
+          <label class="form-label" i18n>Can Have Users: </label>
         </div>
         <div class="col-lg-8 fw-bold">
           <!-- TODO: use <eg-bool/> once merged-->
@@ -73,7 +73,7 @@
       </div>
       <div class="row">
           <div class="col-lg-4">
-            <label i18n>Can Have Holdings: </label>
+            <label class="form-label" i18n>Can Have Holdings: </label>
           </div>
           <div class="col-lg-8 fw-bold">
             <!-- TODO: use <eg-bool/> once merged-->
@@ -82,7 +82,7 @@
         </div>
       <div class="row">
         <div class="col-lg-4">
-          <label i18n>Depth: </label>
+          <label class="form-label" i18n>Depth: </label>
         </div>
         <div class="col-lg-8 fw-bold">
           {{selected.callerData.aout.depth()}}
@@ -90,7 +90,7 @@
       </div>
       <div class="row">
         <div class="col-lg-4">
-          <label i18n>Number of Org Units Of This Type: </label>
+          <label class="form-label" i18n>Number of Org Units Of This Type: </label>
         </div>
         <div class="col-lg-8 fw-bold">
           {{selected.callerData.orgCount}}
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/perm-group-tree.component.html b/Open-ILS/src/eg2/src/app/staff/admin/server/perm-group-tree.component.html
index dae782c222..0f9610f7a0 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/server/perm-group-tree.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/server/perm-group-tree.component.html
@@ -59,7 +59,7 @@
           <ng-template ngbNavContent>
             <div class="row">
               <div class="col-lg-3">
-                <label i18n>Actions for Selected: </label>
+                <label class="form-label" i18n>Actions for Selected: </label>
               </div>
               <div class="col-lg-9">
                 <button class="btn btn-info me-2" (click)="edit()" i18n>Edit</button>
@@ -69,7 +69,7 @@
             </div>
             <div class="row">
               <div class="col-lg-4">
-                <label i18n>Name: </label>
+                <label class="form-label" i18n>Name: </label>
               </div>
               <div class="col-lg-8 fw-bold">
                 {{selected.callerData.name()}}
@@ -77,7 +77,7 @@
             </div>
             <div class="row">
               <div class="col-lg-4">
-                <label i18n>Description: </label>
+                <label class="form-label" i18n>Description: </label>
               </div>
               <div class="col-lg-8 fw-bold">
                 {{selected.callerData.description()}}
@@ -85,7 +85,7 @@
             </div>
             <div class="row">
               <div class="col-lg-4">
-                <label i18n>User Expiration Interval: </label>
+                <label class="form-label" i18n>User Expiration Interval: </label>
               </div>
               <div class="col-lg-8 fw-bold">
                 {{selected.callerData.perm_interval()}}
@@ -93,7 +93,7 @@
             </div>
             <div class="row">
               <div class="col-lg-4">
-                <label i18n>Application Permission: </label>
+                <label class="form-label" i18n>Application Permission: </label>
               </div>
               <div class="col-lg-8 fw-bold">
                 {{selected.callerData.application_perm()}}
@@ -101,7 +101,7 @@
             </div>
             <div class="row">
               <div class="col-lg-4">
-                <label i18n>Hold Priority: </label>
+                <label class="form-label" i18n>Hold Priority: </label>
               </div>
               <div class="col-lg-8 fw-bold">
                 {{selected.callerData.hold_priority()}}
@@ -109,7 +109,7 @@
             </div>
             <div class="row">
               <div class="col-lg-4">
-                <label i18n>User Group?: </label>
+                <label class="form-label" i18n>User Group?: </label>
               </div>
               <div class="col-lg-8 fw-bold">
                 <!-- TODO: replace with <eg-bool/> when merged -->
diff --git a/Open-ILS/src/eg2/src/app/staff/booking/capture.component.html b/Open-ILS/src/eg2/src/app/staff/booking/capture.component.html
index 2099c2b805..ddd78368a4 100644
--- a/Open-ILS/src/eg2/src/app/staff/booking/capture.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/booking/capture.component.html
@@ -10,7 +10,7 @@
   <div class="col-md-4">
     <div class="input-group flex-nowrap">
       <div class="input-group-text">
-        <label class="input-group-text" for="resource-barcode" i18n>Resource barcode</label>
+        <label class="form-label input-group-text" for="resource-barcode" i18n>Resource barcode</label>
         <input type="text" id="resource-barcode" class="form-control" formControlName="resourceBarcode">
       </div>
     </div>
diff --git a/Open-ILS/src/eg2/src/app/staff/booking/create-reservation-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/booking/create-reservation-dialog.component.html
index 641f6bd08c..a2da78752b 100644
--- a/Open-ILS/src/eg2/src/app/staff/booking/create-reservation-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/booking/create-reservation-dialog.component.html
@@ -9,7 +9,7 @@
   </div>
   <form class="modal-body form-common" [formGroup]="create">
     <div class="form-group row">
-      <label class="col-lg-4 text-end fw-bold"
+      <label class="form-label col-lg-4 text-end fw-bold"
         i18n for="create-patron-barcode">Patron barcode</label>
       <div class="col-lg-7">
         <input type="text" id="create-patron-barcode"
@@ -27,7 +27,7 @@
       </span>
     </div>
     <div class="form-group row">
-      <label class="col-lg-4 text-end fw-bold"
+      <label class="form-label col-lg-4 text-end fw-bold"
         i18n for="create-end-time">Start time</label>
       <eg-datetime-select
         formControlName="startTime"
@@ -35,7 +35,7 @@
       </eg-datetime-select>
     </div>
     <div class="form-group row">
-      <label class="col-lg-4 text-end fw-bold"
+      <label class="form-label col-lg-4 text-end fw-bold"
         i18n for="create-end-time">End time</label>
       <eg-datetime-select
         formControlName="endTime"
@@ -47,7 +47,7 @@
       </div>
     </div>
     <div class="form-group row">
-      <label class="col-lg-4 text-end fw-bold"
+      <label class="form-label col-lg-4 text-end fw-bold"
         i18n for="create-pickup-library">Reservation location</label>
       <eg-org-select domId="create-pickup-library" [applyDefault]="true"
         [disableOrgs]="disableOrgs()" [hideOrgs]="disableOrgs()"
@@ -62,7 +62,7 @@
       <span i18n>Reservation location is in the {{timezone}} timezone</span>
     </div>
     <div class="form-group row">
-      <label class="col-lg-4 text-end fw-bold"
+      <label class="form-label col-lg-4 text-end fw-bold"
         i18n for="create-resource">Resource</label>
       <input *ngIf="targetResource && targetResourceBarcode" id="create-resource" value="{{targetResourceBarcode}}" disabled>
       <eg-combobox
@@ -76,12 +76,12 @@
       </eg-combobox>
     </div>
     <div class="form-group row">
-      <label class="col-lg-4 text-end fw-bold"
+      <label class="form-label col-lg-4 text-end fw-bold"
         i18n for="create-email-notify">Notify by email?</label>
       <input type="checkbox" formControlName="emailNotify">
     </div>
     <div class="form-group row">
-      <label class="col-lg-4 text-end fw-bold"
+      <label class="form-label col-lg-4 text-end fw-bold"
         i18n for="create-note">Note</label>
       <input type="text" id="create-note"
         class="form-control col-lg-7" formControlName="note">
diff --git a/Open-ILS/src/eg2/src/app/staff/booking/create-reservation.component.html b/Open-ILS/src/eg2/src/app/staff/booking/create-reservation.component.html
index c1c543055a..766c2d1b3c 100644
--- a/Open-ILS/src/eg2/src/app/staff/booking/create-reservation.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/booking/create-reservation.component.html
@@ -7,7 +7,7 @@
       <div class="col">
         <div class="input-group">
           <div class="input-group-text">
-            <label class="input-group-text" for="ideal-reservation-type" i18n>Reservation type</label>
+            <label class="form-label input-group-text" for="ideal-reservation-type" i18n>Reservation type</label>
           </div>
           <select class="form-control" id="ideal-reservation-type" formControlName="reservationType">
             <option *ngFor="let type of reservationTypes" [ngValue]="type" i18n>{{type.name}}</option>
@@ -17,7 +17,7 @@
       <div class="col">
         <div class="input-group">
           <div class="input-group-text">
-            <label class="input-group-text" for="ideal-reservation-date" i18n>Reservation date</label>
+            <label class="form-label input-group-text" for="ideal-reservation-date" i18n>Reservation date</label>
           </div>
           <eg-date-select *ngIf="!multiday" #dateLimiter domId="ideal-reservation-date" formControlName="idealDate"></eg-date-select>
           <eg-daterange-select *ngIf="multiday" formControlName="idealDateRange"></eg-daterange-select>
@@ -38,7 +38,7 @@
             <div class="col">
               <div class="input-group">
                 <div class="input-group-text">
-                  <label class="input-group-text" for="ideal-resource-type" i18n>Search by resource type</label>
+                  <label class="form-label input-group-text" for="ideal-resource-type" i18n>Search by resource type</label>
                 </div>
                 <eg-combobox
                   formControlName="resourceType"
@@ -66,7 +66,7 @@
             <div class="col">
               <div class="input-group">
                 <div class="input-group-text">
-                  <label class="input-group-text" for="ideal-resource-barcode" i18n>Search by resource barcode</label>
+                  <label class="form-label input-group-text" for="ideal-resource-barcode" i18n>Search by resource barcode</label>
                 </div>
                 <input type="text" id="ideal-resource-barcode" class="form-control" formControlName="resourceBarcode">
               </div>
@@ -85,7 +85,7 @@
             <li *ngFor="let attribute of attributes; let i = index" class="list-group-item">
               <span class="input-group">
                 <span class="input-group-text">
-                  <label class="input-group-text" for="attribute-{{attribute.id()}}" i18n>{{attribute.name()}}</label>
+                  <label class="form-label input-group-text" for="attribute-{{attribute.id()}}" i18n>{{attribute.name()}}</label>
                 </span>
                 <eg-combobox [formControlName]="i">
                   <eg-combobox-entry *ngFor="let value of attribute.valid_values()"
@@ -108,7 +108,7 @@
             <li class="list-group-item">
               <span class="input-group">
                 <span class="input-group-text">
-                  <label class="input-group-text" for="start-time" i18n>Start time</label>
+                  <label class="form-label input-group-text" for="start-time" i18n>Start time</label>
                 </span>
                 <ngb-timepicker formControlName="startOfDay" [minuteStep]="minuteStep()" [meridian]="true"></ngb-timepicker>
               </span>
@@ -116,7 +116,7 @@
             <li class="list-group-item">
               <span class="input-group">
                 <span class="input-group-text">
-                  <label class="input-group-text" for="end-time" i18n>End time</label>
+                  <label class="form-label input-group-text" for="end-time" i18n>End time</label>
                 </span>
                 <ngb-timepicker formControlName="endOfDay" [minuteStep]="minuteStep()" [meridian]="true"></ngb-timepicker>
               </span>
@@ -130,7 +130,7 @@
             <li class="list-group-item">
               <span class="input-group">
                 <span class="input-group-text">
-                  <label class="input-group-text" for="granularity" i18n>Granularity</label>
+                  <label class="form-label input-group-text" for="granularity" i18n>Granularity</label>
                 </span>
                 <eg-combobox (onChange)="changeGranularity($event)" [startId]="granularity ? granularity : 30">
                   <eg-combobox-entry [entryId]="15" entryLabel="15 minutes"
diff --git a/Open-ILS/src/eg2/src/app/staff/booking/manage-reservations.component.html b/Open-ILS/src/eg2/src/app/staff/booking/manage-reservations.component.html
index b52b003ff8..3e3678c0a2 100644
--- a/Open-ILS/src/eg2/src/app/staff/booking/manage-reservations.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/booking/manage-reservations.component.html
@@ -19,7 +19,7 @@
             <div class="m-2">
               <div class="input-group m-2">
                 <div class="input-group-text">
-                  <label class="input-group-text" for="patron-barcode-value" i18n>Patron barcode</label>
+                  <label class="form-label input-group-text" for="patron-barcode-value" i18n>Patron barcode</label>
                 </div>
                 <input type="text" id="patron-barcode-value" class="form-control" formControlName="patronBarcode">
                 <div class="input-group-button">
@@ -37,7 +37,7 @@
             <div class="m-2">
               <div class="input-group m-2">
                 <div class="input-group-text">
-                  <label class="input-group-text" for="resource-barcode-value" i18n>Resource barcode</label>
+                  <label class="form-label input-group-text" for="resource-barcode-value" i18n>Resource barcode</label>
                 </div>
                 <input type="text" id="resource-barcode-value" class="form-control" formControlName="resourceBarcode">
                 <div class="input-group-button">
@@ -55,7 +55,7 @@
             <div class="m-2">
               <div class="input-group m-2">
                 <div class="input-group-text">
-                  <label class="input-group-text" for="resource-type-value" i18n>Resource type</label>
+                  <label class="form-label input-group-text" for="resource-type-value" i18n>Resource type</label>
                 </div>
                 <eg-combobox domId="resource-type-value" formControlName="resourceType" idlClass="brt" [asyncSupportsEmptyTermClick]="true"></eg-combobox>
                 <div class="input-group-button">
diff --git a/Open-ILS/src/eg2/src/app/staff/booking/pickup.component.html b/Open-ILS/src/eg2/src/app/staff/booking/pickup.component.html
index 926058c9b1..eebf04e79b 100644
--- a/Open-ILS/src/eg2/src/app/staff/booking/pickup.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/booking/pickup.component.html
@@ -6,7 +6,7 @@
   <div class="col-md-4">
     <div class="input-group flex-nowrap">
       <div class="input-group-text">
-        <label class="input-group-text" for="patron-barcode" i18n>Patron barcode</label>
+        <label class="form-label input-group-text" for="patron-barcode" i18n>Patron barcode</label>
         <input type="text" id="patron-barcode" class="form-control" formControlName="patronBarcode">
       </div>
     </div>
@@ -16,7 +16,7 @@
   <h2 class="text-center" i18n>Ready for pickup</h2>
   <div class="form-check">
     <input class="form-check-input" type="checkbox" [checked]="onlyShowCaptured" id="only-show-captured" (change)="handleShowCapturedChange()">
-    <label class="form-check-label" for="only-show-captured" i18n>Show only captured resources</label>
+    <label class="form-label form-check-label" for="only-show-captured" i18n>Show only captured resources</label>
   </div>
   <eg-reservations-grid #readyGrid [patron]="patronId" status="pickupReady" [onlyCaptured]="onlyShowCaptured" persistSuffix="pickup.ready" (pickedUpResource)="this.pickedUpGrid.reloadGrid()"></eg-reservations-grid>
 
diff --git a/Open-ILS/src/eg2/src/app/staff/booking/pull-list.component.html b/Open-ILS/src/eg2/src/app/staff/booking/pull-list.component.html
index c2f6c83db4..bca9f9c060 100644
--- a/Open-ILS/src/eg2/src/app/staff/booking/pull-list.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/booking/pull-list.component.html
@@ -6,7 +6,7 @@
   <div class="col-md-4">
     <div class="input-group">
       <div class="input-group-text">
-        <label for="ou" class="input-group-text" i18n>Library:</label>
+        <label for="ou" class="form-label input-group-text" i18n>Library:</label>
       </div>
       <eg-org-select domId="ou" [applyDefault]="true"
         (onChange)="handleOrgChange($event)"
@@ -17,7 +17,7 @@
   <div class="col-md-4">
     <div class="input-group">
       <div class="input-group-text">
-        <label for="days-hence" class="input-group-text" i18n>Number of days to fetch:</label>
+        <label for="days-hence" class="form-label input-group-text" i18n>Number of days to fetch:</label>
       </div>
       <input type="number" min="1" class="form-control" formControlName="daysHence">
     </div>
diff --git a/Open-ILS/src/eg2/src/app/staff/booking/return.component.html b/Open-ILS/src/eg2/src/app/staff/booking/return.component.html
index 2d19162bf6..0cba8b9974 100644
--- a/Open-ILS/src/eg2/src/app/staff/booking/return.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/booking/return.component.html
@@ -12,7 +12,7 @@
           <div class="col-md-4">
             <div class="input-group flex-nowrap">
               <div class="input-group-text">
-                <label class="input-group-text" for="patron-barcode" i18n>Patron barcode</label>
+                <label class="form-label input-group-text" for="patron-barcode" i18n>Patron barcode</label>
                 <input type="text" id="patron-barcode" class="form-control" i18n-placeholder placeholder="Patron barcode" formControlName="patronBarcode">
               </div>
             </div>
@@ -32,7 +32,7 @@
       <ng-template ngbNavContent>
         <div class="input-group flex-nowrap">
           <div class="input-group-text">
-            <label class="input-group-text" for="resource-barcode" i18n>Resource barcode</label>
+            <label class="form-label input-group-text" for="resource-barcode" i18n>Resource barcode</label>
             <input type="text" id="resource-barcode" class="form-control" i18n-placeholder placeholder="Resource barcode" formControlName="resourceBarcode">
           </div>
         </div>
diff --git a/Open-ILS/src/eg2/src/app/staff/cat/authority/browse.component.html b/Open-ILS/src/eg2/src/app/staff/cat/authority/browse.component.html
index 9bb2abeeaa..352e4a1af5 100644
--- a/Open-ILS/src/eg2/src/app/staff/cat/authority/browse.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/cat/authority/browse.component.html
@@ -38,7 +38,7 @@
     <div class="flex-1"></div><!-- push right -->
     <div class="form-inline">
       <button class="btn btn-outline-dark ms-2" (click)="search(-1)" i18n>Previous</button>
-      <label for='offset-input' class="form-control ms-2" i18n>Page</label>
+      <label for='offset-input' class="form-label form-control ms-2" i18n>Page</label>
       <input class="form-control" type="number" 
         [(ngModel)]="browse.searchOffset" id="offset-input" (change)="search()"/>
       <button class="btn btn-outline-dark ms-2" (click)="search(1)" i18n>Next</button>
diff --git a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/export.component.html b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/export.component.html
index bbb58954ab..7526df02ae 100644
--- a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/export.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/export.component.html
@@ -21,7 +21,7 @@
             <ng-template ngbPanelContent>
               <div class="row">
                 <div class="col-lg-6">
-                  <label for="csv-input" i18n>Use Field Number</label>
+                  <label class="form-label" for="csv-input" i18n>Use Field Number</label>
                 </div>
                 <div class="col-lg-6">
                   <input id='csv-input' type="number" class="form-control" 
@@ -31,7 +31,7 @@
               </div>
               <div class="row">
                 <div class="col-lg-6">
-                  <label for="use-csv-file" i18n>From CSV file</label>
+                  <label class="form-label" for="use-csv-file" i18n>From CSV file</label>
                 </div>
                 <div class="col-lg-6">
                   <input #fileSelector (change)="fileSelected($event)" 
@@ -44,7 +44,7 @@
             <ng-template ngbPanelContent>
               <div class="row">
                 <div class="col-lg-6">
-                  <label for="record-id-input" i18n>Record ID</label>
+                  <label class="form-label" for="record-id-input" i18n>Record ID</label>
                 </div>
                 <div class="col-lg-6">
                   <input id='record-id-input' type="number" 
@@ -57,7 +57,7 @@
             <ng-template ngbPanelContent>
               <div class="row">
                 <div class="col-lg-6">
-                  <label for="bucket-id-input" i18n>Bucket ID</label>
+                  <label class="form-label" for="bucket-id-input" i18n>Bucket ID</label>
                 </div>
                 <div class="col-lg-6">
                   <input id='bucket-id-input' type="number" 
@@ -73,7 +73,7 @@
     <div class="col-lg-6">
       <div class="row">
         <div class="col-lg-6">
-          <label for="record-type" i18n>Record Type</label>
+          <label class="form-label" for="record-type" i18n>Record Type</label>
         </div>
         <div class="col-lg-6">
           <select class="form-control" 
@@ -86,7 +86,7 @@
       </div>
       <div class="row">
         <div class="col-lg-6">
-          <label for="record-format" i18n>Record Format</label>
+          <label class="form-label" for="record-format" i18n>Record Format</label>
         </div>
         <div class="col-lg-6">
           <select class="form-control" 
@@ -100,7 +100,7 @@
       </div>
       <div class="row">
         <div class="col-lg-6">
-          <label for="record-encoding" i18n>Record Encoding</label>
+          <label class="form-label" for="record-encoding" i18n>Record Encoding</label>
         </div>
         <div class="col-lg-6">
           <select class="form-control" 
@@ -112,7 +112,7 @@
       </div>
       <div class="row">
         <div class="col-lg-6">
-          <label for="include-holdings" i18n>
+          <label class="form-label" for="include-holdings" i18n>
             Include holdings in Bibliographic Records
           </label>
         </div>
diff --git a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.html b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.html
index 026e07ea5a..cc778aa93e 100644
--- a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.html
@@ -16,7 +16,7 @@
 <div class="common-form striped-odd form-validated ms-3 me-3">
   <div class="row">
     <div class="col-lg-3">
-      <label for="template-select" i18n>Apply/Create Form Template</label>
+      <label class="form-label" for="template-select" i18n>Apply/Create Form Template</label>
     </div>
     <div class="col-lg-3">
       <eg-combobox #formTemplateSelector
@@ -44,7 +44,7 @@
 
   <div class="row">
     <div class="col-lg-3">
-      <label for="type-select" i18n>Record Type</label>
+      <label class="form-label" for="type-select" i18n>Record Type</label>
     </div>
     <div class="col-lg-3">
       <eg-combobox #recordTypeSelector
@@ -61,7 +61,7 @@
       </eg-combobox>
     </div>
     <div class="col-lg-3">
-      <label for="source-select" i18n>Select a Record Source</label>
+      <label class="form-label" for="source-select" i18n>Select a Record Source</label>
     </div>
     <div class="col-lg-3">
       <eg-combobox #bibSourceSelector
@@ -75,7 +75,7 @@
   </div>
   <div class="row">
     <div class="col-lg-3">
-      <label for="queue-select" i18n>Select or Create a Queue</label>
+      <label class="form-label" for="queue-select" i18n>Select or Create a Queue</label>
     </div>
     <div class="col-lg-3">
       <eg-combobox [entries]="formatEntries('activeQueues')"
@@ -90,7 +90,7 @@
       </eg-combobox>
     </div>
     <div class="col-lg-3">
-      <label for="bucket-select" i18n>Limit Matches to Bucket</label>
+      <label class="form-label" for="bucket-select" i18n>Limit Matches to Bucket</label>
     </div>
     <div class="col-lg-3">
       <eg-combobox [entries]="formatEntries('bibBuckets')" 
@@ -104,7 +104,7 @@
   </div>
   <div class="row">
     <div class="col-lg-3">
-      <label for="match-set-select" i18n>Record Match Set</label>
+      <label class="form-label" for="match-set-select" i18n>Record Match Set</label>
     </div>
     <div class="col-lg-3">
       <eg-combobox #matchSetSelector
@@ -116,7 +116,7 @@
         placeholder="Match Set..." i18n-placeholder></eg-combobox>
     </div>
     <div class="col-lg-3">
-        <label for="import-non-matching" i18n>Import Non-Matching Records</label>
+        <label class="form-label" for="import-non-matching" i18n>Import Non-Matching Records</label>
     </div>
     <div class="col-lg-3">
       <input class="form-check-input" type="checkbox" 
@@ -126,7 +126,7 @@
  </div>
   <div class="row">
     <div class="col-lg-3">
-      <label for="item-import-def" i18n>Holdings Import Profile</label>
+      <label class="form-label" for="item-import-def" i18n>Holdings Import Profile</label>
     </div>
     <div class="col-lg-3"> <!-- TODO disable for authority -->
       <eg-combobox #holdingsProfileSelector
@@ -139,7 +139,7 @@
       </eg-combobox>
     </div>
     <div class="col-lg-3">
-        <label for="merge-on-exact" i18n>Merge On Exact Match (901c)</label>
+        <label class="form-label" for="merge-on-exact" i18n>Merge On Exact Match (901c)</label>
     </div>
     <div class="col-lg-3">
       <input class="form-check-input" type="checkbox" 
@@ -148,7 +148,7 @@
   </div>
   <div class="row">
     <div class="col-lg-3">
-      <label for="merge-profiles" i18n>Merge Profile</label>
+      <label class="form-label" for="merge-profiles" i18n>Merge Profile</label>
     </div>
     <div class="col-lg-3">
       <eg-combobox #mergeProfileSelector
@@ -159,7 +159,7 @@
       </eg-combobox>
     </div>
     <div class="col-lg-3">
-        <label for="merge-on-single" i18n>Merge On Single Match</label>
+        <label class="form-label" for="merge-on-single" i18n>Merge On Single Match</label>
     </div>
     <div class="col-lg-3">
       <input class="form-check-input" type="checkbox" 
@@ -168,7 +168,7 @@
   </div>
   <div class="row">
     <div class="col-lg-3">
-      <label for="insuff-merge-profiles" i18n>
+      <label class="form-label" for="insuff-merge-profiles" i18n>
         Insufficient Quality Fall-Through Profile
     </label>
     </div>
@@ -181,7 +181,7 @@
       </eg-combobox>
     </div>
     <div class="col-lg-3">
-      <label for="merge-on-best" i18n>Merge On Best Match</label>
+      <label class="form-label" for="merge-on-best" i18n>Merge On Best Match</label>
     </div>
     <div class="col-lg-3">
       <input class="form-check-input" type="checkbox" 
@@ -190,7 +190,7 @@
   </div>
   <div class="row">
     <div class="col-lg-3">
-      <label for="min-quality-ratio" i18n>
+      <label class="form-label" for="min-quality-ratio" i18n>
         Best/Single Match Minimum Quality Ratio
       </label>
     </div>
@@ -199,7 +199,7 @@
         class="form-control" [(ngModel)]="minQualityRatio">
     </div>
     <div class="col-lg-3">
-      <label for="auto-overlay-acq-copies" i18n>
+      <label class="form-label" for="auto-overlay-acq-copies" i18n>
         Auto-overlay In-process Acquisitions Items
       </label>
     </div>
@@ -212,14 +212,14 @@
   </div>
   <div class="row">
     <div class="col-lg-3">
-      <label for="session-name" i18n>Optional Session Name:</label>
+      <label class="form-label" for="session-name" i18n>Optional Session Name:</label>
     </div>
     <div class="col-lg-3">
       <input [(ngModel)]="sessionName" class="form-control" type="text"
         name="session-name" i18n-placeholder placeholder="Session Name..."/>
     </div>
     <div class="col-lg-3">
-      <label for="auto-overlay-on-order-copies" i18n>
+      <label class="form-label" for="auto-overlay-on-order-copies" i18n>
         Auto-overlay On-order Cataloging Items
       </label>
     </div>
@@ -232,7 +232,7 @@
   </div>
   <div class="row">
     <div class="col-lg-3">
-      <label for="marc-remove-groups" i18n>Remove MARC Field Groups</label>
+      <label class="form-label" for="marc-remove-groups" i18n>Remove MARC Field Groups</label>
     </div>
     <ng-container *ngIf="recordType !== 'authority'">
       <div class="col-lg-3" *ngIf="bibTrashGroups.length === 0">
@@ -247,7 +247,7 @@
       </div>
     </ng-container>
     <div class="col-lg-3">
-      <label for="auto-overlay-org-unit-copies" i18n>
+      <label class="form-label" for="auto-overlay-org-unit-copies" i18n>
         Use Org Unit Matching in Copy to Determine Best Match
       </label>
     </div>
@@ -260,7 +260,7 @@
   </div>
   <div class="row" *ngIf="!importSelection()">
     <div class="col-lg-3">
-      <label for="upload-file" i18n>File to Upload:</label>
+      <label class="form-label" for="upload-file" i18n>File to Upload:</label>
     </div>
     <div class="col-lg-3">
       <input #fileSelector (change)="fileSelected($event)" 
@@ -269,7 +269,7 @@
   </div>
   <div class="row" *ngIf="importSelection()">
     <div class="col-lg-3">
-      <label>Import Selected</label>
+      <label class="form-label">Import Selected</label>
     </div>
     <div class="col-lg-3">
       <span *ngIf="!importSelection().importQueue" i18n>
@@ -293,7 +293,7 @@
   <!-- hide instead of *ngIf so ViewChild can find the progress bars -->
   <div class="row" [hidden]="!showProgress || importSelection()">
     <div class="col-lg-3">
-      <label i18n>Upload Progress</label>
+      <label class="form-label" i18n>Upload Progress</label>
     </div>
     <div class="col-lg-6">
       <eg-progress-inline #uploadProgress></eg-progress-inline>
@@ -301,7 +301,7 @@
   </div>
   <div class="row" [hidden]="!showProgress || importSelection()">
     <div class="col-lg-3">
-      <label i18n>Enqueue Progress</label>
+      <label class="form-label" i18n>Enqueue Progress</label>
     </div>
     <div class="col-lg-6">
       <eg-progress-inline #enqueueProgress></eg-progress-inline>
@@ -309,7 +309,7 @@
   </div>
   <div class="row" [hidden]="!showProgress">
     <div class="col-lg-3">
-      <label i18n>Import Progress</label>
+      <label class="form-label" i18n>Import Progress</label>
     </div>
     <div class="col-lg-6">
       <eg-progress-inline #importProgress></eg-progress-inline>
diff --git a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/queue-list.component.html b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/queue-list.component.html
index 0ce7bd3e90..9ae79ac103 100644
--- a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/queue-list.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/queue-list.component.html
@@ -2,7 +2,7 @@
   <h2 i18n>Select a Queue To Inspect</h2>
   <div class="row flex">
     <div>
-      <label for="queue-type-combobox" i18n>Queue Type</label>
+      <label class="form-label" for="queue-type-combobox" i18n>Queue Type</label>
     </div>
     <div class="col-lg-3">
       <eg-combobox (onChange)="queueTypeChanged($event)"
diff --git a/Open-ILS/src/eg2/src/app/staff/cat/volcopy/config.component.html b/Open-ILS/src/eg2/src/app/staff/cat/volcopy/config.component.html
index 9475c4af51..af32d08e02 100644
--- a/Open-ILS/src/eg2/src/app/staff/cat/volcopy/config.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/cat/volcopy/config.component.html
@@ -16,7 +16,7 @@
                 <input class="form-check-input" type="checkbox" 
                   id="hide-classification-column" 
                   [(ngModel)]="volcopy.defaults.hidden.classification">
-                <label class="form-check-label" for="hide-classification-column" i18n>
+                <label class="form-label form-check-label" for="hide-classification-column" i18n>
                   Hide Call Number Classification Column
                 </label>
               </div>
@@ -26,7 +26,7 @@
                 <input class="form-check-input" type="checkbox" 
                   id="hide-prefix-column" 
                   [(ngModel)]="volcopy.defaults.hidden.prefix">
-                <label class="form-check-label" for="hide-prefix-column" i18n>
+                <label class="form-label form-check-label" for="hide-prefix-column" i18n>
                   Hide Call Number Prefix Column
                 </label>
               </div>
@@ -36,7 +36,7 @@
                 <input class="form-check-input" type="checkbox" 
                   id="hide-suffix-column" 
                   [(ngModel)]="volcopy.defaults.hidden.suffix">
-                <label class="form-check-label" for="hide-suffix-column" i18n>
+                <label class="form-label form-check-label" for="hide-suffix-column" i18n>
                   Hide Call Number Suffix Column
                 </label>
               </div>
@@ -46,7 +46,7 @@
                 <input class="form-check-input" type="checkbox" 
                   id="hide-generate_barcodes-column" 
                   [(ngModel)]="volcopy.defaults.hidden.generate_barcodes">
-                <label class="form-check-label" for="hide-generate_barcodes-column" i18n>
+                <label class="form-label form-check-label" for="hide-generate_barcodes-column" i18n>
                   Hide Generate Barcodes
                 </label>
               </div>
@@ -56,7 +56,7 @@
                 <input class="form-check-input" type="checkbox" 
                   id="hide-use_checkdigit-column" 
                   [(ngModel)]="volcopy.defaults.hidden.use_checkdigit">
-                <label class="form-check-label" for="hide-use_checkdigit-column" i18n>
+                <label class="form-label form-check-label" for="hide-use_checkdigit-column" i18n>
                   Hide Use Checkdigit
                 </label>
               </div>
@@ -70,7 +70,7 @@
                 <input class="form-check-input" type="checkbox" 
                   id="hide-copy_number_vc-column" 
                   [(ngModel)]="volcopy.defaults.hidden.copy_number_vc">
-                <label class="form-check-label" for="hide-copy_number_vc-column" i18n>
+                <label class="form-label form-check-label" for="hide-copy_number_vc-column" i18n>
                   Hide Item Number
                 </label>
               </div>
@@ -79,7 +79,7 @@
               <div class="form-check form-check-inline">
                 <input class="form-check-input" type="checkbox" id="hide-copy_part-column" 
                   [(ngModel)]="volcopy.defaults.hidden.copy_part">
-                <label class="form-check-label" for="hide-copy_part-column" i18n>
+                <label class="form-label form-check-label" for="hide-copy_part-column" i18n>
                   Hide Item Part
                 </label>
               </div>
@@ -89,7 +89,7 @@
                 <input class="form-check-input" type="checkbox" 
                   id="volcopy-unified-interface" 
                   [(ngModel)]="volcopy.defaults.values.unified_display">
-                <label class="form-check-label" for="volcopy-unified-interface" i18n>
+                <label class="form-label form-check-label" for="volcopy-unified-interface" i18n>
                   Unified Holdings and Item Attributes Display
                 </label>
               </div>
@@ -108,7 +108,7 @@
             <li class="list-group-item">
               <div class="row">
                 <div class="col-lg-4">
-                  <label for="default-classification" i18n>Default Classification</label>
+                  <label class="form-label" for="default-classification" i18n>Default Classification</label>
                 </div>
                 <div class="col-lg-8">
                   <eg-combobox
@@ -126,7 +126,7 @@
             <li class="list-group-item">
               <div class="row">
                 <div class="col-lg-4">
-                  <label for="default-prefix" i18n>Default Prefix</label>
+                  <label class="form-label" for="default-prefix" i18n>Default Prefix</label>
                 </div>
                 <div class="col-lg-8">
                   <eg-combobox
@@ -147,7 +147,7 @@
             <li class="list-group-item">
               <div class="row">
                 <div class="col-lg-4">
-                  <label for="default-suffix" i18n>Default Suffix</label>
+                  <label class="form-label" for="default-suffix" i18n>Default Suffix</label>
                 </div>
                 <div class="col-lg-8">
                   <eg-combobox
@@ -185,7 +185,7 @@
             <input class="form-check-input" type="checkbox" 
               id="circ_lib_mod_with_owning_lib-column" 
               [(ngModel)]="volcopy.defaults.values.circ_lib_mod_with_owning_lib">
-            <label class="form-check-label" 
+            <label class="form-label form-check-label" 
               for="circ_lib_mod_with_owning_lib-column" i18n>
               Change Circ Lib When Owning Lib Changes
             </label>
@@ -199,7 +199,7 @@
               [initialOrgId]="volcopy.defaults.values.statcat_filter"
               (onChange)="volcopy.defaults.values.statcat_filter = $event ? $event.id() : null">
             </eg-org-select>
-            <label class="ms-2" for="statcat_filter" i18n>
+            <label class="form-label ms-2" for="statcat_filter" i18n>
               Default Stat Cat Library Filter
             </label>
           </div>
@@ -230,7 +230,7 @@
             <input class="form-check-input" type="checkbox" 
               id="show-status-attr" 
               [(ngModel)]="volcopy.defaults.hidden.status">
-            <label class="form-check-label" for="show-status-attr" i18n>
+            <label class="form-label form-check-label" for="show-status-attr" i18n>
               Status
             </label>
           </div>
@@ -240,7 +240,7 @@
             <input class="form-check-input" type="checkbox" 
               id="show-barcode-attr" 
               [(ngModel)]="volcopy.defaults.hidden.barcode">
-            <label class="form-check-label" for="show-barcode-attr" i18n>
+            <label class="form-label form-check-label" for="show-barcode-attr" i18n>
               Barcode
             </label>
           </div>
@@ -250,7 +250,7 @@
             <input class="form-check-input" type="checkbox" 
               id="show-create_date-attr" 
               [(ngModel)]="volcopy.defaults.hidden.create_date">
-            <label class="form-check-label" for="show-create_date-attr" i18n>
+            <label class="form-label form-check-label" for="show-create_date-attr" i18n>
               Creation Date
             </label>
           </div>
@@ -260,7 +260,7 @@
             <input class="form-check-input" type="checkbox" 
               id="show-active_date-attr" 
               [(ngModel)]="volcopy.defaults.hidden.active_date">
-            <label class="form-check-label" for="show-active_date-attr" i18n>
+            <label class="form-label form-check-label" for="show-active_date-attr" i18n>
               Activation Date
             </label>
           </div>
@@ -270,7 +270,7 @@
             <input class="form-check-input" type="checkbox" 
               id="show-creator-attr" 
               [(ngModel)]="volcopy.defaults.hidden.creator">
-            <label class="form-check-label" for="show-creator-attr" i18n>
+            <label class="form-label form-check-label" for="show-creator-attr" i18n>
               Creator
             </label>
           </div>
@@ -280,7 +280,7 @@
             <input class="form-check-input" type="checkbox" 
               id="show-edit_date-attr" 
               [(ngModel)]="volcopy.defaults.hidden.edit_date">
-            <label class="form-check-label" for="show-edit_date-attr" i18n>
+            <label class="form-label form-check-label" for="show-edit_date-attr" i18n>
               Last Edit Date
             </label>
           </div>
@@ -290,7 +290,7 @@
             <input class="form-check-input" type="checkbox" 
               id="show-editor-attr" 
               [(ngModel)]="volcopy.defaults.hidden.editor">
-            <label class="form-check-label" for="show-editor-attr" i18n>
+            <label class="form-label form-check-label" for="show-editor-attr" i18n>
               Last Editor
             </label>
           </div>
@@ -309,7 +309,7 @@
             <input class="form-check-input" type="checkbox" 
               id="show-location-attr" 
               [(ngModel)]="volcopy.defaults.hidden.location">
-            <label class="form-check-label" for="show-location-attr" i18n>
+            <label class="form-label form-check-label" for="show-location-attr" i18n>
               Location
             </label>
           </div>
@@ -319,7 +319,7 @@
             <input class="form-check-input" type="checkbox" 
               id="show-circ_lib-attr" 
               [(ngModel)]="volcopy.defaults.hidden.circ_lib">
-            <label class="form-check-label" for="show-circ_lib-attr" i18n>
+            <label class="form-label form-check-label" for="show-circ_lib-attr" i18n>
               Circulating Library
             </label>
           </div>
@@ -329,7 +329,7 @@
             <input class="form-check-input" type="checkbox" 
               id="show-owning_lib-attr" 
               [(ngModel)]="volcopy.defaults.hidden.owning_lib">
-            <label class="form-check-label" for="show-owning_lib-attr" i18n>
+            <label class="form-label form-check-label" for="show-owning_lib-attr" i18n>
               Owning Library
             </label>
           </div>
@@ -339,7 +339,7 @@
             <input class="form-check-input" type="checkbox" 
               id="show-copy_number-attr" 
               [(ngModel)]="volcopy.defaults.hidden.copy_number">
-            <label class="form-check-label" for="show-copy_number-attr" i18n>
+            <label class="form-label form-check-label" for="show-copy_number-attr" i18n>
               Copy Number 
             </label>
           </div>
@@ -359,7 +359,7 @@
             <input class="form-check-input" type="checkbox" 
               id="show-circulate-attr" 
               [(ngModel)]="volcopy.defaults.hidden.circulate">
-            <label class="form-check-label" for="show-circulate-attr" i18n>
+            <label class="form-label form-check-label" for="show-circulate-attr" i18n>
               Circulate
             </label>
           </div>
@@ -369,7 +369,7 @@
             <input class="form-check-input" type="checkbox" 
               id="show-holdable-attr" 
               [(ngModel)]="volcopy.defaults.hidden.holdable">
-            <label class="form-check-label" for="show-holdable-attr" i18n>
+            <label class="form-label form-check-label" for="show-holdable-attr" i18n>
               Holdable
             </label>
           </div>
@@ -379,7 +379,7 @@
             <input class="form-check-input" type="checkbox" 
               id="show-age_protect-attr" 
               [(ngModel)]="volcopy.defaults.hidden.age_protect">
-            <label class="form-check-label" for="show-age_protect-attr" i18n>
+            <label class="form-label form-check-label" for="show-age_protect-attr" i18n>
               Aged-Based Hold Protection
             </label>
           </div>
@@ -389,7 +389,7 @@
             <input class="form-check-input" type="checkbox" 
               id="show-floating-attr" 
               [(ngModel)]="volcopy.defaults.hidden.floating">
-            <label class="form-check-label" for="show-floating-attr" i18n>
+            <label class="form-label form-check-label" for="show-floating-attr" i18n>
               Floating
             </label>
           </div>
@@ -399,7 +399,7 @@
             <input class="form-check-input" type="checkbox" 
               id="show-loan_duration-attr" 
               [(ngModel)]="volcopy.defaults.hidden.loan_duration">
-            <label class="form-check-label" for="show-loan_duration-attr" i18n>
+            <label class="form-label form-check-label" for="show-loan_duration-attr" i18n>
               Loan Duration
             </label>
           </div>
@@ -409,7 +409,7 @@
             <input class="form-check-input" type="checkbox" 
               id="show-fine_level-attr" 
               [(ngModel)]="volcopy.defaults.hidden.fine_level">
-            <label class="form-check-label" for="show-fine_level-attr" i18n>
+            <label class="form-label form-check-label" for="show-fine_level-attr" i18n>
               Fine Level
             </label>
           </div>
@@ -419,7 +419,7 @@
             <input class="form-check-input" type="checkbox" 
               id="show-circ_as_type-attr" 
               [(ngModel)]="volcopy.defaults.hidden.circ_as_type">
-            <label class="form-check-label" for="show-circ_as_type-attr" i18n>
+            <label class="form-label form-check-label" for="show-circ_as_type-attr" i18n>
               Circulate As Type
             </label>
           </div>
@@ -429,7 +429,7 @@
             <input class="form-check-input" type="checkbox" 
               id="show-circ_modifier-attr" 
               [(ngModel)]="volcopy.defaults.hidden.circ_modifier">
-            <label class="form-check-label" for="show-circ_modifier-attr" i18n>
+            <label class="form-label form-check-label" for="show-circ_modifier-attr" i18n>
               Circulation Modifier
             </label>
           </div>
@@ -449,7 +449,7 @@
             <input class="form-check-input" type="checkbox" 
               id="show-copy_alerts-attr" 
               [(ngModel)]="volcopy.defaults.hidden.copy_alerts">
-            <label class="form-check-label" for="show-copy_alerts-attr" i18n>
+            <label class="form-label form-check-label" for="show-copy_alerts-attr" i18n>
               Item Alerts
             </label>
           </div>
@@ -459,7 +459,7 @@
             <input class="form-check-input" type="checkbox" 
               id="show-deposit-attr" 
               [(ngModel)]="volcopy.defaults.hidden.deposit">
-            <label class="form-check-label" for="show-deposit-attr" i18n>
+            <label class="form-label form-check-label" for="show-deposit-attr" i18n>
               Deposit
             </label>
           </div>
@@ -469,7 +469,7 @@
             <input class="form-check-input" type="checkbox" 
               id="show-deposit_amount-attr" 
               [(ngModel)]="volcopy.defaults.hidden.deposit_amount">
-            <label class="form-check-label" for="show-deposit_amount-attr" i18n>
+            <label class="form-label form-check-label" for="show-deposit_amount-attr" i18n>
               Deposit Amount
             </label>
           </div>
@@ -479,7 +479,7 @@
             <input class="form-check-input" type="checkbox" 
               id="show-price-attr" 
               [(ngModel)]="volcopy.defaults.hidden.price">
-            <label class="form-check-label" for="show-price-attr" i18n>
+            <label class="form-label form-check-label" for="show-price-attr" i18n>
               Price
             </label>
           </div>
@@ -489,7 +489,7 @@
             <input class="form-check-input" type="checkbox" 
               id="show-opac_visible-attr" 
               [(ngModel)]="volcopy.defaults.hidden.opac_visible">
-            <label class="form-check-label" for="show-opac_visible-attr" i18n>
+            <label class="form-label form-check-label" for="show-opac_visible-attr" i18n>
               OPAC Visible
             </label>
           </div>
@@ -499,7 +499,7 @@
             <input class="form-check-input" type="checkbox" 
               id="show-ref-attr" 
               [(ngModel)]="volcopy.defaults.hidden.ref">
-            <label class="form-check-label" for="show-ref-attr" i18n>
+            <label class="form-label form-check-label" for="show-ref-attr" i18n>
               Reference
             </label>
           </div>
@@ -509,7 +509,7 @@
             <input class="form-check-input" type="checkbox" 
               id="show-cost-attr" 
               [(ngModel)]="volcopy.defaults.hidden.cost">
-            <label class="form-check-label" for="show-cost-attr" i18n>
+            <label class="form-label form-check-label" for="show-cost-attr" i18n>
               Cost 
             </label>
           </div>
@@ -519,7 +519,7 @@
             <input class="form-check-input" type="checkbox" 
               id="show-mint_condition-attr" 
               [(ngModel)]="volcopy.defaults.hidden.mint_condition">
-            <label class="form-check-label" for="show-mint_condition-attr" i18n>
+            <label class="form-label form-check-label" for="show-mint_condition-attr" i18n>
               Quality
             </label>
           </div>
@@ -539,7 +539,7 @@
             <input class="form-check-input" type="checkbox" 
               id="show-copy_tags-attr" 
               [(ngModel)]="volcopy.defaults.hidden.copy_tags">
-            <label class="form-check-label" for="show-copy_tags-attr" i18n>
+            <label class="form-label form-check-label" for="show-copy_tags-attr" i18n>
               Add Item Tags
             </label>
           </div>
@@ -549,7 +549,7 @@
             <input class="form-check-input" type="checkbox" 
               id="show-copy_notes-attr" 
               [(ngModel)]="volcopy.defaults.hidden.copy_notes">
-            <label class="form-check-label" for="show-copy_notes-attr" i18n>
+            <label class="form-label form-check-label" for="show-copy_notes-attr" i18n>
               Add Item Notes
             </label>
           </div>
@@ -559,7 +559,7 @@
             <input class="form-check-input" type="checkbox" 
               id="show-statcat_filter-attr" 
               [(ngModel)]="volcopy.defaults.hidden.statcat_filter">
-            <label class="form-check-label" for="show-statcat_filter-attr" i18n>
+            <label class="form-label form-check-label" for="show-statcat_filter-attr" i18n>
               Stat Cat Filter
             </label>
           </div>
@@ -569,7 +569,7 @@
             <input class="form-check-input" type="checkbox" 
               id="show-statcats-attr" 
               [(ngModel)]="volcopy.defaults.hidden.statcats">
-            <label class="form-check-label" for="show-statcats-attr" i18n>
+            <label class="form-label form-check-label" for="show-statcats-attr" i18n>
               Statistical Categories
             </label>
           </div>
diff --git a/Open-ILS/src/eg2/src/app/staff/cat/volcopy/vol-edit.component.html b/Open-ILS/src/eg2/src/app/staff/cat/volcopy/vol-edit.component.html
index e8fb0d57c0..901547bc1a 100644
--- a/Open-ILS/src/eg2/src/app/staff/cat/volcopy/vol-edit.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/cat/volcopy/vol-edit.component.html
@@ -22,7 +22,7 @@
 <div *ngIf="volcopy.defaults.visible.batch_actions" 
   class="row d-flex bg-faint mb-2 pb-1 pt-1 border border-dark rounded">
   <div class="p-1" [ngStyle]="{flex: flexAt(1)}">
-    <div><label class="fw-bold" i18n>&nbsp;</label></div>
+    <div><label  class="form-label fw-bold" i18n>&nbsp;</label></div>
     <button class="btn btn-sm btn-outline-dark label-with-material-icon" 
       (click)="toggleBatchVisibility()">
       <span i18n>Batch Actions</span>
@@ -31,7 +31,7 @@
   </div>
   <div class="p-1" [ngStyle]="{flex: flexAt(3)}">
     <ng-container *ngIf="displayColumn('classification')">
-      <div><label class="fw-bold" i18n>Classification</label></div>
+      <div><label  class="form-label fw-bold" i18n>Classification</label></div>
       <div>
         <eg-combobox [smallFormControl]="true" [(ngModel)]="batchVolClass">
           <eg-combobox-entry *ngFor="let cls of volcopy.commonData.acn_class"
@@ -43,7 +43,7 @@
   </div>
   <div class="p-1" [ngStyle]="{flex: flexAt(4)}">
     <ng-container *ngIf="displayColumn('prefix')">
-      <div><label class="fw-bold" i18n>Prefix</label></div>
+      <div><label  class="form-label fw-bold" i18n>Prefix</label></div>
       <div>
         <eg-combobox [smallFormControl]="true" [(ngModel)]="batchVolPrefix">
           <eg-combobox-entry *ngFor="let pfx of volcopy.commonData.acn_prefix"
@@ -70,7 +70,7 @@
   </div>
   <div class="p-1" [ngStyle]="{flex: flexAt(6)}">
     <ng-container *ngIf="displayColumn('suffix')">
-      <div><label class="fw-bold" i18n>Suffix</label></div>
+      <div><label class="form-label fw-bold" i18n>Suffix</label></div>
       <div>
         <eg-combobox [smallFormControl]="true" [(ngModel)]="batchVolSuffix">
           <eg-combobox-entry *ngFor="let sfx of volcopy.commonData.acn_suffix"
@@ -81,7 +81,7 @@
     </ng-container>
   </div>
   <div class="p-1" [ngStyle]="{flex: flexAt(7)}">
-    <div><label class="fw-bold" i18n>Batch</label></div>
+    <div><label class="form-label fw-bold" i18n>Batch</label></div>
     <div>
       <button class="btn btn-sm btn-outline-dark label-with-material-icon"
         (click)="batchVolApply()">
@@ -185,7 +185,7 @@
     </ng-container>
   </div>
   <div class="p-1" [ngStyle]="{flex: flexAt(7)}">
-    <label class="fw-bold" i18n></label>
+    <label class="form-label fw-bold" i18n></label>
   </div>
   <!-- 
     When hiding the copy_number column, absorb its colum width to 
@@ -210,7 +210,7 @@
   </div>
   <div class="p-1" [ngStyle]="{flex: flexAt(9)}">
     <ng-container *ngIf="displayColumn('copy_number_vc')">
-      <label class="fw-bold" i18n>Item #</label>
+      <label class="form-label fw-bold" i18n>Item #</label>
     </ng-container>
   </div>
   <div class="p-1" [ngStyle]="{flex: flexAt(10)}">
diff --git a/Open-ILS/src/eg2/src/app/staff/cat/volcopy/volcopy.component.html b/Open-ILS/src/eg2/src/app/staff/cat/volcopy/volcopy.component.html
index 6bec2d0dbd..c418063e7e 100644
--- a/Open-ILS/src/eg2/src/app/staff/cat/volcopy/volcopy.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/cat/volcopy/volcopy.component.html
@@ -65,7 +65,7 @@
           <input class="form-check-input" id='use-labels-cbox' type="checkbox"     
             [ngModel]="volcopy.defaults.values.print_labels"
             (change)="toggleCheckbox('print_labels')">
-          <label class="form-check-label" for='use-labels-cbox'                    
+          <label class="form-label form-check-label" for='use-labels-cbox'                    
             i18n>Print Labels?</label>                                             
         </div>
 
@@ -79,7 +79,7 @@
               <input class="form-check-input" type="checkbox" id="use-checkdigit" 
                 (change)="toggleCheckbox('use_checkdigit')"
                 [ngModel]="volcopy.defaults.values.use_checkdigit"/>
-              <label class="form-check-label" for="use-checkdigit" i18n>
+              <label class="form-label form-check-label" for="use-checkdigit" i18n>
                 Use Checkdigit
               </label>
             </div>
diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/hold/hold.component.html b/Open-ILS/src/eg2/src/app/staff/catalog/hold/hold.component.html
index db04e35e1f..116ab0aaeb 100644
--- a/Open-ILS/src/eg2/src/app/staff/catalog/hold/hold.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/catalog/hold/hold.component.html
@@ -53,7 +53,7 @@
               (change)="holdForChanged()"
               id="hold-for-patron"
               name="holdFor" value="patron" [(ngModel)]="holdFor"/>
-            <label class="form-check-label" for="hold-for-patron" i18n>
+            <label class="form-label form-check-label" for="hold-for-patron" i18n>
               Place hold for patron by barcode:
             </label>
           </div>
@@ -79,7 +79,7 @@
               (change)="holdForChanged()"
               id="hold-for-staff"
               name="holdFor" value="staff" [(ngModel)]="holdFor"/>
-            <label class="form-check-label" i18n for="hold-for-staff">
+            <label class="form-label form-check-label" i18n for="hold-for-staff">
               Place hold for this staff account:
             </label>
           </div>
@@ -88,7 +88,7 @@
       </div>
       <div class="row mt-2">
         <div class="col-lg-6">
-          <label i18n>Pickup Location: </label>
+          <label class="form-label" i18n>Pickup Location: </label>
         </div>
         <div class="col-lg-6">
           <eg-org-select (onChange)="pickupLib = $event ? $event.id() : null"
@@ -100,7 +100,7 @@
           <div class="form-check">
             <input class="form-check-input" type="checkbox" id="suspend"
               name="suspend" [(ngModel)]="suspend"/>
-            <label class="form-check-label" for="suspend" i18n>Suspend Hold</label>
+            <label class="form-label form-check-label" for="suspend" i18n>Suspend Hold</label>
           </div>
         </div>
         <div class="col-lg-6">
@@ -115,7 +115,7 @@
       </div>
       <div class="row mt-2" *ngIf="multiHoldsActive">
         <div class="col-lg-6">
-          <label for='multi-hold-count' i18n>Number of copies:</label>
+          <label class="form-label" for='multi-hold-count' i18n>Number of copies:</label>
         </div>
         <div class="col-lg-6">
           <select class="form-control" name="multi-hold-count"
@@ -139,13 +139,13 @@
                 <input class="form-check-input" type="checkbox" name="notifyEmail"
                   id="notifyEmail"
                   [disabled]="!user || !user.email()" [(ngModel)]="notifyEmail"/>
-                <label class="form-check-label" for="notifyEmail" i18n>Notify by Email</label>
+                <label class="form-label form-check-label" for="notifyEmail" i18n>Notify by Email</label>
               </div>
             </div>
             <div class="flex-1">
               <div class="input-group">
                 <div class="input-group-text">
-                  <label for="userEmail" class="input-group-text" i18n>Email Address</label>
+                  <label for="userEmail" class="form-label input-group-text" i18n>Email Address</label>
                 </div>
                 <input type="text" class="form-control" name="userEmail"
                   id="userEmail"
@@ -159,13 +159,13 @@
                 <input class="form-check-input" type="checkbox"
                   id="notifyPhone"
                   name="notifyPhone" [(ngModel)]="notifyPhone"/>
-                <label class="form-check-label" for="notifyPhone" i18n>Notify by Phone</label>
+                <label class="form-label form-check-label" for="notifyPhone" i18n>Notify by Phone</label>
               </div>
             </div>
             <div class="flex-1">
               <div class="input-group">
                 <div class="input-group-text">
-                  <label for="phoneValue" class="input-group-text" i18n>Phone Number</label>
+                  <label for="phoneValue"  class="form-label input-group-text" i18n>Phone Number</label>
                 </div>
                 <input type="text" class="form-control" [disabled]="!notifyPhone"
                   name="phoneValue" id="phoneValue" [(ngModel)]="phoneValue"/>
@@ -177,13 +177,13 @@
               <div class="form-check">
                 <input class="form-check-input" type="checkbox" id="notifySms"
                   name="notifySms" [(ngModel)]="notifySms"/>
-                <label class="form-check-label" for="notifySms" i18n>Notify by SMS</label>
+                <label class="form-label form-check-label" for="notifySms" i18n>Notify by SMS</label>
               </div>
             </div>
             <div class="flex-1">
               <div class="input-group">
                 <div class="input-group-text">
-                  <label for="smsValue" class="input-group-text" i18n>SMS Number</label>
+                  <label for="smsValue"  class="form-label input-group-text" i18n>SMS Number</label>
                 </div>
                 <input type="text" class="form-control" [disabled]="!notifySms"
                   id="smsValue" name="smsValue" [(ngModel)]="smsValue"
@@ -193,7 +193,7 @@
           </li>
           <li *ngIf="smsEnabled" class="list-group-item d-flex">
             <div class="flex-1">
-              <label for="smsCarriers" i18n>SMS Carrier</label>
+              <label class="form-label" for="smsCarriers" i18n>SMS Carrier</label>
             </div>
             <div class="flex-1">
               <eg-combobox [disabled]="!notifySms" #smsCbox
@@ -370,7 +370,7 @@
           is superseded by the striped-even styling of the container -->
       <div class="row" *ngIf="hasMetaFilters(ctx)"
         style="background-color:inherit; border:none">
-        <div class="col-lg-1"><label i18n>Formats: </label></div>
+        <div class="col-lg-1"><label class="form-label" i18n>Formats: </label></div>
         <div class="col-lg-11 d-flex">
           <ng-container
             *ngFor="let ccvm of ctx.holdMeta.metarecord_filters.formats">
@@ -391,7 +391,7 @@
       </div>
       <div class="row" *ngIf="hasMetaFilters(ctx)"
         style="background-color:inherit; border:none">
-        <div class="col-lg-1"><label i18n>Languages: </label></div>
+        <div class="col-lg-1"><label class="form-label" i18n>Languages: </label></div>
         <div class="col-lg-11 d-flex">
           <ng-container
             *ngFor="let ccvm of ctx.holdMeta.metarecord_filters.langs">
diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/prefs.component.html b/Open-ILS/src/eg2/src/app/staff/catalog/prefs.component.html
index 58e2313e8d..d608871a83 100644
--- a/Open-ILS/src/eg2/src/app/staff/catalog/prefs.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/catalog/prefs.component.html
@@ -7,7 +7,7 @@
 
 <div class="row border-bottom border-secondary p-2 m-2">
   <div class="col-lg-2 offset-lg-1">
-    <label for="default-lib-selector" class="fw-bold" i18n>
+    <label for="default-lib-selector"  class="form-label fw-bold" i18n>
       Default Search Library
     </label>
   </div>
@@ -28,7 +28,7 @@
 
 <div class="row border-bottom border-secondary p-2 m-2">
   <div class="col-lg-2 offset-lg-1">
-    <label for="pref-lib-selector" class="fw-bold" i18n>
+    <label for="pref-lib-selector"  class="form-label fw-bold" i18n>
       Preferred Library
     </label>
   </div>
@@ -48,7 +48,7 @@
 
 <div class="row border-bottom border-secondary p-2 m-2">
   <div class="col-lg-2 offset-lg-1">
-    <label for="def-pane-selector" class="fw-bold" i18n>
+    <label for="def-pane-selector"  class="form-label fw-bold" i18n>
       Default Search Pane
     </label>
   </div>
@@ -69,7 +69,7 @@
 
 <div class="row border-bottom border-secondary p-2 m-2">
   <div class="col-lg-2 offset-lg-1">
-    <label for="pref-lib-selector" class="fw-bold" i18n>
+    <label for="pref-lib-selector" class="form-label fw-bold" i18n>
       Search Results Per Page
     </label>
   </div>
@@ -85,7 +85,7 @@
 
 <div class="row border-bottom border-secondary p-2 m-2">
   <div class="col-lg-2 offset-lg-1">
-    <label for="pref-lib-selector" class="fw-bold" i18n>
+    <label for="pref-lib-selector" class="form-label fw-bold" i18n>
       Exclude Electronic Resources
     </label>
   </div>
diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/record/part-merge-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/catalog/record/part-merge-dialog.component.html
index db75789eca..e967ee7182 100644
--- a/Open-ILS/src/eg2/src/app/staff/catalog/record/part-merge-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/catalog/record/part-merge-dialog.component.html
@@ -11,7 +11,7 @@
         <div class="form-check">
           <input class="form-check-input" type="radio" name="lead"
             value="{{part.id()}}" [(ngModel)]="leadPart">
-          <label class="form-check-label">{{part.label()}}</label>
+          <label class="form-label form-check-label">{{part.label()}}</label>
         </div>
       </div>
     </div>
diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/result/record.component.html b/Open-ILS/src/eg2/src/app/staff/catalog/result/record.component.html
index 92470e7fd6..609267a84e 100644
--- a/Open-ILS/src/eg2/src/app/staff/catalog/result/record.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/catalog/result/record.component.html
@@ -6,7 +6,7 @@
            because there's no way to give them col-lg-* columns that
            don't waste a lot of space. -->
       <div class="col-lg-7 d-flex">
-        <label class="checkbox">
+        <label  class="form-label checkbox">
           <span class="fw-bold font-italic">
             {{index + 1 + searchContext.pager.offset}}.
           </span>
diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/result/results.component.html b/Open-ILS/src/eg2/src/app/staff/catalog/result/results.component.html
index 84ce3093dd..6882038133 100644
--- a/Open-ILS/src/eg2/src/app/staff/catalog/result/results.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/catalog/result/results.component.html
@@ -45,7 +45,7 @@
       <h3 i18n>Basket View</h3>
     </div>
     <div class="col-lg-3">
-      <label class="checkbox" *ngIf="!searchContext.basket">
+      <label class="form-label checkbox" *ngIf="!searchContext.basket">
         <input type='checkbox' [(ngModel)]="allRecsSelected" 
             (change)="toggleAllRecsSelected()"/>
         <span class="ps-1" i18n>Select {{searchContext.pager.rowNumber(0)}} - 
diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/search-form.component.html b/Open-ILS/src/eg2/src/app/staff/catalog/search-form.component.html
index 506fde839d..83c68718ab 100644
--- a/Open-ILS/src/eg2/src/app/staff/catalog/search-form.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/catalog/search-form.component.html
@@ -285,7 +285,7 @@
         <a i18n ngbNavLink role="tab">Numeric Search</a>
         <ng-template ngbNavContent>
           <div class="row mt-4 gx-3 row-cols-auto">
-            <label class="col-form-label" for="ident-type" i18n>Query Type</label>
+            <label class="form-label col-form-label" for="ident-type" i18n>Query Type</label>
             <div class="col">
               <select class="form-control" name="ident-type"
                 [(ngModel)]="context.identSearch.queryType">
@@ -297,7 +297,7 @@
                 <option i18n value="item_barcode">Item Barcode</option>
               </select>
             </div>
-            <label for="ident-value" class="col-form-label" i18n>Value</label>
+            <label for="ident-value" class="form-label col-form-label" i18n>Value</label>
             <div class="col">
               <input name="ident-value" id='ident-query-input' 
                 type="text" class="form-control"
@@ -314,21 +314,21 @@
           <div class="mt-4">
               <div class="row mt-2 gx-3 row-cols-auto" 
                 *ngFor="let q of context.marcSearch.values; let idx = index; trackBy:trackByIdx">
-                <label class="col-form-label" for="marc-tag-{{idx}}" i18n>Tag</label>
+                <label class="form-label col-form-label" for="marc-tag-{{idx}}" i18n>Tag</label>
                 <div class="col">
                   <input class="form-control ms-2" size="3" type="text" 
                     name="marc-tag-{{idx}}" id="{{ idx === 0 ? 'first-marc-tag' : '' }}"
                     [(ngModel)]="context.marcSearch.tags[idx]"
                     (keyup.enter)="searchByForm()"/>
                 </div>
-                <label class="col-form-label" for="marc-subfield-{{idx}}" i18n>Subfield</label>
+                <label class="form-label col-form-label" for="marc-subfield-{{idx}}" i18n>Subfield</label>
                 <div class="col">
                   <input class="form-control ms-2" size="1" type="text" 
                     name="marc-subfield-{{idx}}"
                     [(ngModel)]="context.marcSearch.subfields[idx]"
                     (keyup.enter)="searchByForm()"/>
                 </div>
-                <label class="col-form-label"  for="marc-value-{{idx}}" i18n>Value</label>
+                <label class="form-label col-form-label"  for="marc-value-{{idx}}" i18n>Value</label>
                 <div class="col">
                   <input class="form-control ms-2" type="text" name="marc-value-{{idx}}"
                     [(ngModel)]="context.marcSearch.values[idx]" 
@@ -363,7 +363,7 @@
         <a i18n ngbNavLink role="tab">Browse</a>
         <ng-template ngbNavContent>
           <div class="row gx-3 mt-4 row-cols-auto">
-            <label class="col-form-label" for="field-class" i18n>Browse for</label>
+            <label class="form-label col-form-label" for="field-class" i18n>Browse for</label>
             <div class="col">
               <select class="form-control ms-2" name="field-class"
                 [(ngModel)]="context.browseSearch.fieldClass">
@@ -373,7 +373,7 @@
                 <option i18n value='series'>Series</option>
               </select>
             </div>
-            <label class="col-form-label" for="query"> starting with </label>
+            <label class="form-label col-form-label" for="query"> starting with </label>
             <div class="col">
               <input type="text" class="form-control" 
                 id='browse-term-input' name="query"
@@ -388,7 +388,7 @@
         <a i18n ngbNavLink role="tab">Shelf Browse</a>
         <ng-template ngbNavContent>
           <div class="row gx-3 mt-4 row-cols-auto">
-            <label class="col-form-label" for="cnbrowse-term-input" i18n>
+            <label class="form-label col-form-label" for="cnbrowse-term-input" i18n>
               Browse Call Numbers starting with 
             </label>
             <div class="col">
diff --git a/Open-ILS/src/eg2/src/app/staff/circ/checkin/checkin.component.html b/Open-ILS/src/eg2/src/app/staff/circ/checkin/checkin.component.html
index 9651e8e74e..2232fa1e5b 100644
--- a/Open-ILS/src/eg2/src/app/staff/circ/checkin/checkin.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/circ/checkin/checkin.component.html
@@ -102,7 +102,7 @@
       <div class="form-check form-check-inline">
         <input class="form-check-input" type="checkbox" 
           id="use-date-cbox" [(ngModel)]="backdateUntilLogout"/>
-        <label class="form-check-label" 
+        <label class="form-label form-check-label" 
           for="use-date-cbox" i18n>Use effective date until logout</label>
       </div>
     </div>
@@ -290,7 +290,7 @@
       <div class="form-check form-check-inline">
         <input class="form-check-input" type="checkbox" 
           id="trim-list-cbox" [(ngModel)]="trimList"/>
-        <label class="form-check-label" 
+        <label class="form-label form-check-label" 
           for="trim-list-cbox" i18n>Trim List (20)</label>
       </div>
     </div>
@@ -299,7 +299,7 @@
         <input class="form-check-input" type="checkbox" 
           (ngModelChange)="toggleStrictBarcode($event)"
           id="strict-barcode-cbox" [(ngModel)]="strictBarcode"/>
-        <label class="form-check-label" 
+        <label class="form-label form-check-label" 
           for="strict-barcode-cbox" i18n>Strict Barcode</label>
       </div>
     </div>
diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/bills.component.html b/Open-ILS/src/eg2/src/app/staff/circ/patron/bills.component.html
index 5f46fab4d1..7193910ab6 100644
--- a/Open-ILS/src/eg2/src/app/staff/circ/patron/bills.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/bills.component.html
@@ -118,7 +118,7 @@
 <div class="row bg-light border border-dark rounded pt-2 pb-2 mt-2 mb-4 payment-form">
   <div class="col-lg-12 d-flex form-inline form-validated">
     <div class="flex-1"></div>
-    <div class="ms-2"><label for="payment-type" i18n>Payment Type:</label></div>
+    <div class="ms-2"><label class="form-label" for="payment-type" i18n>Payment Type:</label></div>
     <div class="ms-1">
       <select [(ngModel)]="paymentType" class="form-control" id="payment-type">
         <option value="cash_payment" i18n>Cash</option>
@@ -131,12 +131,12 @@
         <option value="goods_payment" i18n>Goods</option>
       </select>
     </div>
-    <div class="ms-2"><label for="check-number" i18n>Check Number:</label></div>
+    <div class="ms-2"><label class="form-label" for="check-number" i18n>Check Number:</label></div>
     <div class="ms-1">
       <input type="text" class="form-control" [(ngModel)]="checkNumber"
         id="check-number" [disabled]="paymentType !== 'check_payment'"/>
     </div>
-    <div class="ms-2"><label for="pay-amount" i18n>Payment Received:</label></div>
+    <div class="ms-2"><label class="form-label" for="pay-amount" i18n>Payment Received:</label></div>
     <div class="ms-1">
       <input type="number" class="form-control" [(ngModel)]="paymentAmount"
         (ngModelChange)="updatePendingColumn()" id="pay-amount" [min]="0"/>
@@ -145,7 +145,7 @@
       <input class="form-check-input" type="checkbox"
         (ngModelChange)="applySetting('eg.circ.bills.annotatepayment', $event)"
         id="annotate" [(ngModel)]="annotatePayment"/>
-      <label class="form-check-label" for="annotate" i18n>Annotate</label>
+      <label class="form-label form-check-label" for="annotate" i18n>Annotate</label>
     </div>
     <div class="ms-2">
       <button class="btn btn-outline-dark" (click)="applyPayment()"
@@ -333,7 +333,7 @@
       <div class="form-check form-check-inline">
       <input class="form-check-input" type="checkbox" id="patron-credit-cbox"
         [(ngModel)]="convertChangeToCredit"/>
-      <label class="form-check-label" for="patron-credit-cbox" i18n>
+      <label class="form-label form-check-label" for="patron-credit-cbox" i18n>
         Convert Change To Patron Credit
       </label>
       </div>
@@ -343,7 +343,7 @@
       <input class="form-check-input" type="checkbox" id="receipt-on-payment-cbox"
         (ngModelChange)="applySetting('circ.bills.receiptonpay', $event)"
         [(ngModel)]="receiptOnPayment"/>
-      <label class="form-check-label" for="receipt-on-payment-cbox" i18n>
+      <label class="form-label form-check-label" for="receipt-on-payment-cbox" i18n>
         Receipt On Payment
       </label>
       </div>
diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/checkout.component.html b/Open-ILS/src/eg2/src/app/staff/circ/patron/checkout.component.html
index de86ac5a2c..3fbb412113 100644
--- a/Open-ILS/src/eg2/src/app/staff/circ/patron/checkout.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/checkout.component.html
@@ -154,7 +154,7 @@
         <input class="form-check-input" type="checkbox" 
           (ngModelChange)="toggleStrictBarcode($event)"
           id="strict-barcode-cbox" [(ngModel)]="strictBarcode"/>
-        <label class="form-check-label" 
+        <label class="form-label form-check-label" 
           for="strict-barcode-cbox" i18n>Strict Barcode</label>
       </div>
     </div>
diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/edit.component.html b/Open-ILS/src/eg2/src/app/staff/circ/patron/edit.component.html
index 780555c3b0..f53c638af5 100644
--- a/Open-ILS/src/eg2/src/app/staff/circ/patron/edit.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/edit.component.html
@@ -50,7 +50,7 @@
 <!-- IDL-generated field labels.  Override with args.overrideLabel -->
 <ng-template #fieldLabel let-args="args">
   <div class="col-lg-3 field-label">
-    <label for="{{getClass(args.cls)}}-{{args.field}}-input">
+    <label class="form-label" for="{{getClass(args.cls)}}-{{args.field}}-input">
       {{getFieldLabel(getClass(args.cls), args.field, args.overrideLabel)}}
     </label>
     <eg-help-popover *ngIf="getFieldDoc(args.cls, args.field)"
@@ -62,7 +62,7 @@
 
 <ng-template #userSettingLabel let-args="args">
   <div class="col-lg-3 field-label">
-    <label for="cust-{{args.settingName}}-input">
+    <label class="form-label" for="cust-{{args.settingName}}-input">
       {{userSettingTypes[args.settingName].label()}}
     </label>
   </div>
@@ -534,20 +534,20 @@
         <input class="form-check-input" type="checkbox" name="hold-notify-phone" 
           id="hold-notify-phone" [(ngModel)]="holdNotifyTypes.phone"
           (ngModelChange)="emitSaveState()"/>
-        <label class="form-check-label" for="hold-notify-phone" i18n>Phone</label>
+        <label class="form-label form-check-label" for="hold-notify-phone" i18n>Phone</label>
       </div>
       <div class="form-check form-check-inline me-2">
         <input class="form-check-input" type="checkbox" name="hold-notify-email" 
           id="hold-notify-email" [(ngModel)]="holdNotifyTypes.email"
           (ngModelChange)="emitSaveState()"/>
-        <label class="form-check-label" for="hold-notify-email" i18n>Email</label>
+        <label class="form-label form-check-label" for="hold-notify-email" i18n>Email</label>
       </div>
       <div class="form-check form-check-inline me-2" 
         *ngIf="context.settingsCache['sms.enable']">
         <input class="form-check-input" type="checkbox" name="hold-notify-sms" 
           id="hold-notify-sms" [(ngModel)]="holdNotifyTypes.sms"
           (ngModelChange)="emitSaveState()"/>
-        <label class="form-check-label" for="hold-notify-sms" i18n>SMS</label>
+        <label class="form-label form-check-label" for="hold-notify-sms" i18n>SMS</label>
       </div>
     </div>
   </div>
@@ -616,7 +616,7 @@
               id="waiver-holds-{{waiver.id()}}" [ngModel]="waiver.place_holds() === 't'"
               (ngModelChange)="fieldValueChange('waiver_entries', index, 'place_holds', $event)"
               (change)="afterFieldChange('waiver_entries', index, 'place_holds')"/>
-            <label class="form-check-label"
+            <label class="form-label form-check-label"
               for="waiver-holds-{{waiver.id()}}" i18n>Place Holds?</label>
           </div>
           <div class="form-inline">
@@ -625,7 +625,7 @@
               id="waiver-history-{{waiver.id()}}" [ngModel]="waiver.view_history() === 't'"
               (ngModelChange)="fieldValueChange('waiver_entries', index, 'view_history', $event)"
               (change)="afterFieldChange('waiver_entries', index, 'view_history')"/>
-            <label class="form-check-label"
+            <label class="form-label form-check-label"
               for="waiver-history-{{waiver.id()}}" i18n>View Borrowing History?</label>
           </div>
         </div>
@@ -636,7 +636,7 @@
               id="waiver-pickup-{{waiver.id()}}" [ngModel]="waiver.pickup_holds() === 't'"
               (ngModelChange)="fieldValueChange('waiver_entries', index, 'pickup_hold', $event)"
               (change)="afterFieldChange('waiver_entries', index, 'pickup_hold')"/>
-            <label class="form-check-label"
+            <label class="form-label form-check-label"
               for="waiver-pickup-{{waiver.id()}}" i18n>Pick Up Holds?</label>
           </div>
           <div class="form-inline">
@@ -645,7 +645,7 @@
               id="waiver-checkout-{{waiver.id()}}" [ngModel]="waiver.checkout_items() === 't'"
               (ngModelChange)="fieldValueChange('waiver_entries', index, 'checkout_items', $event)"
               (change)="afterFieldChange('waiver_entries', index, 'checkout_items')"/>
-            <label class="form-check-label"
+            <label class="form-label form-check-label"
               for="waiver-checkout-{{waiver.id()}}" i18n>Check Out Items?</label>
           </div>
         </div>
@@ -683,7 +683,7 @@
                 name="addr-{{addr.id()}}-mailing" id="addr-{{addr.id()}}-mailing" 
                 [ngModel]="patron.mailing_address() && addr.id() === patron.mailing_address().id()"
                 (ngModelChange)="setAddrType('mailing', addr, $event)"/>
-              <label class="form-check-label" 
+              <label class="form-label form-check-label" 
                 for="addr-{{addr.id()}}-mailing" i18n>Mailing</label>
             </div>
             <div class="form-check form-check-inline me-2">
@@ -691,7 +691,7 @@
                 name="addr-{{addr.id()}}-billing" id="addr-{{addr.id()}}-billing" 
                 [ngModel]="patron.billing_address() && addr.id() === patron.billing_address().id()"
                 (ngModelChange)="setAddrType('billing', addr, $event)"/>
-              <label class="form-check-label" 
+              <label class="form-label form-check-label" 
                 for="addr-{{addr.id()}}-billing" i18n>Physical</label>
             </div>
             <button class="btn btn-danger" (click)="deleteAddr(addr)" i18n>Delete</button>
@@ -740,7 +740,7 @@
 
     <div class="row pt-1 pb-1 mt-1" *ngFor="let stat of statCats">
      <div class="col-lg-3 field-label">
-      <label for="asc-{{stat.cat.id()}}-input">{{stat.cat.name()}}</label>
+      <label class="form-label" for="asc-{{stat.cat.id()}}-input">{{stat.cat.name()}}</label>
      </div>
      <div class="col-lg-3">
       <eg-combobox
@@ -766,7 +766,7 @@
       <div class="card-body">
         <div class="row pt-1 pb-1 mt-1" *ngFor="let question of survey.questions()">
           <div class="col-lg-3 field-label">
-            <label for="asvq-{{question.id()}}-input">{{question.question()}}</label>
+            <label class="form-label" for="asvq-{{question.id()}}-input">{{question.question()}}</label>
           </div>
           <div class="col-lg-3">
             <eg-combobox
diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/hold-notify-update.component.html b/Open-ILS/src/eg2/src/app/staff/circ/patron/hold-notify-update.component.html
index 748b39d5b4..300f33f402 100644
--- a/Open-ILS/src/eg2/src/app/staff/circ/patron/hold-notify-update.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/hold-notify-update.component.html
@@ -35,7 +35,7 @@
         <div class="form-check form-check-inline">
           <input class="form-check-input" type="checkbox" 
             id="{{mod.field}}-checkbox" [(ngModel)]="selected[mod.field]"/>
-          <label class="form-check-label" for="{{mod.field}}-checkbox">
+          <label class="form-label form-check-label" for="{{mod.field}}-checkbox">
             <ng-container *ngIf="isCarrierChange(mod)" i18n>
               A carrier other than "{{carrierName(mod.oldValue)}}" is
               currently used in {{mod.holds.length}} hold(s).  Update to
diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/messages.component.html b/Open-ILS/src/eg2/src/app/staff/circ/patron/messages.component.html
index 41a178df3f..139c786510 100644
--- a/Open-ILS/src/eg2/src/app/staff/circ/patron/messages.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/messages.component.html
@@ -32,12 +32,12 @@
     <h3 i18n>Archived Penalties / Messages</h3>
   </div>
   <div class="col-lg-4 form-inline">
-    <label class="me-2" i18n>Start Date:</label>
+    <label class="form-label me-2" i18n>Start Date:</label>
     <eg-date-select [initialIso]="startDateYmd"
       (onChangeAsIso)="dateChange($event, true)"></eg-date-select>
   </div>
   <div class="col-lg-4 form-inline">
-    <label class="me-2" i18n>End Date:</label>
+    <label class="form-label me-2" i18n>End Date:</label>
     <eg-date-select [initialIso]="endDateYmd" 
       (onChangeAsIso)="dateChange($event, false)"></eg-date-select>
   </div>
diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/perms.component.html b/Open-ILS/src/eg2/src/app/staff/circ/patron/perms.component.html
index e11ecf2107..b967327349 100644
--- a/Open-ILS/src/eg2/src/app/staff/circ/patron/perms.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/perms.component.html
@@ -19,7 +19,7 @@
                 [ngModel]="userHasWorkOu(org.id())"
                 (ngModelChange)="userWorkOuChange(org.id(), $event)"
                 [disabled]="!canAssignWorkOrgs[org.id()]"/>
-              <label class="form-check-label" for="work-org-{{org.id()}}" i18n>
+              <label class="form-label form-check-label" for="work-org-{{org.id()}}" i18n>
                 {{org.shortname()}} ({{org.name()}})
               </label>
             </div>
diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/test-password.component.html b/Open-ILS/src/eg2/src/app/staff/circ/patron/test-password.component.html
index f703e30420..e8afb52909 100644
--- a/Open-ILS/src/eg2/src/app/staff/circ/patron/test-password.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/test-password.component.html
@@ -8,7 +8,7 @@
 
 
 <div class="row gx-3 row-cols-auto mt-2">
-  <label class="col-form-label col-1" for="username-input" i18n>Username</label>
+  <label class="form-label col-form-label col-1" for="username-input" i18n>Username</label>
   <div class="col-3">
     <input type="text" class="form-control" id="username-input" 
       [disabled]="patronId" [(ngModel)]="username"/>
@@ -16,7 +16,7 @@
 </div>
 
 <div class="row gx-3 row-cols-auto mt-2">
-  <label class="col-form-label col-1" for="barcode-input" i18n>Barcode</label>
+  <label class="form-label col-form-label col-1" for="barcode-input" i18n>Barcode</label>
   <div class="col-3">
     <input type="text" class="form-control" id="barcode-input" 
       [disabled]="patronId" [(ngModel)]="barcode"/>
@@ -24,7 +24,7 @@
 </div>
 
 <div class="row gx-3 row-cols-auto mt-2">
-  <label class="col-form-label col-1" for="password-input" i18n>Password</label>
+  <label class="form-label col-form-label col-1" for="password-input" i18n>Password</label>
   <div class="col-3">
     <input type="password" class="form-control" id="password-input" 
       autocomplete="new-password" (keyup.enter)="verify()" [(ngModel)]="password"/>
diff --git a/Open-ILS/src/eg2/src/app/staff/circ/renew/renew.component.html b/Open-ILS/src/eg2/src/app/staff/circ/renew/renew.component.html
index c2707be0c6..b1d325e90c 100644
--- a/Open-ILS/src/eg2/src/app/staff/circ/renew/renew.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/circ/renew/renew.component.html
@@ -32,7 +32,7 @@
         <div class="form-check form-check-inline">
           <input class="form-check-input" type="checkbox" id="use-date-cbox" 
             [(ngModel)]="useDueDate"/>
-          <label class="form-check-label" 
+          <label class="form-label form-check-label" 
             for="use-date-cbox" i18n>Specific Due Date</label>
         </div>
         <eg-date-select [initialIso]="dueDate" 
@@ -166,7 +166,7 @@
       <div class="form-check form-check-inline">
         <input class="form-check-input" type="checkbox" 
           id="trim-list-cbox" [(ngModel)]="trimList"/>
-        <label class="form-check-label" 
+        <label class="form-label form-check-label" 
           for="trim-list-cbox" i18n>Trim List (20)</label>
       </div>
     </div>
@@ -175,7 +175,7 @@
         <input class="form-check-input" type="checkbox" 
           (ngModelChange)="toggleStrictBarcode($event)"
           id="strict-barcode-cbox" [(ngModel)]="strictBarcode"/>
-        <label class="form-check-label" 
+        <label class="form-label form-check-label" 
           for="strict-barcode-cbox" i18n>Strict Barcode</label>
       </div>
     </div>
diff --git a/Open-ILS/src/eg2/src/app/staff/login.component.html b/Open-ILS/src/eg2/src/app/staff/login.component.html
index 12d857da99..939fe52344 100644
--- a/Open-ILS/src/eg2/src/app/staff/login.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/login.component.html
@@ -6,7 +6,7 @@
       <form (ngSubmit)="handleSubmit()" #loginForm="ngForm" class="form-validated">
 
         <div class="row row-cols-auto">
-          <label class="col-form-label fw-bold col-4 text-end" for="username" i18n>Username</label>
+          <label class="form-label col-form-label fw-bold col-4 text-end" for="username" i18n>Username</label>
           <div class="col-8">
             <input 
               type="text" 
@@ -22,7 +22,7 @@
         </div>
 
         <div class="row row-cols-auto mt-3">
-          <label class="col-form-label fw-bold col-4 text-end" for="password" i18n>Password</label>
+          <label class="form-label col-form-label fw-bold col-4 text-end" for="password" i18n>Password</label>
           <div class="col-8">
             <input 
               type="password" 
@@ -38,7 +38,7 @@
         </div>
 
         <div class="row row-cols-auto mt-3" *ngIf="workstations && workstations.length">
-          <label class="col-form-label col-4 text-end fw-bold" for="workstation" i18n>Workstation</label>
+          <label class="form-label col-form-label col-4 text-end fw-bold" for="workstation" i18n>Workstation</label>
           <div class="col-8">
             <select 
               class="form-control" 
diff --git a/Open-ILS/src/eg2/src/app/staff/reporter/simple/sr-editor.component.html b/Open-ILS/src/eg2/src/app/staff/reporter/simple/sr-editor.component.html
index 3f06ec079b..b39f8170ea 100644
--- a/Open-ILS/src/eg2/src/app/staff/reporter/simple/sr-editor.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/reporter/simple/sr-editor.component.html
@@ -22,7 +22,7 @@
 
 <div class="row" id="sr-basic-info">
   <div class="col-sm-2">
-    <label for="report-type" i18n>Report Type:</label>
+    <label class="form-label" for="report-type" i18n>Report Type:</label>
   </div>
   <div class="col-lg-3">
     <select class="form-control" id="report-type" [ngModelOptions]="{standalone: true}" 
@@ -36,7 +36,7 @@
     </select>
   </div>
   <div class="col-sm-2">
-    <label for="report-name" i18n>Report Name</label>
+    <label class="form-label" for="report-name" i18n>Report Name</label>
   </div>
   <div class="col-lg-3">
     <input id="report-name" class="form-control sr-name-{{ (name !== '' && name !== null) ? 'not' : '' }}empty" [(ngModel)]="name" (ngModelChange)="dirty()" />
diff --git a/Open-ILS/src/eg2/src/app/staff/reporter/simple/sr-field.component.html b/Open-ILS/src/eg2/src/app/staff/reporter/simple/sr-field.component.html
index 0510584eb1..d81de73978 100644
--- a/Open-ILS/src/eg2/src/app/staff/reporter/simple/sr-field.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/reporter/simple/sr-field.component.html
@@ -19,8 +19,8 @@
     </div>
     <div *ngIf="!withAlias" class="sr-field-name col-md-auto">
       <span *ngIf="withTransforms || withOperators || withValueInput" class="sr-field-explainer"><br /></span>
-      <label *ngIf="withSelect" (click)="selectAction()" class="sr-field-label" for="chk{{field.name}}">{{field.label}}</label>
-      <label *ngIf="!withSelect" class="sr-field-label">{{field.label}}</label>
+      <label *ngIf="withSelect" (click)="selectAction()"  class="form-label sr-field-label" for="chk{{field.name}}">{{field.label}}</label>
+      <label *ngIf="!withSelect"  class="form-label sr-field-label">{{field.label}}</label>
     </div>
 
     <div *ngIf="withTransforms || withOperators" class="sr-field-xform col-md-3">
diff --git a/Open-ILS/src/eg2/src/app/staff/reporter/simple/sr-output-options.component.html b/Open-ILS/src/eg2/src/app/staff/reporter/simple/sr-output-options.component.html
index f050334244..3d5e37f801 100644
--- a/Open-ILS/src/eg2/src/app/staff/reporter/simple/sr-output-options.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/reporter/simple/sr-output-options.component.html
@@ -4,23 +4,23 @@
         <div class="col-sm-10">
           <div class="form-check">
             <input class="form-check-input" type="checkbox" id="srExcelOutput" name="srExcelOutput" [(ngModel)]="templ.excelOutput">
-            <label class="form-check-label" for="srExcelOutput" i18n>Excel Output</label>
+            <label class="form-label form-check-label" for="srExcelOutput" i18n>Excel Output</label>
           </div>
           <div class="form-check">
             <input class="form-check-input" type="checkbox" id="srCsvOutput" name="srCsvOutput" [(ngModel)]="templ.csvOutput">
-            <label class="form-check-label" for="srCsvOutput" i18n>CSV Output</label>
+            <label class="form-label form-check-label" for="srCsvOutput" i18n>CSV Output</label>
           </div>
           <div class="form-check">
             <input class="form-check-input" type="checkbox" id="srHtmlOutput" name="srHtmlOutput" [(ngModel)]="templ.htmlOutput">
-            <label class="form-check-label" for="srHtmlOutput" i18n>HTML Output</label>
+            <label class="form-label form-check-label" for="srHtmlOutput" i18n>HTML Output</label>
           </div>
           <div class="form-check">
             <input class="form-check-input" type="checkbox" id="srBarCharts" name="srBarCharts" [(ngModel)]="templ.barCharts">
-            <label class="form-check-label" for="srBarCharts" i18n>Bar Chart</label>
+            <label class="form-label form-check-label" for="srBarCharts" i18n>Bar Chart</label>
           </div>
           <div class="form-check">
             <input class="form-check-input" type="checkbox" id="srLineCharts" name="srLineCharts" [(ngModel)]="templ.lineCharts">
-            <label class="form-check-label" for="srLineCharts" i18n>Line Chart</label>
+            <label class="form-label form-check-label" for="srLineCharts" i18n>Line Chart</label>
           </div>
         </div>
   </div>
@@ -29,9 +29,9 @@
     <div class="col-sm-10 form-inline">
       <div class="form-check me-sm-2">
         <input class="form-check-input" type="checkbox" id="srRecurring" name="srRecurring" [(ngModel)]="templ.recurring">
-        <label class="form-check-label" for="srRecurring" i18n>Recurring Report?</label>
+        <label class="form-label form-check-label" for="srRecurring" i18n>Recurring Report?</label>
       </div>
-      <label *ngIf="templ.recurring" class="me-sm-2" for="srRecurrenceInterval">Recurrence Interval</label>
+      <label *ngIf="templ.recurring" class="form-label me-sm-2" for="srRecurrenceInterval">Recurrence Interval</label>
       <eg-interval-input *ngIf="templ.recurring" [(ngModel)]="templ.recurrence" id="srRecurrenceInterval" name="srRecurrenceInterval">
       </eg-interval-input>
     </div>
@@ -41,11 +41,11 @@
     <div class="col-sm-10 ">
       <div class="form-check form-check-inline">
         <input class="form-check-input" type="radio" id="srRunNow" name="srRun" value="now" [(ngModel)]="templ.runNow">
-        <label class="form-check-label" for="srRunNow" i18n>Run Report Now</label>
+        <label class="form-label form-check-label" for="srRunNow" i18n>Run Report Now</label>
       </div>
       <div class="form-check form-check-inline">
         <input class="form-check-input" type="radio" id="srScheduleLater" name="srRun" value="later" (change)="defaultTime()" [(ngModel)]="templ.runNow">
-        <label class="form-check-label" for="srScheduleLater" i18n>Schedule Report For Later</label>
+        <label class="form-label form-check-label" for="srScheduleLater" i18n>Schedule Report For Later</label>
       </div>
       <div class="col-sm-3">
         <eg-datetime-select *ngIf="templ.runNow === 'later'" [(ngModel)]="templ.runTime" name="srRunTime"></eg-datetime-select>
diff --git a/Open-ILS/src/eg2/src/app/staff/sandbox/sandbox.component.html b/Open-ILS/src/eg2/src/app/staff/sandbox/sandbox.component.html
index b5c8dea7da..e9737bc48c 100644
--- a/Open-ILS/src/eg2/src/app/staff/sandbox/sandbox.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/sandbox/sandbox.component.html
@@ -264,7 +264,7 @@
     </form>
   </div>
 </div>
-<label for="date-time-input">
+<label class="form-label" for="date-time-input">
   Set the datetime and timezone library settings, and enter a valid datetime string for an exciting animation surprise:
 </label>
 <input id="date-time-input" type="text" class="date-time-input" ngModel egValidDatetime required>
diff --git a/Open-ILS/src/eg2/src/app/staff/share/barcodes/barcode-select.component.html b/Open-ILS/src/eg2/src/app/staff/share/barcodes/barcode-select.component.html
index 8d10f39f30..639cf495d6 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/barcodes/barcode-select.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/barcodes/barcode-select.component.html
@@ -14,7 +14,7 @@
 			  <input class="form-check-input" type="checkbox" value="" 
           id="barcode-check-{{match.id}}" [(ngModel)]="inputs[match.id]"
           (ngModelChange)="selectionChanged()">
-			  <label class="form-check-label" for="barcode-check-{{match.id}}">
+			  <label class="form-label form-check-label" for="barcode-check-{{match.id}}">
           {{match.barcode}}
 			  </label>
 		  </div>
diff --git a/Open-ILS/src/eg2/src/app/staff/share/billing/credit-card-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/billing/credit-card-dialog.component.html
index 28f3bb4a36..d9f53e1c90 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/billing/credit-card-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/billing/credit-card-dialog.component.html
@@ -10,7 +10,7 @@
       <div class="card-header" i18n>Credit Card Info</div>
       <div class="card-body form-validated">
         <div class="row">
-          <div class="col-lg-4"><label i18n>Process Where</label></div>
+          <div class="col-lg-4"><label class="form-label" i18n>Process Where</label></div>
           <div class="col-lg-8">
             <select class="form-control" [(ngModel)]="args.where_process">
               <option [value]='1' [disabled]="!supportsExternal" i18n>
@@ -24,7 +24,7 @@
         </div>
         <ng-container *ngIf="args.where_process === 1">
           <div class="row mt-2">
-            <div class="col-lg-4"><label i18n>Credit Card Number</label></div>
+            <div class="col-lg-4"><label class="form-label" i18n>Credit Card Number</label></div>
             <div class="col-lg-8">
               <input type="text" class="form-control" 
                 required [(ngModel)]="args.number"/>
@@ -33,21 +33,21 @@
         </ng-container>
         <ng-container *ngIf="args.where_process === 0">
           <div class="row mt-2">
-            <div class="col-lg-4"><label i18n>Expire Month</label></div>
+            <div class="col-lg-4"><label class="form-label" i18n>Expire Month</label></div>
             <div class="col-lg-8">
               <input type="number" class="form-control" [min]="1"
                 required [(ngModel)]="args.expire_month"/>
             </div>
           </div>
           <div class="row mt-2">
-            <div class="col-lg-4"><label i18n>Expire Year</label></div>
+            <div class="col-lg-4"><label class="form-label" i18n>Expire Year</label></div>
             <div class="col-lg-8">
               <input type="number" class="form-control" [min]="thisYear"
                 required [(ngModel)]="args.expire_year"/>
             </div>
           </div>
           <div class="row mt-2">
-            <div class="col-lg-4"><label i18n>Approval Code</label></div>
+            <div class="col-lg-4"><label class="form-label" i18n>Approval Code</label></div>
             <div class="col-lg-8">
               <input type="text" class="form-control" 
                 required [(ngModel)]="args.approval_code"/>
@@ -61,13 +61,13 @@
       <div class="card-header" i18n>Optional Fields</div>
       <div class="card-body form-validated">
         <div class="row">
-          <div class="col-lg-4"><label i18n>Billing Name (first)</label></div>
+          <div class="col-lg-4"><label class="form-label" i18n>Billing Name (first)</label></div>
           <div class="col-lg-8">
             <input type='text' class="form-control" [(ngModel)]="args.billing_first"/>
           </div>
         </div>
         <div class="row mt-2">
-          <div class="col-lg-4"><label i18n>Billing Name (last)</label></div>
+          <div class="col-lg-4"><label class="form-label" i18n>Billing Name (last)</label></div>
           <div class="col-lg-8">
             <input type='text' class="form-control" [(ngModel)]="args.billing_last"/>
           </div>
@@ -75,25 +75,25 @@
 
         <ng-container *ngIf="args.where_process === 0">
           <div class="row mt-2">
-            <div class="col-lg-4"><label i18n>Address</label></div>
+            <div class="col-lg-4"><label class="form-label" i18n>Address</label></div>
             <div class="col-lg-8">
               <input type='text' class="form-control" [(ngModel)]="args.billing_address"/>
             </div>
           </div>
           <div class="row mt-2">
-            <div class="col-lg-4"><label i18n>City, town or village</label></div>
+            <div class="col-lg-4"><label class="form-label" i18n>City, town or village</label></div>
             <div class="col-lg-8">
               <input type='text' class="form-control" [(ngModel)]="args.billing_city"/>
             </div>
           </div>
           <div class="row mt-2">
-            <div class="col-lg-4"><label i18n>State or province</label></div>
+            <div class="col-lg-4"><label class="form-label" i18n>State or province</label></div>
             <div class="col-lg-8">
               <input type='text' class="form-control" [(ngModel)]="args.billing_state"/>
             </div>
           </div>
           <div class="row mt-2">
-            <div class="col-lg-4"><label i18n>ZIP or postal code</label></div>
+            <div class="col-lg-4"><label class="form-label" i18n>ZIP or postal code</label></div>
             <div class="col-lg-8">
               <input type='text' class="form-control" [(ngModel)]="args.billing_zip"/>
             </div>
@@ -101,7 +101,7 @@
         </ng-container>
 
         <div class="row mt-2">
-          <div class="col-lg-4"><label i18n>Note</label></div>
+          <div class="col-lg-4"><label class="form-label" i18n>Note</label></div>
           <div class="col-lg-8">
             <input type='text' class="form-control" [(ngModel)]="args.note"/>
           </div>
diff --git a/Open-ILS/src/eg2/src/app/staff/share/buckets/bucket-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/buckets/bucket-dialog.component.html
index 8eb0db79ab..0f7a34833f 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/buckets/bucket-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/buckets/bucket-dialog.component.html
@@ -21,7 +21,7 @@
         <a role="tab" ngbNavLink i18n>Existing bucket</a>
         <ng-template ngbNavContent>
           <div class="row mt-3">
-            <div class="col-lg-3 fw-bold"><label for="existing-bucket-name">Name of existing bucket</label></div>
+            <div class="col-lg-3 fw-bold"><label class="form-label" for="existing-bucket-name">Name of existing bucket</label></div>
             <div class="col-lg-5">
               <eg-combobox [entries]="formatBucketEntries()"
                 (onChange)="bucketChanged($event)"
diff --git a/Open-ILS/src/eg2/src/app/staff/share/circ/events-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/circ/events-dialog.component.html
index fecb7becb0..0bef663920 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/circ/events-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/circ/events-dialog.component.html
@@ -40,7 +40,7 @@
               <div class="form-check form-check-inline">
                 <input class="form-check-input" type="checkbox" 
                   id="clear-hold-cbox" [(ngModel)]="clearHold"/>
-                <label class="form-check-label" for="clear-hold-cbox" i18n>
+                <label class="form-label form-check-label" for="clear-hold-cbox" i18n>
                   Cancel this hold upon checkout?
                 </label>
               </div>
diff --git a/Open-ILS/src/eg2/src/app/staff/share/circ/open-circ-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/circ/open-circ-dialog.component.html
index 4391cd3655..56ee838e91 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/circ/open-circ-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/circ/open-circ-dialog.component.html
@@ -23,7 +23,7 @@
     <div class="form-check form-check-inline">
       <input class="form-check-input" type="checkbox" id="forgive-fines-cbox" 
         [(ngModel)]="forgiveFines"/>
-      <label class="form-check-label" for="forgive-fines-cbox" i18n>Forgive Fines?</label>
+      <label class="form-label form-check-label" for="forgive-fines-cbox" i18n>Forgive Fines?</label>
     </div>
 
     <div class="flex-1"></div>
diff --git a/Open-ILS/src/eg2/src/app/staff/share/holdings/conjoined-items-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/holdings/conjoined-items-dialog.component.html
index 7133f7ba4d..570bc9f87e 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/holdings/conjoined-items-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/holdings/conjoined-items-dialog.component.html
@@ -16,7 +16,7 @@
     <div class="modal-body">
       <div class="row form-validated">
         <div class="col-lg-4" i18n>
-          <label for="cbox-peer-types">Peer Type:</label>
+          <label class="form-label" for="cbox-peer-types">Peer Type:</label>
         </div>
         <div class="col-lg-8">
           <eg-combobox [entries]="peerTypes" [required]="true"
diff --git a/Open-ILS/src/eg2/src/app/staff/share/holdings/copy-alerts-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/holdings/copy-alerts-dialog.component.html
index 939a3aa701..b9e1cd0757 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/holdings/copy-alerts-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/holdings/copy-alerts-dialog.component.html
@@ -38,7 +38,7 @@
               [ngModel]="newAlert.temp() === 't'" 
               (ngModelChange)="newAlert.temp($event ? 't' : 'f')"
               id="new-alert-temporary">
-            <label class="form-check-label" for="new-alert-temporary" i18n>
+            <label class="form-label form-check-label" for="new-alert-temporary" i18n>
               Temporary?
             </label>
           </div>
@@ -90,7 +90,7 @@
                 [ngModel]="alert.temp() === 't'" 
                 (ngModelChange)="alert.temp($event ? 't' : 'f'); alert.ischanged(true)"
                 id="alert-temporary-{{alert.id()}}">
-              <label class="form-check-label" for="alert-temporary-{{alert.id()}}" i18n>
+              <label class="form-label form-check-label" for="alert-temporary-{{alert.id()}}" i18n>
                 Temporary?
               </label>
             </div>
@@ -99,7 +99,7 @@
                 [ngModel]="alert.ack_time() !== null" 
                 (ngModelChange)="alert.ack_time($event ? 'now' : null); alert.ischanged(true)"
                 id="alert-temporary-{{alert.id()}}">
-              <label class="form-check-label" for="alert-temporary-{{alert.id()}}" i18n>
+              <label class="form-label form-check-label" for="alert-temporary-{{alert.id()}}" i18n>
                 Clear?
               </label>
             </div>
diff --git a/Open-ILS/src/eg2/src/app/staff/share/holdings/copy-notes-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/holdings/copy-notes-dialog.component.html
index d359c0ae2f..d15ee7aa61 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/holdings/copy-notes-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/holdings/copy-notes-dialog.component.html
@@ -52,7 +52,7 @@
             <div class="form-check">
               <input class="form-check-input" type="checkbox" 
                 [(ngModel)]="curNotePublic" id="pub-check">
-              <label class="form-check-label" for="pub-check">Public Note</label>
+              <label class="form-label form-check-label" for="pub-check">Public Note</label>
             </div>
           </div>
         </div>
diff --git a/Open-ILS/src/eg2/src/app/staff/share/holdings/replace-barcode-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/holdings/replace-barcode-dialog.component.html
index b0aa180806..e2229d1e12 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/holdings/replace-barcode-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/holdings/replace-barcode-dialog.component.html
@@ -20,7 +20,7 @@
       </div>
       <div class="row pt-2 form-validated">
         <div class="col-lg-4" i18n>
-          <label for="new-barcode-intput">New Barcode:</label>
+          <label class="form-label" for="new-barcode-intput">New Barcode:</label>
         </div>
         <div class="col-log-8">
           <input type="text" class="form-control" [required]="true"
diff --git a/Open-ILS/src/eg2/src/app/staff/share/holds/cancel-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/holds/cancel-dialog.component.html
index 49ad6d245d..331772fa7c 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/holds/cancel-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/holds/cancel-dialog.component.html
@@ -17,7 +17,7 @@
       </div>
       <div class="row mt-2">
         <div class="col-lg-4">
-          <label for="cancel-reasons" i18n>Cancel Reason</label>
+          <label class="form-label" for="cancel-reasons" i18n>Cancel Reason</label>
         </div>
         <div class="col-lg-8">
           <eg-combobox domId='cancel-reasons' [entries]="cancelReasons"
@@ -27,7 +27,7 @@
       </div>
       <div class="row mt-2">
         <div class="col-lg-4">
-          <label for="cancel-note" i18n>Cancel Note</label>
+          <label class="form-label" for="cancel-note" i18n>Cancel Note</label>
         </div>
         <div class="col-lg-8">
           <textarea id='cancel-note' class="form-control"
diff --git a/Open-ILS/src/eg2/src/app/staff/share/holds/manage.component.html b/Open-ILS/src/eg2/src/app/staff/share/holds/manage.component.html
index 853ed939ee..01eab0f3e4 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/holds/manage.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/holds/manage.component.html
@@ -11,7 +11,7 @@
             name="active_pickup_lib" [(ngModel)]="activeFields.pickup_lib"/>
         </div>
       </div>
-      <div class="flex-1"><label i18n>Pickup Library:</label></div>
+      <div class="flex-1"><label class="form-label" i18n>Pickup Library:</label></div>
     </div>
     <div class="col-lg-4">
       <!-- TODO: filter orgs as needed -->
@@ -29,7 +29,7 @@
         </div>
       </div>
       <div class="flex-1">
-        <label i18n>Desired Item Condition:</label>
+        <label class="form-label" i18n>Desired Item Condition:</label>
       </div>
     </div>
     <div class="col-lg-4">
@@ -39,7 +39,7 @@
           [disabled]="isBatch() && !activeFields.mint_condition"
           [ngModel]="hold.mint_condition() === 't'"
           (ngModelChange)="hold.mint_condition($event ? 't' : 'f')">
-        <label class="form-check-label" for="mint-condition">
+        <label class="form-label form-check-label" for="mint-condition">
           Good Condition Only
         </label>
       </div>
@@ -56,7 +56,7 @@
         </div>
       </div>
       <div class="flex-1">
-        <label for="frozen" i18n>Hold is Suspended:</label>
+        <label class="form-label" for="frozen" i18n>Hold is Suspended:</label>
       </div>
     </div>
     <div class="col-lg-4">
@@ -77,7 +77,7 @@
         </div>
       </div>
       <div class="flex-1">
-        <label for="cut_in_line" i18n>Top of Queue:</label>
+        <label class="form-label" for="cut_in_line" i18n>Top of Queue:</label>
       </div>
     </div>
     <div class="col-lg-4">
@@ -103,7 +103,7 @@
               name="active_thaw_date" [(ngModel)]="activeFields.thaw_date"/>
           </div>
         </div>
-        <div class="flex-1"><label for="thaw_date" i18n>Activate Date:</label></div>
+        <div class="flex-1"><label class="form-label" for="thaw_date" i18n>Activate Date:</label></div>
       </div>
       <div class="col-lg-4">
         <eg-date-select
@@ -121,7 +121,7 @@
               name="active_request_time" [(ngModel)]="activeFields.request_time"/>
           </div>
         </div>
-        <div class="flex-1"><label for="request_time" i18n>Request Date:</label></div>
+        <div class="flex-1"><label class="form-label" for="request_time" i18n>Request Date:</label></div>
       </div>
       <div class="col-lg-4">
         <eg-date-select
@@ -142,7 +142,7 @@
               name="active_expire_time" [(ngModel)]="activeFields.expire_time"/>
           </div>
         </div>
-        <div class="flex-1"><label for="expire_time" i18n>Expire Date:</label></div>
+        <div class="flex-1"><label class="form-label" for="expire_time" i18n>Expire Date:</label></div>
       </div>
       <div class="col-lg-4">
         <eg-date-select
@@ -160,7 +160,7 @@
               name="active_shelf_expire_time" [(ngModel)]="activeFields.shelf_expire_time"/>
           </div>
         </div>
-        <div class="flex-1"><label for="shelf_expire_time" i18n>Shelf Expire Date:</label></div>
+        <div class="flex-1"><label class="form-label" for="shelf_expire_time" i18n>Shelf Expire Date:</label></div>
       </div>
       <div class="col-lg-4">
         <eg-date-select
@@ -182,7 +182,7 @@
             name="active_email_notify" [(ngModel)]="activeFields.email_notify"/>
         </div>
       </div>
-      <div class="flex-1"><label for="email" i18n>Send Emails:</label></div>
+      <div class="flex-1"><label class="form-label" for="email" i18n>Send Emails:</label></div>
     </div>
     <div class="col-lg-4">
       <div class="form-check form-check-inline">
@@ -200,7 +200,7 @@
             name="active_phone_notify" [(ngModel)]="activeFields.phone_notify"/>
         </div>
       </div>
-      <div class="flex-1"><label for="phone" i18n>Phone Number:</label></div>
+      <div class="flex-1"><label class="form-label" for="phone" i18n>Phone Number:</label></div>
     </div>
     <div class="col-lg-4">
       <input type="text" class="form-control" name="phone" id="phone"
@@ -221,7 +221,7 @@
               name="active_sms_notify" [(ngModel)]="activeFields.sms_notify"/>
           </div>
         </div>
-        <div class="flex-1"><label for="sms_notify" i18n>Text/SMS Number:</label></div>
+        <div class="flex-1"><label class="form-label" for="sms_notify" i18n>Text/SMS Number:</label></div>
       </div>
       <div class="col-lg-4">
         <input type="text" class="form-control" name="sms_notify" id="sms_notify"
@@ -239,7 +239,7 @@
           </div>
         </div>
         <div class="flex-1">
-          <label for="sms_carrier" i18n>Text/SMS Number:</label>
+          <label class="form-label" for="sms_carrier" i18n>Text/SMS Number:</label>
         </div>
       </div>
       <div class="col-lg-4">
diff --git a/Open-ILS/src/eg2/src/app/staff/share/holds/note-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/holds/note-dialog.component.html
index 5e915ec7a7..a77def1637 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/holds/note-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/holds/note-dialog.component.html
@@ -8,21 +8,21 @@
     <div class="form-group form-check">
       <input type="checkbox" class="form-check-input" 
         id="patron-visible-cbox" [(ngModel)]="pub">
-      <label class="form-check-label" 
+      <label class="form-label form-check-label" 
         for="patron-visible-cbox" i18n>Patron Visible?</label>
     </div>
     <div class="form-group form-check">
       <input type="checkbox" class="form-check-input" 
         id="hold-slip-cbox" [(ngModel)]="slip">
-      <label class="form-check-label" 
+      <label class="form-label form-check-label" 
         for="hold-slip-cbox" i18n>Print on Slip?</label>
     </div>
     <div class="form-group">
-      <label for="title-input" i18n>Note Title</label>
+      <label class="form-label" for="title-input" i18n>Note Title</label>
       <input type="text" class="form-control" id="title-input" required [(ngModel)]="title"/>
     </div>
     <div class="form-group">
-      <label for="body-input" i18n>Note Body</label>
+      <label class="form-label" for="body-input" i18n>Note Body</label>
       <textarea class="form-control" id="body-input" required [(ngModel)]="body">
       </textarea>
     </div>
diff --git a/Open-ILS/src/eg2/src/app/staff/share/holds/notify-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/holds/notify-dialog.component.html
index d28a25c093..f4456a03fe 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/holds/notify-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/holds/notify-dialog.component.html
@@ -6,11 +6,11 @@
   </div>
   <div class="modal-body form-validated">
     <div class="form-group">
-      <label for="method-input" i18n>Notification Method</label>
+      <label class="form-label" for="method-input" i18n>Notification Method</label>
       <input type="text" class="form-control" id="method-input" required [(ngModel)]="method"/>
     </div>
     <div class="form-group">
-      <label for="note-input" i18n>Note</label>
+      <label class="form-label" for="note-input" i18n>Note</label>
       <textarea class="form-control" id="note-input" required [(ngModel)]="note">
       </textarea>
     </div>
diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/authority-linking-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/authority-linking-dialog.component.html
index 1448ce60c1..3a5f1cb778 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/authority-linking-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/authority-linking-dialog.component.html
@@ -49,7 +49,7 @@
 
             <span class="text-danger" i18n>‡</span>
 
-            <label class="form-check-label" for="search-subfield-{{sf[0]}}" i18n>
+            <label class="form-label form-check-label" for="search-subfield-{{sf[0]}}" i18n>
               {{sf[0]}} {{sf[1]}}
             </label>
           </div>
@@ -78,12 +78,12 @@
         <div class="form-check form-check-inline">
           <input class="form-check-input" type="radio" value="heading"
             [(ngModel)]="showAs" name='show-as-heading' id="show-as-heading">
-          <label class="form-check-label" for="show-as-heading" i18n>Show As Heading</label>
+          <label class="form-label form-check-label" for="show-as-heading" i18n>Show As Heading</label>
         </div>
         <div class="form-check form-check-inline">
           <input class="form-check-input" type="radio" value="marc"
             [(ngModel)]="showAs" name='show-as-heading' id="show-as-marc">
-          <label class="form-check-label" for="show-as-marc" i18n>Show As MARC</label>
+          <label class="form-label form-check-label" for="show-as-marc" i18n>Show As MARC</label>
         </div>
       </div>
     </div>
diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor.component.html b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor.component.html
index eed4214c47..0cb328562d 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor.component.html
@@ -23,7 +23,7 @@
     <div class="form-check">
       <input class="form-check-input" type="checkbox"
         [(ngModel)]="showFastAdd" id="fast-add-item"/>
-      <label class="form-check-label" for="fast-add-item">
+      <label class="form-label form-check-label" for="fast-add-item">
         Add Item
       </label>
     </div>
diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/phys-char-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/phys-char-dialog.component.html
index 9cd50bc2c3..35138df53b 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/phys-char-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/phys-char-dialog.component.html
@@ -9,7 +9,7 @@
 
     <div class="form-group row">
       <label for="007-value" 
-        class="col-lg-4 col-form-label" i18n>007 Value</label>
+        class="form-label col-lg-4 col-form-label" i18n>007 Value</label>
       <div class="col-lg-5 well-table">
         <div class="well-value">
           <!-- avoid newlines and spaces in the <pre> content -->
@@ -24,7 +24,7 @@
     </div>
 
     <div class="form-group row">
-      <label for="value-selector" class="col-lg-4 col-form-label">
+      <label for="value-selector" class="form-label col-lg-4 col-form-label">
         <ng-container *ngIf="!selectorLabel" i18n>Category of Material</ng-container>
         <ng-container *ngIf="selectorLabel">{{selectorLabel}}</ng-container>
       </label>
diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.html b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.html
index 63d0de3ba6..e3a3fe98cb 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.html
@@ -92,7 +92,7 @@
             <input class="form-check-input" type="checkbox"
               (change)="stackSubfieldsChange()"
               [(ngModel)]="stackSubfields" id="stack-subfields-{{randId}}">
-            <label class="form-check-label" for="stack-subfields-{{randId}}">
+            <label class="form-label form-check-label" for="stack-subfields-{{randId}}">
               Stack Subfields
             </label>
           </div>
diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/simplified-editor/simplified-editor.component.html b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/simplified-editor/simplified-editor.component.html
index 9dab545b62..9f8fc7fc03 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/simplified-editor/simplified-editor.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/simplified-editor/simplified-editor.component.html
@@ -1,7 +1,7 @@
 <ng-container *ngIf="editor && subfieldLabels && marcForms && marcTypes">
   <form [formGroup]="editor">
     <div class="row">
-      <div class="col-lg-3"><label i18n for="{{idPrefix}}-form">Form</label></div>
+      <div class="col-lg-3"><label class="form-label" i18n for="{{idPrefix}}-form">Form</label></div>
       <div class="col-lg-9">
         <eg-combobox #formCombobox [entries]="marcForms" formControlName="marcForm"
           [selectedId]="defaultMarcForm" domId="{{idPrefix}}-form">
@@ -10,7 +10,7 @@
       </div>
     </div>
     <div class="row">
-      <div class="col-lg-3"><label for="{{idPrefix}}-type" i18n>Type</label></div>
+      <div class="col-lg-3"><label class="form-label" for="{{idPrefix}}-type" i18n>Type</label></div>
       <div class="col-lg-9">
         <eg-combobox #typeCombobox [entries]="marcTypes" formControlName="marcType"
           selectedId="a" domId="{{idPrefix}}-type">
diff --git a/Open-ILS/src/eg2/src/app/staff/share/op-change/op-change.component.html b/Open-ILS/src/eg2/src/app/staff/share/op-change/op-change.component.html
index a1e121a6dc..89ad80f2fa 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/op-change/op-change.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/op-change/op-change.component.html
@@ -15,7 +15,7 @@
 
     <form class="form-validated">
       <div class="form-group row">
-        <label class="col-lg-4 text-end fw-bold" for="username" i18n>Username</label>
+        <label class="form-label col-lg-4 text-end fw-bold" for="username" i18n>Username</label>
         <input 
           type="text" 
           class="form-control col-lg-7"
@@ -30,7 +30,7 @@
       </div>
 
       <div class="form-group row">
-        <label class="col-lg-4 text-end fw-bold" 
+        <label class="form-label col-lg-4 text-end fw-bold" 
             for="password" i18n>Password</label>
         <input 
           type="password" 
@@ -46,7 +46,7 @@
       </div>
 
       <div class="form-group row">
-        <label class="col-lg-4 text-end fw-bold" 
+        <label class="form-label col-lg-4 text-end fw-bold" 
             for="loginType" i18n>Login Type</label>
         <select 
           class="form-control col-lg-7" 
diff --git a/Open-ILS/src/eg2/src/app/staff/share/patron/merge-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/patron/merge-dialog.component.html
index 1adc07dd9d..b5739c7690 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/patron/merge-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/patron/merge-dialog.component.html
@@ -16,7 +16,7 @@
           <div class="form-check form-check-inline">
             <input class="form-check-input" type="radio" name="lead" id="lead-record-1"
               [value]="summary1.patron.id()" [(ngModel)]="leadAccount">
-            <label class="form-check-label" for="lead-record-1">Use as Lead?</label>
+            <label class="form-label form-check-label" for="lead-record-1">Use as Lead?</label>
           </div>
         </div>
         <eg-patron-summary [summary]="summary1"></eg-patron-summary>  
@@ -26,7 +26,7 @@
           <div class="form-check form-check-inline">
             <input class="form-check-input" type="radio" name="lead" id="lead-record-2" 
               [value]="summary2.patron.id()" [(ngModel)]="leadAccount">
-            <label class="form-check-label" for="lead-record-2">Use as Lead?</label>
+            <label class="form-label form-check-label" for="lead-record-2">Use as Lead?</label>
           </div>
         </div>
         <eg-patron-summary [summary]="summary2"></eg-patron-summary>  
diff --git a/Open-ILS/src/eg2/src/app/staff/share/patron/search.component.html b/Open-ILS/src/eg2/src/app/staff/share/patron/search.component.html
index 4e2c2ae67e..f35caa140e 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/patron/search.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/patron/search.component.html
@@ -172,7 +172,7 @@
           <input class="form-check-input" type="checkbox" 
             (change)="toggleIncludeInactive()"
             id="include-inactive" [(ngModel)]="search.inactive">
-          <label class="form-check-label" for="include-inactive" i18n>
+          <label class="form-label form-check-label" for="include-inactive" i18n>
             Include Inactive
           </label>
         </div>
diff --git a/Open-ILS/src/extras/opensearchportal.html b/Open-ILS/src/extras/opensearchportal.html
index 44ce1adde1..3c95a15bb6 100644
--- a/Open-ILS/src/extras/opensearchportal.html
+++ b/Open-ILS/src/extras/opensearchportal.html
@@ -598,7 +598,7 @@ var listening_elements = ['term','gobutton','res_count_per','res_type'];
 					<table width="100%" style="border-collapse: collapse;">
 						<tr>
 							<td>
-								<label class="source_input">
+								<label class="form-label source_input">
 									<input
 										onclick="
 											if(insearch) {
@@ -615,7 +615,7 @@ var listening_elements = ['term','gobutton','res_count_per','res_type'];
 								</label>
 							</td>
 							<td>
-								<label class="source_input">
+								<label class="form-label source_input">
 									<input
 										onclick="
 											if(insearch) {
@@ -631,7 +631,7 @@ var listening_elements = ['term','gobutton','res_count_per','res_type'];
 								</label>
 							</td>
 							<td>
-								<label class="source_input">
+								<label class="form-label source_input">
 									<input
 										onclick="
 											if(insearch) {
@@ -650,7 +650,7 @@ var listening_elements = ['term','gobutton','res_count_per','res_type'];
 						</tr>
 						<tr>
 							<td>
-								<label class="source_input">
+								<label class="form-label source_input">
 									<input
 										onclick="
 											if(insearch) {
@@ -667,7 +667,7 @@ var listening_elements = ['term','gobutton','res_count_per','res_type'];
 								</label>
 							</td>
 							<td>
-								<label class="source_input">
+								<label class="form-label source_input">
 									<input
 										onclick="
 											if(insearch) {
@@ -683,7 +683,7 @@ var listening_elements = ['term','gobutton','res_count_per','res_type'];
 								</label>
 							</td>
 							<td>
-								<label class="source_input">
+								<label class="form-label source_input">
 									<input
 										onclick="
 											if(insearch) {
@@ -702,7 +702,7 @@ var listening_elements = ['term','gobutton','res_count_per','res_type'];
 						</tr>
 						<tr>
 							<td>
-								<label class="source_input">
+								<label class="form-label source_input">
 									<input
 										onclick="
 											if(insearch) {
@@ -719,7 +719,7 @@ var listening_elements = ['term','gobutton','res_count_per','res_type'];
 								</label>
 							</td>
 							<td>
-								<label class="source_input">
+								<label class="form-label source_input">
 									<input
 										onclick="
 											if(insearch) {
@@ -735,7 +735,7 @@ var listening_elements = ['term','gobutton','res_count_per','res_type'];
 								</label>
 							</td>
 							<td>
-								<label class="source_input">
+								<label class="form-label source_input">
 									<input
 										onclick="
 											if(insearch) {
-- 
2.11.0