diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index bb0012c64a..83a2633efd 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@labkey/components",
-  "version": "7.35.1",
+  "version": "7.35.2-pageStructure.9",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@labkey/components",
-      "version": "7.35.1",
+      "version": "7.35.2-pageStructure.9",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
diff --git a/packages/components/package.json b/packages/components/package.json
index 25f2ed57d6..0a9971a1d6 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "7.35.1",
+  "version": "7.35.2-pageStructure.9",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [
diff --git a/packages/components/releaseNotes/components.md b/packages/components/releaseNotes/components.md
index 5f4f0e47c5..53d7e2b94f 100644
--- a/packages/components/releaseNotes/components.md
+++ b/packages/components/releaseNotes/components.md
@@ -1,6 +1,12 @@
 # @labkey/components
 Components, models, actions, and utility functions for LabKey applications and pages
 
+### version TBD
+*Released*: TBD
+- Update heading tags in various page elements for better accessibility
+- Add sr-only text for Selection checkbox table header
+- Update a few more colors for better contrast
+
 ### version 7.35.0
 *Released*: 7 May 2026
 - Fix accessibility issues for empty links and buttons
diff --git a/packages/components/src/internal/Modal.tsx b/packages/components/src/internal/Modal.tsx
index d8c678e2f0..227a027e89 100644
--- a/packages/components/src/internal/Modal.tsx
+++ b/packages/components/src/internal/Modal.tsx
@@ -60,7 +60,7 @@ export const ModalHeader: FC<ModalHeaderProps> = ({ title, onCancel }) => {
                     <span className="sr-only">Close</span>
                 </button>
             )}
-            {title && <h4 className="modal-title text__wrap">{title}</h4>}
+            {title && <h2 className="modal-title text__wrap">{title}</h2>}
         </div>
     );
 };
diff --git a/packages/components/src/internal/components/assay/SpecialtyAssayPanel.tsx b/packages/components/src/internal/components/assay/SpecialtyAssayPanel.tsx
index d38833aeb6..9e099e8bc8 100644
--- a/packages/components/src/internal/components/assay/SpecialtyAssayPanel.tsx
+++ b/packages/components/src/internal/components/assay/SpecialtyAssayPanel.tsx
@@ -54,11 +54,12 @@ export const SpecialtyAssayPanel: FC<SpecialtyAssayPanelProps> = memo(props => {
                 <div className="col-xs-6">
                     {selected && options?.length > 0 && (
                         <>
-                            <div className="margin-bottom">
+                            <div className="margin-bottom" id="specialty-assay-type-select-label">
                                 <b>Use Instrument-Specific Data Format</b>
                             </div>
                             <div className="margin-bottom">
                                 <select
+                                    aria-labelledby="specialty-assay-type-select-label"
                                     id="specialty-assay-type-select"
                                     value={selected.name}
                                     onChange={onSelectChange}
diff --git a/packages/components/src/internal/components/auditlog/AuditDetails.tsx b/packages/components/src/internal/components/auditlog/AuditDetails.tsx
index 557e9cb746..ed9034336f 100644
--- a/packages/components/src/internal/components/auditlog/AuditDetails.tsx
+++ b/packages/components/src/internal/components/auditlog/AuditDetails.tsx
@@ -204,7 +204,7 @@ export class AuditDetails extends Component<Props> {
 
         return (
             <div className="panel panel-default">
-                <div className="panel-heading">{title}</div>
+                <h2 className="panel-heading">{title}</h2>
                 <div className="panel-body">
                     {children}
                     {!rowId && <div>{emptyMsg}</div>}
diff --git a/packages/components/src/internal/components/base/Grid.tsx b/packages/components/src/internal/components/base/Grid.tsx
index 88c1e3d031..b3578fc224 100644
--- a/packages/components/src/internal/components/base/Grid.tsx
+++ b/packages/components/src/internal/components/base/Grid.tsx
@@ -193,6 +193,9 @@ export class GridHeader extends PureComponent<GridHeaderProps, State> {
                                         onDrop={this.handleDrop}
                                         title={hideTooltip ? undefined : description}
                                     >
+                                        {column.index === '__selection__' && (
+                                            <span className="sr-only">Selection checkboxes</span>
+                                        )}
                                         {headerCell && headerCell(column, i, columns.size)}
                                         {!headerCell && (
                                             <div className={GRID_HEADER_CELL_BODY}>
diff --git a/packages/components/src/internal/components/base/PageHeader.test.tsx b/packages/components/src/internal/components/base/PageHeader.test.tsx
index a93ffb585a..59c837c743 100644
--- a/packages/components/src/internal/components/base/PageHeader.test.tsx
+++ b/packages/components/src/internal/components/base/PageHeader.test.tsx
@@ -7,7 +7,7 @@ import { PageHeader } from './PageHeader';
 describe('<PageHeader />', () => {
     test('render without properties', () => {
         render(<PageHeader showNotifications={false} />);
-        expect(document.querySelector('h2').textContent).toEqual('');
+        expect(document.querySelector('h2')).not.toBeInTheDocument();
     });
 
     test('render with icon', () => {
@@ -28,6 +28,13 @@ describe('<PageHeader />', () => {
         expect(document.querySelector('h2').textContent).toEqual(' Page title');
     });
 
+
+    test('render with icon and title as primary', () => {
+        render(<PageHeader primaryHeader showNotifications={false} title="Page title" iconCls="fa fa-star" />);
+        expect(document.querySelectorAll('span.fa-star').length).toEqual(1);
+        expect(document.querySelector('h1').textContent).toEqual(' Page title');
+    });
+
     test('render with children', () => {
         render(
             <PageHeader showNotifications={false} title="render with children">
diff --git a/packages/components/src/internal/components/base/PageHeader.tsx b/packages/components/src/internal/components/base/PageHeader.tsx
index 207a0cdb20..2d8335a921 100644
--- a/packages/components/src/internal/components/base/PageHeader.tsx
+++ b/packages/components/src/internal/components/base/PageHeader.tsx
@@ -19,20 +19,40 @@ import { Notifications } from '../notifications/Notifications';
 
 interface PageHeaderProps extends PropsWithChildren {
     iconCls?: string;
+    primaryHeader?: boolean;
     showNotifications?: boolean;
     title?: string;
 }
 
-export const PageHeader: FC<PageHeaderProps> = ({ children, iconCls, showNotifications = true, title }) => (
-    <div className="page-header">
-        {children}
+export const PageHeader: FC<PageHeaderProps> = ({
+    children,
+    iconCls,
+    primaryHeader,
+    showNotifications = true,
+    title,
+}) => {
+    const showTitle = !!iconCls || !!title;
 
-        <h2 className="no-margin-top">
-            {iconCls ? <span className={'page-header-icon ' + iconCls}>&nbsp;</span> : null}
-            {title}
-        </h2>
+    return (
+        <div className="page-header">
+            {children}
+
+            {showTitle && primaryHeader && (
+                <h1 className="no-margin-top">
+                    {iconCls ? <span className={'page-header-icon ' + iconCls}>&nbsp;</span> : null}
+                    {title}
+                </h1>
+            )}
+            {showTitle && !primaryHeader && (
+                <h2 className="no-margin-top">
+                    {iconCls ? <span className={'page-header-icon ' + iconCls}>&nbsp;</span> : null}
+                    {title}
+                </h2>
+            )}
+
+            {showNotifications && <Notifications />}
+        </div>
+    );
+};
 
-        {showNotifications && <Notifications />}
-    </div>
-);
 PageHeader.displayName = 'PageHeader';
diff --git a/packages/components/src/internal/components/base/Section.tsx b/packages/components/src/internal/components/base/Section.tsx
index f6c3d4e854..58d531121b 100644
--- a/packages/components/src/internal/components/base/Section.tsx
+++ b/packages/components/src/internal/components/base/Section.tsx
@@ -44,10 +44,15 @@ export const Section: FC<SectionProps> = props => {
                 {showHeader && (
                     <div className={`panel-heading panel-content-flex panel-content-${titleSize}`}>
                         <div className={`panel-content-title-container ${titleContainerClassName ?? ''}`}>
-                            {title && (
-                                <div className={`panel-content-title-${titleSize} ${titleClassName ?? ''}`}>
+                            {title && titleSize === 'large' && (
+                                <h1 className={`panel-content-title-${titleSize} ${titleClassName ?? ''}`}>
                                     {title}
-                                </div>
+                                </h1>
+                            )}
+                            {title && titleSize !== 'large' && (
+                                <h2 className={`panel-content-title-${titleSize} ${titleClassName ?? ''}`}>
+                                    {title}
+                                </h2>
                             )}
                             {caption && <div className="panel-content-caption">{caption}</div>}
                         </div>
diff --git a/packages/components/src/internal/components/domainproperties/CollapsiblePanelHeader.tsx b/packages/components/src/internal/components/domainproperties/CollapsiblePanelHeader.tsx
index 59734dfaf7..1b439693ac 100644
--- a/packages/components/src/internal/components/domainproperties/CollapsiblePanelHeader.tsx
+++ b/packages/components/src/internal/components/domainproperties/CollapsiblePanelHeader.tsx
@@ -104,7 +104,7 @@ export class CollapsiblePanelHeader extends React.PureComponent<Props> {
                 {panelStatus && panelStatus !== 'NONE' && !iconHelpMsg && this.getHeaderIconComponent()}
 
                 {/* Header name*/}
-                <span className="domain-panel-title">{this.getTitlePrefix() + title}</span>
+                <h2 className="domain-panel-title">{this.getTitlePrefix() + title}</h2>
 
                 {/* Expand/Collapse Icon*/}
                 {(controlledCollapse || collapsible) && (
diff --git a/packages/components/src/internal/components/domainproperties/DomainFieldsDisplay.tsx b/packages/components/src/internal/components/domainproperties/DomainFieldsDisplay.tsx
index 8aba4847e0..3755e35c39 100644
--- a/packages/components/src/internal/components/domainproperties/DomainFieldsDisplay.tsx
+++ b/packages/components/src/internal/components/domainproperties/DomainFieldsDisplay.tsx
@@ -55,9 +55,9 @@ type Props = {
 
 export const DomainFieldsDisplay: FC<Props> = ({ domain, title }) => (
     <div className="panel panel-default">
-        <div className="panel-heading">
+        <h2 className="panel-heading">
             <div className="panel-title">{title || domain.name}</div>
-        </div>
+        </h2>
         <div className="panel-body">
             <p>{domain.description}</p>
             <Grid columns={DOMAIN_FIELD_COLS} data={domain.fields} />
diff --git a/packages/components/src/internal/components/domainproperties/SectionHeading.tsx b/packages/components/src/internal/components/domainproperties/SectionHeading.tsx
index cd0044cd1b..328b7c8d36 100644
--- a/packages/components/src/internal/components/domainproperties/SectionHeading.tsx
+++ b/packages/components/src/internal/components/domainproperties/SectionHeading.tsx
@@ -10,10 +10,10 @@ interface Props {
 }
 
 export const SectionHeading: FC<Props> = memo(props => (
-    <div className={'domain-field-section-heading' + (props.cls ? ' ' + props.cls : '')} id={props.id}>
+    <h3 className={'domain-field-section-heading' + (props.cls ? ' ' + props.cls : '')} id={props.id}>
         {props.title}
         {props.helpTipBody && <LabelHelpTip title={props.title}>{props.helpTipBody}</LabelHelpTip>}
-    </div>
+    </h3>
 ));
 
 SectionHeading.displayName = 'SectionHeading';
diff --git a/packages/components/src/internal/components/domainproperties/__snapshots__/CollapsiblePanelHeader.test.tsx.snap b/packages/components/src/internal/components/domainproperties/__snapshots__/CollapsiblePanelHeader.test.tsx.snap
index 19ab69115d..c7e3e57757 100644
--- a/packages/components/src/internal/components/domainproperties/__snapshots__/CollapsiblePanelHeader.test.tsx.snap
+++ b/packages/components/src/internal/components/domainproperties/__snapshots__/CollapsiblePanelHeader.test.tsx.snap
@@ -13,11 +13,11 @@ exports[`<CollapsiblePanelHeader/> custom properties 1`] = `
         class="fa fa-check-circle"
       />
     </span>
-    <span
+    <h2
       class="domain-panel-title"
     >
       Test Prefix - Test Title
-    </span>
+    </h2>
     <span
       class="pull-right"
     >
@@ -40,11 +40,11 @@ exports[`<CollapsiblePanelHeader/> default properties 1`] = `
     class="domain-panel-header panel-heading domain-heading-collapsible domain-panel-header-collapsed"
     id="test-id"
   >
-    <span
+    <h2
       class="domain-panel-title"
     >
       Test Title
-    </span>
+    </h2>
     <span
       class="pull-right"
     >
@@ -69,11 +69,11 @@ exports[`<CollapsiblePanelHeader/> invalid, iconHelpMsg, and expanded 1`] = `
         class="fa fa-check-circle"
       />
     </span>
-    <span
+    <h2
       class="domain-panel-title"
     >
       Test Title
-    </span>
+    </h2>
     <span
       class="pull-right"
     >
@@ -91,11 +91,11 @@ exports[`<CollapsiblePanelHeader/> not collapsible 1`] = `
     class="domain-panel-header panel-heading domain-panel-header-expanded domain-panel-header-no-theme"
     id="test-id"
   >
-    <span
+    <h2
       class="domain-panel-title"
     >
       Test Title
-    </span>
+    </h2>
   </div>
 </div>
 `;
@@ -113,11 +113,11 @@ exports[`<CollapsiblePanelHeader/> not controlledCollapse 1`] = `
         class="fa fa-check-circle"
       />
     </span>
-    <span
+    <h2
       class="domain-panel-title"
     >
       Test Title
-    </span>
+    </h2>
   </div>
 </div>
 `;
@@ -143,11 +143,11 @@ exports[`<CollapsiblePanelHeader/> panelStatus TODO and help tip 1`] = `
         </span>
       </span>
     </div>
-    <span
+    <h2
       class="domain-panel-title"
     >
       Test Title
-    </span>
+    </h2>
     <span
       class="pull-right"
     >
diff --git a/packages/components/src/internal/components/domainproperties/__snapshots__/ConditionalFormattingAndValidation.test.tsx.snap b/packages/components/src/internal/components/domainproperties/__snapshots__/ConditionalFormattingAndValidation.test.tsx.snap
index 7b48721a72..522e94670b 100644
--- a/packages/components/src/internal/components/domainproperties/__snapshots__/ConditionalFormattingAndValidation.test.tsx.snap
+++ b/packages/components/src/internal/components/domainproperties/__snapshots__/ConditionalFormattingAndValidation.test.tsx.snap
@@ -9,11 +9,11 @@ exports[`ConditionalFormattingAndValidation Multiple validators or formats, cond
       <div
         class="col-xs-12"
       >
-        <div
+        <h3
           class="domain-field-section-heading domain-field-section-hdr"
         >
           Conditional Formatting and Validation Options
-        </div>
+        </h3>
       </div>
     </div>
     <div
@@ -121,11 +121,11 @@ exports[`ConditionalFormattingAndValidation No validators 1`] = `
       <div
         class="col-xs-12"
       >
-        <div
+        <h3
           class="domain-field-section-heading domain-field-section-hdr"
         >
           Conditional Formatting Options
-        </div>
+        </h3>
       </div>
     </div>
     <div
@@ -191,11 +191,11 @@ exports[`ConditionalFormattingAndValidation string field 1`] = `
       <div
         class="col-xs-12"
       >
-        <div
+        <h3
           class="domain-field-section-heading domain-field-section-hdr"
         >
           Conditional Formatting and Validation Options
-        </div>
+        </h3>
       </div>
     </div>
     <div
diff --git a/packages/components/src/internal/components/domainproperties/__snapshots__/DomainFieldsDisplay.test.tsx.snap b/packages/components/src/internal/components/domainproperties/__snapshots__/DomainFieldsDisplay.test.tsx.snap
index b8e15ba7bd..7e71f258d6 100644
--- a/packages/components/src/internal/components/domainproperties/__snapshots__/DomainFieldsDisplay.test.tsx.snap
+++ b/packages/components/src/internal/components/domainproperties/__snapshots__/DomainFieldsDisplay.test.tsx.snap
@@ -5,13 +5,13 @@ exports[`DomainFieldsDisplay with empty domain design 1`] = `
   <div
     class="panel panel-default"
   >
-    <div
+    <h2
       class="panel-heading"
     >
       <div
         class="panel-title"
       />
-    </div>
+    </h2>
     <div
       class="panel-body"
     >
@@ -118,7 +118,7 @@ exports[`DomainFieldsDisplay with title 1`] = `
   <div
     class="panel panel-default"
   >
-    <div
+    <h2
       class="panel-heading"
     >
       <div
@@ -126,7 +126,7 @@ exports[`DomainFieldsDisplay with title 1`] = `
       >
         test domain title
       </div>
-    </div>
+    </h2>
     <div
       class="panel-body"
     >
@@ -233,7 +233,7 @@ exports[`DomainFieldsDisplay without title 1`] = `
   <div
     class="panel panel-default"
   >
-    <div
+    <h2
       class="panel-heading"
     >
       <div
@@ -241,7 +241,7 @@ exports[`DomainFieldsDisplay without title 1`] = `
       >
         test domain name
       </div>
-    </div>
+    </h2>
     <div
       class="panel-body"
     >
diff --git a/packages/components/src/internal/components/domainproperties/__snapshots__/FileAttachmentOptions.test.tsx.snap b/packages/components/src/internal/components/domainproperties/__snapshots__/FileAttachmentOptions.test.tsx.snap
index 6a5876b0b6..c91695cd43 100644
--- a/packages/components/src/internal/components/domainproperties/__snapshots__/FileAttachmentOptions.test.tsx.snap
+++ b/packages/components/src/internal/components/domainproperties/__snapshots__/FileAttachmentOptions.test.tsx.snap
@@ -9,7 +9,7 @@ exports[`FileAttachmentOptions Attachment data type download 1`] = `
       <div
         class="col-xs-12"
       >
-        <div
+        <h3
           class="domain-field-section-heading"
         >
           Attachment Behavior
@@ -24,7 +24,7 @@ exports[`FileAttachmentOptions Attachment data type download 1`] = `
               />
             </span>
           </div>
-        </div>
+        </h3>
       </div>
     </div>
     <div
@@ -64,7 +64,7 @@ exports[`FileAttachmentOptions File data type inline 1`] = `
       <div
         class="col-xs-12"
       >
-        <div
+        <h3
           class="domain-field-section-heading"
         >
           File Behavior
@@ -79,7 +79,7 @@ exports[`FileAttachmentOptions File data type inline 1`] = `
               />
             </span>
           </div>
-        </div>
+        </h3>
       </div>
     </div>
     <div
diff --git a/packages/components/src/internal/components/domainproperties/__snapshots__/NameAndLinkingOptions.test.tsx.snap b/packages/components/src/internal/components/domainproperties/__snapshots__/NameAndLinkingOptions.test.tsx.snap
index 39079447ff..de6636d266 100644
--- a/packages/components/src/internal/components/domainproperties/__snapshots__/NameAndLinkingOptions.test.tsx.snap
+++ b/packages/components/src/internal/components/domainproperties/__snapshots__/NameAndLinkingOptions.test.tsx.snap
@@ -9,11 +9,11 @@ exports[`NameAndLinkingOptions Name and Linking options 1`] = `
       <div
         class="col-xs-12"
       >
-        <div
+        <h3
           class="domain-field-section-heading domain-field-section-hdr"
         >
           Name and Linking Options
-        </div>
+        </h3>
       </div>
     </div>
     <div
diff --git a/packages/components/src/internal/components/domainproperties/__snapshots__/NumericFieldOptions.test.tsx.snap b/packages/components/src/internal/components/domainproperties/__snapshots__/NumericFieldOptions.test.tsx.snap
index ba269ce358..24a9dfb788 100644
--- a/packages/components/src/internal/components/domainproperties/__snapshots__/NumericFieldOptions.test.tsx.snap
+++ b/packages/components/src/internal/components/domainproperties/__snapshots__/NumericFieldOptions.test.tsx.snap
@@ -9,11 +9,11 @@ exports[`NumericFieldOptions Numeric data type 1`] = `
       <div
         class="col-xs-12"
       >
-        <div
+        <h3
           class="domain-field-section-heading"
         >
           Numeric Field Options
-        </div>
+        </h3>
       </div>
     </div>
     <div
diff --git a/packages/components/src/internal/components/domainproperties/__snapshots__/SectionHeading.test.tsx.snap b/packages/components/src/internal/components/domainproperties/__snapshots__/SectionHeading.test.tsx.snap
index 1a9893734b..613d1fe148 100644
--- a/packages/components/src/internal/components/domainproperties/__snapshots__/SectionHeading.test.tsx.snap
+++ b/packages/components/src/internal/components/domainproperties/__snapshots__/SectionHeading.test.tsx.snap
@@ -2,20 +2,20 @@
 
 exports[`<SectionHeading/> title and cls 1`] = `
 <div>
-  <div
+  <h3
     class="domain-field-section-heading section-heading-cls"
   >
     Section Heading Title
-  </div>
+  </h3>
 </div>
 `;
 
 exports[`<SectionHeading/> title only 1`] = `
 <div>
-  <div
+  <h3
     class="domain-field-section-heading"
   >
     Section Heading Title
-  </div>
+  </h3>
 </div>
 `;
diff --git a/packages/components/src/internal/components/domainproperties/issues/__snapshots__/IssuesListDefPropertiesPanel.test.tsx.snap b/packages/components/src/internal/components/domainproperties/issues/__snapshots__/IssuesListDefPropertiesPanel.test.tsx.snap
index 5d3307e2b0..74f9549c0c 100644
--- a/packages/components/src/internal/components/domainproperties/issues/__snapshots__/IssuesListDefPropertiesPanel.test.tsx.snap
+++ b/packages/components/src/internal/components/domainproperties/issues/__snapshots__/IssuesListDefPropertiesPanel.test.tsx.snap
@@ -12,11 +12,11 @@ exports[`IssuesListDefPropertiesPanel new Issue Def 1`] = `
           class="domain-panel-header panel-heading domain-panel-header-expanded domain-panel-header-no-theme"
           id="issues-properties-hdr"
         >
-          <span
+          <h2
             class="domain-panel-title"
           >
             Issues List For Jest - Issues List Properties
-          </span>
+          </h2>
         </div>
         <div
           class="panel-body"
@@ -53,11 +53,11 @@ exports[`IssuesListDefPropertiesPanel new Issue Def 1`] = `
                 class="domain-field-padding-bottom"
               >
                 <div>
-                  <div
+                  <h3
                     class="domain-field-section-heading"
                   >
                     Basic Properties
-                  </div>
+                  </h3>
                   <div
                     class="row margin-top"
                   >
@@ -264,11 +264,11 @@ exports[`IssuesListDefPropertiesPanel new Issue Def 1`] = `
             <div
               class="col-xs-12 col-md-6"
             >
-              <div
+              <h3
                 class="domain-field-section-heading"
               >
                 Assignment Options
-              </div>
+              </h3>
               <div
                 class="row margin-top"
               >
@@ -436,11 +436,11 @@ exports[`IssuesListDefPropertiesPanel new Issue Def 1`] = `
         class="domain-panel-header panel-heading domain-panel-header-expanded domain-panel-header-no-theme"
         id="issues-properties-hdr"
       >
-        <span
+        <h2
           class="domain-panel-title"
         >
           Issues List For Jest - Issues List Properties
-        </span>
+        </h2>
       </div>
       <div
         class="panel-body"
@@ -477,11 +477,11 @@ exports[`IssuesListDefPropertiesPanel new Issue Def 1`] = `
               class="domain-field-padding-bottom"
             >
               <div>
-                <div
+                <h3
                   class="domain-field-section-heading"
                 >
                   Basic Properties
-                </div>
+                </h3>
                 <div
                   class="row margin-top"
                 >
@@ -688,11 +688,11 @@ exports[`IssuesListDefPropertiesPanel new Issue Def 1`] = `
           <div
             class="col-xs-12 col-md-6"
           >
-            <div
+            <h3
               class="domain-field-section-heading"
             >
               Assignment Options
-            </div>
+            </h3>
             <div
               class="row margin-top"
             >
diff --git a/packages/components/src/internal/components/domainproperties/list/__snapshots__/ListPropertiesPanel.test.tsx.snap b/packages/components/src/internal/components/domainproperties/list/__snapshots__/ListPropertiesPanel.test.tsx.snap
index 2069e83caa..2838f38fa1 100644
--- a/packages/components/src/internal/components/domainproperties/list/__snapshots__/ListPropertiesPanel.test.tsx.snap
+++ b/packages/components/src/internal/components/domainproperties/list/__snapshots__/ListPropertiesPanel.test.tsx.snap
@@ -19,11 +19,11 @@ exports[`ListPropertiesPanel existing list 1`] = `
               class="fa fa-check-circle"
             />
           </span>
-          <span
+          <h2
             class="domain-panel-title"
           >
             NIMHDemographics - List Properties
-          </span>
+          </h2>
         </div>
         <div
           class="panel-body"
@@ -56,11 +56,11 @@ exports[`ListPropertiesPanel existing list 1`] = `
             <div
               class="col-xs-12 col-md-7"
             >
-              <div
+              <h3
                 class="domain-field-section-heading"
               >
                 Basic Properties
-              </div>
+              </h3>
               <div
                 class="row margin-top"
               >
@@ -129,11 +129,11 @@ exports[`ListPropertiesPanel existing list 1`] = `
             <div
               class="col-xs-12 col-md-3"
             >
-              <div
+              <h3
                 class="domain-field-section-heading"
               >
                 Allow these Actions
-              </div>
+              </h3>
               <div
                 class="list__properties__allowable-actions"
               >
@@ -215,11 +215,11 @@ exports[`ListPropertiesPanel existing list 1`] = `
             class="fa fa-check-circle"
           />
         </span>
-        <span
+        <h2
           class="domain-panel-title"
         >
           NIMHDemographics - List Properties
-        </span>
+        </h2>
       </div>
       <div
         class="panel-body"
@@ -252,11 +252,11 @@ exports[`ListPropertiesPanel existing list 1`] = `
           <div
             class="col-xs-12 col-md-7"
           >
-            <div
+            <h3
               class="domain-field-section-heading"
             >
               Basic Properties
-            </div>
+            </h3>
             <div
               class="row margin-top"
             >
@@ -325,11 +325,11 @@ exports[`ListPropertiesPanel existing list 1`] = `
           <div
             class="col-xs-12 col-md-3"
           >
-            <div
+            <h3
               class="domain-field-section-heading"
             >
               Allow these Actions
-            </div>
+            </h3>
             <div
               class="list__properties__allowable-actions"
             >
@@ -471,11 +471,11 @@ exports[`ListPropertiesPanel list with error 1`] = `
               </span>
             </span>
           </div>
-          <span
+          <h2
             class="domain-panel-title"
           >
             NIMHDemographics - List Properties
-          </span>
+          </h2>
         </div>
         <div
           class="panel-body"
@@ -508,11 +508,11 @@ exports[`ListPropertiesPanel list with error 1`] = `
             <div
               class="col-xs-12 col-md-7"
             >
-              <div
+              <h3
                 class="domain-field-section-heading"
               >
                 Basic Properties
-              </div>
+              </h3>
               <div
                 class="row margin-top"
               >
@@ -581,11 +581,11 @@ exports[`ListPropertiesPanel list with error 1`] = `
             <div
               class="col-xs-12 col-md-3"
             >
-              <div
+              <h3
                 class="domain-field-section-heading"
               >
                 Allow these Actions
-              </div>
+              </h3>
               <div
                 class="list__properties__allowable-actions"
               >
@@ -680,11 +680,11 @@ exports[`ListPropertiesPanel list with error 1`] = `
             </span>
           </span>
         </div>
-        <span
+        <h2
           class="domain-panel-title"
         >
           NIMHDemographics - List Properties
-        </span>
+        </h2>
       </div>
       <div
         class="panel-body"
@@ -717,11 +717,11 @@ exports[`ListPropertiesPanel list with error 1`] = `
           <div
             class="col-xs-12 col-md-7"
           >
-            <div
+            <h3
               class="domain-field-section-heading"
             >
               Basic Properties
-            </div>
+            </h3>
             <div
               class="row margin-top"
             >
@@ -790,11 +790,11 @@ exports[`ListPropertiesPanel list with error 1`] = `
           <div
             class="col-xs-12 col-md-3"
           >
-            <div
+            <h3
               class="domain-field-section-heading"
             >
               Allow these Actions
-            </div>
+            </h3>
             <div
               class="list__properties__allowable-actions"
             >
@@ -921,11 +921,11 @@ exports[`ListPropertiesPanel new list 1`] = `
           class="domain-panel-header panel-heading domain-panel-header-expanded domain-panel-header-no-theme"
           id="list-properties-hdr"
         >
-          <span
+          <h2
             class="domain-panel-title"
           >
             List Properties
-          </span>
+          </h2>
         </div>
         <div
           class="panel-body"
@@ -958,11 +958,11 @@ exports[`ListPropertiesPanel new list 1`] = `
             <div
               class="col-xs-12 col-md-7"
             >
-              <div
+              <h3
                 class="domain-field-section-heading"
               >
                 Basic Properties
-              </div>
+              </h3>
               <div
                 class="row margin-top"
               >
@@ -1031,11 +1031,11 @@ exports[`ListPropertiesPanel new list 1`] = `
             <div
               class="col-xs-12 col-md-3"
             >
-              <div
+              <h3
                 class="domain-field-section-heading"
               >
                 Allow these Actions
-              </div>
+              </h3>
               <div
                 class="list__properties__allowable-actions"
               >
@@ -1110,11 +1110,11 @@ exports[`ListPropertiesPanel new list 1`] = `
         class="domain-panel-header panel-heading domain-panel-header-expanded domain-panel-header-no-theme"
         id="list-properties-hdr"
       >
-        <span
+        <h2
           class="domain-panel-title"
         >
           List Properties
-        </span>
+        </h2>
       </div>
       <div
         class="panel-body"
@@ -1147,11 +1147,11 @@ exports[`ListPropertiesPanel new list 1`] = `
           <div
             class="col-xs-12 col-md-7"
           >
-            <div
+            <h3
               class="domain-field-section-heading"
             >
               Basic Properties
-            </div>
+            </h3>
             <div
               class="row margin-top"
             >
@@ -1220,11 +1220,11 @@ exports[`ListPropertiesPanel new list 1`] = `
           <div
             class="col-xs-12 col-md-3"
           >
-            <div
+            <h3
               class="domain-field-section-heading"
             >
               Allow these Actions
-            </div>
+            </h3>
             <div
               class="list__properties__allowable-actions"
             >
diff --git a/packages/components/src/internal/components/domainproperties/list/__snapshots__/ListPropertiesPanelFormElements.test.tsx.snap b/packages/components/src/internal/components/domainproperties/list/__snapshots__/ListPropertiesPanelFormElements.test.tsx.snap
index 501fe58903..167083045b 100644
--- a/packages/components/src/internal/components/domainproperties/list/__snapshots__/ListPropertiesPanelFormElements.test.tsx.snap
+++ b/packages/components/src/internal/components/domainproperties/list/__snapshots__/ListPropertiesPanelFormElements.test.tsx.snap
@@ -5,11 +5,11 @@ exports[`AllowableActions existing list, existing properties 1`] = `
   <div
     class="col-xs-12 col-md-3"
   >
-    <div
+    <h3
       class="domain-field-section-heading"
     >
       Allow these Actions
-    </div>
+    </h3>
     <div
       class="list__properties__allowable-actions"
     >
@@ -68,11 +68,11 @@ exports[`AllowableActions new list, default properties 1`] = `
   <div
     class="col-xs-12 col-md-3"
   >
-    <div
+    <h3
       class="domain-field-section-heading"
     >
       Allow these Actions
-    </div>
+    </h3>
     <div
       class="list__properties__allowable-actions"
     >
@@ -131,11 +131,11 @@ exports[`BasicPropertiesFields existing list, existing properties 1`] = `
   <div
     class="col-xs-12 col-md-7"
   >
-    <div
+    <h3
       class="domain-field-section-heading"
     >
       Basic Properties
-    </div>
+    </h3>
     <div
       class="row margin-top"
     >
@@ -209,11 +209,11 @@ exports[`BasicPropertiesFields new list, default properties 1`] = `
   <div
     class="col-xs-12 col-md-7"
   >
-    <div
+    <h3
       class="domain-field-section-heading"
     >
       Basic Properties
-    </div>
+    </h3>
     <div
       class="row margin-top"
     >
diff --git a/packages/components/src/internal/components/domainproperties/samples/__snapshots__/SampleTypePropertiesPanel.test.tsx.snap b/packages/components/src/internal/components/domainproperties/samples/__snapshots__/SampleTypePropertiesPanel.test.tsx.snap
index bff0d5958c..ad68279587 100644
--- a/packages/components/src/internal/components/domainproperties/samples/__snapshots__/SampleTypePropertiesPanel.test.tsx.snap
+++ b/packages/components/src/internal/components/domainproperties/samples/__snapshots__/SampleTypePropertiesPanel.test.tsx.snap
@@ -12,11 +12,11 @@ exports[`SampleTypePropertiesPanel appPropertiesOnly 1`] = `
           class="domain-panel-header panel-heading domain-panel-header-expanded domain-panel-header-no-theme"
           id="sample-type-properties-hdr"
         >
-          <span
+          <h2
             class="domain-panel-title"
           >
             Sample Type Properties
-          </span>
+          </h2>
         </div>
         <div
           class="panel-body"
@@ -45,11 +45,11 @@ exports[`SampleTypePropertiesPanel appPropertiesOnly 1`] = `
               </div>
             </div>
           </div>
-          <div
+          <h3
             class="domain-field-section-heading"
           >
             General Properties
-          </div>
+          </h3>
           <form>
             <div
               class="row margin-bottom margin-top"
@@ -166,11 +166,11 @@ exports[`SampleTypePropertiesPanel appPropertiesOnly 1`] = `
               </div>
             </div>
           </form>
-          <div
+          <h3
             class="domain-field-section-heading top-padding bottom-padding"
           >
             Lineage Settings
-          </div>
+          </h3>
           <div
             class="row"
           >
@@ -199,11 +199,11 @@ exports[`SampleTypePropertiesPanel appPropertiesOnly 1`] = `
               </span>
             </div>
           </div>
-          <div
+          <h3
             class="domain-field-section-heading top-padding"
           >
             Storage Settings
-          </div>
+          </h3>
           <div
             class="row margin-top"
           >
@@ -294,11 +294,11 @@ exports[`SampleTypePropertiesPanel appPropertiesOnly 1`] = `
         class="domain-panel-header panel-heading domain-panel-header-expanded domain-panel-header-no-theme"
         id="sample-type-properties-hdr"
       >
-        <span
+        <h2
           class="domain-panel-title"
         >
           Sample Type Properties
-        </span>
+        </h2>
       </div>
       <div
         class="panel-body"
@@ -327,11 +327,11 @@ exports[`SampleTypePropertiesPanel appPropertiesOnly 1`] = `
             </div>
           </div>
         </div>
-        <div
+        <h3
           class="domain-field-section-heading"
         >
           General Properties
-        </div>
+        </h3>
         <form>
           <div
             class="row margin-bottom margin-top"
@@ -448,11 +448,11 @@ exports[`SampleTypePropertiesPanel appPropertiesOnly 1`] = `
             </div>
           </div>
         </form>
-        <div
+        <h3
           class="domain-field-section-heading top-padding bottom-padding"
         >
           Lineage Settings
-        </div>
+        </h3>
         <div
           class="row"
         >
@@ -481,11 +481,11 @@ exports[`SampleTypePropertiesPanel appPropertiesOnly 1`] = `
             </span>
           </div>
         </div>
-        <div
+        <h3
           class="domain-field-section-heading top-padding"
         >
           Storage Settings
-        </div>
+        </h3>
         <div
           class="row margin-top"
         >
@@ -618,11 +618,11 @@ exports[`SampleTypePropertiesPanel default props 1`] = `
           class="domain-panel-header panel-heading domain-panel-header-expanded domain-panel-header-no-theme"
           id="sample-type-properties-hdr"
         >
-          <span
+          <h2
             class="domain-panel-title"
           >
             Sample Type Properties
-          </span>
+          </h2>
         </div>
         <div
           class="panel-body"
@@ -767,11 +767,11 @@ exports[`SampleTypePropertiesPanel default props 1`] = `
               </div>
             </div>
           </form>
-          <div
+          <h3
             class="domain-field-section-heading top-padding bottom-padding"
           >
             Lineage Settings
-          </div>
+          </h3>
           <div
             class="row"
           >
@@ -832,11 +832,11 @@ exports[`SampleTypePropertiesPanel default props 1`] = `
         class="domain-panel-header panel-heading domain-panel-header-expanded domain-panel-header-no-theme"
         id="sample-type-properties-hdr"
       >
-        <span
+        <h2
           class="domain-panel-title"
         >
           Sample Type Properties
-        </span>
+        </h2>
       </div>
       <div
         class="panel-body"
@@ -981,11 +981,11 @@ exports[`SampleTypePropertiesPanel default props 1`] = `
             </div>
           </div>
         </form>
-        <div
+        <h3
           class="domain-field-section-heading top-padding bottom-padding"
         >
           Lineage Settings
-        </div>
+        </h3>
         <div
           class="row"
         >
@@ -1093,11 +1093,11 @@ exports[`SampleTypePropertiesPanel include dataclass and use custom labels 1`] =
           class="domain-panel-header panel-heading domain-panel-header-expanded domain-panel-header-no-theme"
           id="sample-type-properties-hdr"
         >
-          <span
+          <h2
             class="domain-panel-title"
           >
             Sample Type Properties
-          </span>
+          </h2>
         </div>
         <div
           class="panel-body"
@@ -1242,11 +1242,11 @@ exports[`SampleTypePropertiesPanel include dataclass and use custom labels 1`] =
               </div>
             </div>
           </form>
-          <div
+          <h3
             class="domain-field-section-heading top-padding bottom-padding"
           >
             Lineage Settings
-          </div>
+          </h3>
           <div
             class="row"
           >
@@ -1335,11 +1335,11 @@ exports[`SampleTypePropertiesPanel include dataclass and use custom labels 1`] =
         class="domain-panel-header panel-heading domain-panel-header-expanded domain-panel-header-no-theme"
         id="sample-type-properties-hdr"
       >
-        <span
+        <h2
           class="domain-panel-title"
         >
           Sample Type Properties
-        </span>
+        </h2>
       </div>
       <div
         class="panel-body"
@@ -1484,11 +1484,11 @@ exports[`SampleTypePropertiesPanel include dataclass and use custom labels 1`] =
             </div>
           </div>
         </form>
-        <div
+        <h3
           class="domain-field-section-heading top-padding bottom-padding"
         >
           Lineage Settings
-        </div>
+        </h3>
         <div
           class="row"
         >
diff --git a/packages/components/src/internal/components/forms/PageDetailHeader.tsx b/packages/components/src/internal/components/forms/PageDetailHeader.tsx
index 2b5c301536..20fcdd9f19 100644
--- a/packages/components/src/internal/components/forms/PageDetailHeader.tsx
+++ b/packages/components/src/internal/components/forms/PageDetailHeader.tsx
@@ -63,8 +63,8 @@ export class PageDetailHeader extends PureComponent<PageDetailHeaderProps> {
                         </div>
                     )}
                     <div className={hasIcon ? 'detail__header-icon--body-container' : ''}>
-                        <h2 className="no-margin-top detail__header--name">{title}</h2>
-                        {subTitle && <h4 className="test-loc-detail-subtitle">{subTitle}</h4>}
+                        <h1 className="no-margin-top detail__header--name">{title}</h1>
+                        {subTitle && <div className="detail-subtitle">{subTitle}</div>}
                         {description && <span className="detail__header--desc">{description}</span>}
                     </div>
                 </div>
diff --git a/packages/components/src/internal/components/forms/__snapshots__/PageDetailHeader.test.tsx.snap b/packages/components/src/internal/components/forms/__snapshots__/PageDetailHeader.test.tsx.snap
index 4d32e9c578..6068f52e1c 100644
--- a/packages/components/src/internal/components/forms/__snapshots__/PageDetailHeader.test.tsx.snap
+++ b/packages/components/src/internal/components/forms/__snapshots__/PageDetailHeader.test.tsx.snap
@@ -22,11 +22,11 @@ exports[`<PageDetailHeader/> default props 1`] = `
       <div
         class="detail__header-icon--body-container"
       >
-        <h2
+        <h1
           class="no-margin-top detail__header--name"
         >
           Title
-        </h2>
+        </h1>
       </div>
     </div>
     <div
@@ -58,16 +58,16 @@ exports[`<PageDetailHeader/> with additional props 1`] = `
       <div
         class="detail__header-icon--body-container"
       >
-        <h2
+        <h1
           class="no-margin-top detail__header--name"
         >
           Title
-        </h2>
-        <h4
-          class="test-loc-detail-subtitle"
+        </h1>
+        <div
+          class="detail-subtitle"
         >
           Subtitle
-        </h4>
+        </div>
         <span
           class="detail__header--desc"
         >
@@ -100,11 +100,11 @@ exports[`<PageDetailHeader/> without icon 1`] = `
       <div
         class=""
       >
-        <h2
+        <h1
           class="no-margin-top detail__header--name"
         >
           Title
-        </h2>
+        </h1>
       </div>
     </div>
     <div
diff --git a/packages/components/src/internal/components/forms/detail/DetailDisplay.tsx b/packages/components/src/internal/components/forms/detail/DetailDisplay.tsx
index b3cae818d5..91911d5d56 100644
--- a/packages/components/src/internal/components/forms/detail/DetailDisplay.tsx
+++ b/packages/components/src/internal/components/forms/detail/DetailDisplay.tsx
@@ -257,7 +257,7 @@ export const DetailDisplay: FC<DetailDisplayProps> = memo(props => {
     if (asPanel) {
         return (
             <div className="panel panel-default">
-                <div className="panel-heading">Details</div>
+                <h2 className="panel-heading">Details</h2>
                 <div className="panel-body">{body}</div>
             </div>
         );
diff --git a/packages/components/src/internal/components/forms/detail/DetailPanelHeader.tsx b/packages/components/src/internal/components/forms/detail/DetailPanelHeader.tsx
index 7a52a986a0..150b8cced3 100644
--- a/packages/components/src/internal/components/forms/detail/DetailPanelHeader.tsx
+++ b/packages/components/src/internal/components/forms/detail/DetailPanelHeader.tsx
@@ -29,7 +29,7 @@ export const DetailPanelHeader: FC<DetailPanelHeaderProps> = memo(props => {
 
     if (editing) {
         return (
-            <div className="panel-heading">
+            <h2 className="panel-heading">
                 {verb} {title}
                 <span className="detail__edit--heading">
                     {warning !== undefined && (
@@ -39,12 +39,12 @@ export const DetailPanelHeader: FC<DetailPanelHeaderProps> = memo(props => {
                         </span>
                     )}
                 </span>
-            </div>
+            </h2>
         );
     }
 
     return (
-        <div className="panel-heading">
+        <h2 className="panel-heading">
             {title}
             <span className="detail__edit--heading">
                 {isEditable && (
@@ -56,7 +56,7 @@ export const DetailPanelHeader: FC<DetailPanelHeaderProps> = memo(props => {
                     </>
                 )}
             </span>
-        </div>
+        </h2>
     );
 });
 DetailPanelHeader.displayName = 'DetailPanelHeader';
diff --git a/packages/components/src/internal/components/forms/input/SelectInput.tsx b/packages/components/src/internal/components/forms/input/SelectInput.tsx
index ad15ed3105..9e20e140b9 100644
--- a/packages/components/src/internal/components/forms/input/SelectInput.tsx
+++ b/packages/components/src/internal/components/forms/input/SelectInput.tsx
@@ -92,7 +92,7 @@ const _customStyles = {
         if (props.isDisabled) {
             return { ...styles, color: '#8E8E8E' };
         }
-        return styles;
+        return { ...styles, color: '#767676' };
     },
 };
 
diff --git a/packages/components/src/internal/components/labelPrinting/BarTenderSettingsForm.tsx b/packages/components/src/internal/components/labelPrinting/BarTenderSettingsForm.tsx
index c6d7dd480a..7ecf3c9d1e 100644
--- a/packages/components/src/internal/components/labelPrinting/BarTenderSettingsForm.tsx
+++ b/packages/components/src/internal/components/labelPrinting/BarTenderSettingsForm.tsx
@@ -184,7 +184,7 @@ export const BarTenderSettingsForm: FC<BarTenderSettingsFormProps> = memo(props
 
     return (
         <div className="panel panel-default" title={title}>
-            <div className="panel-heading">{title}</div>
+            <h2 className="panel-heading">{title}</h2>
             <div className="panel-body">
                 {error && <Alert>{error}</Alert>}
                 {loading && <LoadingSpinner />}
diff --git a/packages/components/src/internal/components/lineage/node/DetailsList.tsx b/packages/components/src/internal/components/lineage/node/DetailsList.tsx
index fe6b404193..0dfeab4123 100644
--- a/packages/components/src/internal/components/lineage/node/DetailsList.tsx
+++ b/packages/components/src/internal/components/lineage/node/DetailsList.tsx
@@ -32,7 +32,7 @@ export const DetailsList: FC<DetailsListProps> = memo(props => {
     return (
         <details data-testid="details-list" open={open}>
             <summary className="lineage-name">
-                <h6 className="no-margin-bottom">
+                <div className="no-margin-bottom heading6">
                     {title}
                     {showCount && <span className="spacer-left">({React.Children.count(children)})</span>}
                     {headerLinks &&
@@ -44,7 +44,7 @@ export const DetailsList: FC<DetailsListProps> = memo(props => {
                                     </span>
                                 )
                         )}
-                </h6>
+                </div>
             </summary>
             <ul className="lineage-details-list">
                 {React.Children.map(children, (child, i) => {
diff --git a/packages/components/src/internal/components/lineage/node/NodeDetailHeader.tsx b/packages/components/src/internal/components/lineage/node/NodeDetailHeader.tsx
index da3f37b2b4..24421b7e40 100644
--- a/packages/components/src/internal/components/lineage/node/NodeDetailHeader.tsx
+++ b/packages/components/src/internal/components/lineage/node/NodeDetailHeader.tsx
@@ -20,7 +20,7 @@ export const DetailHeader: FC<DetailHeaderProps> = memo(({ children, header, ico
         </i>
         <div className="text__truncate">
             <div className="lineage-name">
-                <h4 className="no-margin-top lineage-name-data">{header}</h4>
+                <div className="no-margin-top lineage-name-data">{header}</div>
             </div>
             <div className="small">{children}</div>
         </div>
diff --git a/packages/components/src/internal/components/permissions/GroupDetailsPanel.tsx b/packages/components/src/internal/components/permissions/GroupDetailsPanel.tsx
index a4a605cab2..c233ec031e 100644
--- a/packages/components/src/internal/components/permissions/GroupDetailsPanel.tsx
+++ b/packages/components/src/internal/components/permissions/GroupDetailsPanel.tsx
@@ -62,7 +62,7 @@ export const GroupDetailsPanel: FC<Props> = memo(props => {
 
     return (
         <div className="panel panel-default group-details-panel">
-            <div className="panel-heading">{principal?.displayName ?? 'Group Details'}</div>
+            <h2 className="panel-heading">{principal?.displayName ?? 'Group Details'}</h2>
             <div className="panel-body">
                 {principal ? (
                     <>
diff --git a/packages/components/src/internal/components/samples/ManageSampleStatusesPanel.tsx b/packages/components/src/internal/components/samples/ManageSampleStatusesPanel.tsx
index d473ee30e5..c842b13cea 100644
--- a/packages/components/src/internal/components/samples/ManageSampleStatusesPanel.tsx
+++ b/packages/components/src/internal/components/samples/ManageSampleStatusesPanel.tsx
@@ -469,7 +469,7 @@ export const ManageSampleStatusesPanel: FC<ManageSampleStatusesPanelProps> = mem
 
     return (
         <div className="panel panel-default">
-            <div className="panel-heading">{TITLE}</div>
+            <h2 className="panel-heading">{TITLE}</h2>
             <div className="panel-body">
                 {error && <Alert>{error}</Alert>}
                 {!states && <LoadingSpinner />}
diff --git a/packages/components/src/internal/components/settings/ActiveUserLimit.tsx b/packages/components/src/internal/components/settings/ActiveUserLimit.tsx
index 262b00a60c..72270af256 100644
--- a/packages/components/src/internal/components/settings/ActiveUserLimit.tsx
+++ b/packages/components/src/internal/components/settings/ActiveUserLimit.tsx
@@ -53,7 +53,7 @@ export const ActiveUserLimit: FC<Props> = memo(props => {
 
     return (
         <div className="active-user-limit-panel panel panel-default">
-            <div className="panel-heading">Active Users</div>
+            <h2 className="panel-heading">Active Users</h2>
             <div className="panel-body">
                 <Alert>{error}</Alert>
                 {settings && (
diff --git a/packages/components/src/internal/components/settings/NameIdSettings.tsx b/packages/components/src/internal/components/settings/NameIdSettings.tsx
index 831fbcc884..56440194ca 100644
--- a/packages/components/src/internal/components/settings/NameIdSettings.tsx
+++ b/packages/components/src/internal/components/settings/NameIdSettings.tsx
@@ -280,7 +280,7 @@ export const NameIdSettingsForm: FC<NameIdSettingsFormProps> = props => {
 
     return (
         <div className="name-id-settings-panel panel panel-default">
-            <div className="panel-heading">{TITLE}</div>
+            <h2 className="panel-heading">{TITLE}</h2>
             <div className="panel-body">
                 {error !== undefined && <Alert className="name-id-setting__error">{error}</Alert>}
                 {prefixIneligibleSampleTypeNames.length > 0 && (
diff --git a/packages/components/src/internal/components/user/UserDetailsPanel.tsx b/packages/components/src/internal/components/user/UserDetailsPanel.tsx
index 6263a0c3a5..51b3e551cd 100644
--- a/packages/components/src/internal/components/user/UserDetailsPanel.tsx
+++ b/packages/components/src/internal/components/user/UserDetailsPanel.tsx
@@ -365,7 +365,7 @@ export const UserDetailsPanel: FC<Props> = props => {
 
     return (
         <div className="panel panel-default user-details-panel">
-            <div className="panel-heading">{renderHeader()}</div>
+            <h2 className="panel-heading">{renderHeader()}</h2>
             <div className="panel-body">
                 {renderBody()}
                 {!isSelfCtx && !isGroup && onUsersStateChangeComplete && renderButtons()}
diff --git a/packages/components/src/internal/components/user/__snapshots__/UserDetailHeader.test.tsx.snap b/packages/components/src/internal/components/user/__snapshots__/UserDetailHeader.test.tsx.snap
index 8a904609b8..b009cd409b 100644
--- a/packages/components/src/internal/components/user/__snapshots__/UserDetailHeader.test.tsx.snap
+++ b/packages/components/src/internal/components/user/__snapshots__/UserDetailHeader.test.tsx.snap
@@ -20,11 +20,11 @@ exports[`UserDetailHeader default properties 1`] = `
       <div
         class="detail__header-icon--body-container"
       >
-        <h2
+        <h1
           class="no-margin-top detail__header--name"
         >
           Title
-        </h2>
+        </h1>
       </div>
     </div>
     <div
@@ -57,11 +57,11 @@ exports[`UserDetailHeader optional properties 1`] = `
       <div
         class="detail__header-icon--body-container"
       >
-        <h2
+        <h1
           class="no-margin-top detail__header--name"
         >
           Title (Custom)
-        </h2>
+        </h1>
       </div>
     </div>
     <div
diff --git a/packages/components/src/internal/components/user/__snapshots__/UserDetailsPanel.test.tsx.snap b/packages/components/src/internal/components/user/__snapshots__/UserDetailsPanel.test.tsx.snap
index 490557db1b..8ab55d4f42 100644
--- a/packages/components/src/internal/components/user/__snapshots__/UserDetailsPanel.test.tsx.snap
+++ b/packages/components/src/internal/components/user/__snapshots__/UserDetailsPanel.test.tsx.snap
@@ -5,11 +5,11 @@ exports[`<UserDetailsPanel/> no principal 1`] = `
   <div
     class="panel panel-default user-details-panel"
   >
-    <div
+    <h2
       class="panel-heading"
     >
       User Details
-    </div>
+    </h2>
     <div
       class="panel-body"
     >
@@ -26,13 +26,13 @@ exports[`<UserDetailsPanel/> unknown user props 1`] = `
   <div
     class="panel panel-default user-details-panel"
   >
-    <div
+    <h2
       class="panel-heading"
     >
       <span>
         TestDisplayName
       </span>
-    </div>
+    </h2>
     <div
       class="panel-body"
     >
@@ -125,13 +125,13 @@ exports[`<UserDetailsPanel/> with principal and buttons 1`] = `
   <div
     class="panel panel-default user-details-panel"
   >
-    <div
+    <h2
       class="panel-heading"
     >
       <span>
         cnathe
       </span>
-    </div>
+    </h2>
     <div
       class="panel-body"
     >
@@ -224,13 +224,13 @@ exports[`<UserDetailsPanel/> with principal and buttons not allowDelete or allow
   <div
     class="panel panel-default user-details-panel"
   >
-    <div
+    <h2
       class="panel-heading"
     >
       <span>
         cnathe
       </span>
-    </div>
+    </h2>
     <div
       class="panel-body"
     >
@@ -316,7 +316,7 @@ exports[`<UserDetailsPanel/> with principal no buttons because of self 1`] = `
   <div
     class="panel panel-default user-details-panel"
   >
-    <div
+    <h2
       class="panel-heading"
     >
       <span>
@@ -327,7 +327,7 @@ exports[`<UserDetailsPanel/> with principal no buttons because of self 1`] = `
       >
         Active
       </span>
-    </div>
+    </h2>
     <div
       class="panel-body"
     >
@@ -544,13 +544,13 @@ exports[`<UserDetailsPanel/> with principal that isGroup 1`] = `
   <div
     class="panel panel-default user-details-panel"
   >
-    <div
+    <h2
       class="panel-heading"
     >
       <span>
         Test Group
       </span>
-    </div>
+    </h2>
     <div
       class="panel-body"
     >
diff --git a/packages/components/src/public/QueryModel/GridPanel.tsx b/packages/components/src/public/QueryModel/GridPanel.tsx
index b72ec7ef1b..a7a9803195 100644
--- a/packages/components/src/public/QueryModel/GridPanel.tsx
+++ b/packages/components/src/public/QueryModel/GridPanel.tsx
@@ -340,7 +340,7 @@ export const GridTitle: FC<GridTitleProps> = memo(props => {
     }
 
     return (
-        <div className="panel-heading view-header">
+        <h2 className="panel-heading view-header">
             {isEdited && allowViewCustomization && <span className="alert-info view-edit-alert">Edited</span>}
             {isUpdated && allowViewCustomization && <span className="alert-success view-edit-alert">Updated</span>}
             {displayTitle ?? 'Default View'}
@@ -366,7 +366,7 @@ export const GridTitle: FC<GridTitleProps> = memo(props => {
                 </SplitButton>
             )}
             {errorMsg && <span className="view-edit-error">{errorMsg}</span>}
-        </div>
+        </h2>
     );
 });
 
diff --git a/packages/components/src/public/QueryModel/TabbedGridPanel.tsx b/packages/components/src/public/QueryModel/TabbedGridPanel.tsx
index ef31a951a4..11975d1fdc 100644
--- a/packages/components/src/public/QueryModel/TabbedGridPanel.tsx
+++ b/packages/components/src/public/QueryModel/TabbedGridPanel.tsx
@@ -288,7 +288,7 @@ export const TabbedGridPanel: FC<TabbedGridPanelProps & InjectedQueryModels> = m
         <>
             {hasTabs && (
                 <div className={classNames('tabbed-grid-panel', { panel: asPanel, 'panel-default': asPanel })}>
-                    {asPanel && panelTitle && <div className="panel-heading">{panelTitle}</div>}
+                    {asPanel && panelTitle && <h2 className="panel-heading">{panelTitle}</h2>}
                     <div className={classNames('tabbed-grid-panel__body', { 'panel-body': asPanel })}>
                         <ul className="nav nav-tabs">
                             {tabOrder.map(modelId => {
diff --git a/packages/components/src/theme/app/app.scss b/packages/components/src/theme/app/app.scss
index f7bf6e1fd6..0c76351781 100644
--- a/packages/components/src/theme/app/app.scss
+++ b/packages/components/src/theme/app/app.scss
@@ -23,8 +23,16 @@
   margin: 0 0 15px 0;
   padding: 0;
   border: 0;
+
+    & > h1 {
+        font-size: 30px;
+    }
 }
 
 .menu-section-icon {
   color: color.adjust($brand-primary, $lightness: 10%);
 }
+
+.text-muted {
+    color: $text-muted;
+}
diff --git a/packages/components/src/theme/app/variables.scss b/packages/components/src/theme/app/variables.scss
index b98a37ac40..b3a0c4cdba 100644
--- a/packages/components/src/theme/app/variables.scss
+++ b/packages/components/src/theme/app/variables.scss
@@ -11,9 +11,10 @@ $brand-primary: #2679AD;
 $brand-secondary: #116596;
 $brand-danger:    #D43F3A;
 $brand-warning:   #f0ad4e;
-$brand-success: #5AA54A;
+$brand-success: #238722;
 $link-color: #0F72C2;
 $cyan: #33e0ff;
+$text-muted: #767676;
 
 //== Scaffolding
 $body-bg:               #f3f3f4 !default;
diff --git a/packages/components/src/theme/detail.scss b/packages/components/src/theme/detail.scss
index 6aed171bcb..9fd6fb364f 100644
--- a/packages/components/src/theme/detail.scss
+++ b/packages/components/src/theme/detail.scss
@@ -52,6 +52,15 @@
   }
 }
 
+.app-page-header__subtitle,
+.detail-subtitle {
+    font-weight: 500;
+    font-size: 18px;
+    line-height: 1.1;
+    margin-top: 10px;
+    margin-bottom: 10px;
+}
+
 .detail-component__active {
   background: $brand-primary;
   color: $white;
@@ -189,13 +198,14 @@
 }
 
 .detail__header--desc {
-  color: grey;
+  color: $text-color-light;
   font-style: $font-size-small;
   margin-bottom: 3px;
   white-space: pre-wrap;
 }
 
 .detail__header--name {
+    font-size: 30px;
     margin: 0;
     overflow-wrap: break-word;
 }
diff --git a/packages/components/src/theme/domainproperties.scss b/packages/components/src/theme/domainproperties.scss
index 7baa8de4d1..b5e4b48add 100644
--- a/packages/components/src/theme/domainproperties.scss
+++ b/packages/components/src/theme/domainproperties.scss
@@ -315,9 +315,19 @@
   color: white;
 }
 
+.domain-panel-title {
+    display: inline;
+    font-weight: 700;
+    font-size: 16px;
+    margin: 0;
+}
+
 .domain-field-section-heading {
   color: $gray-dark;
   font-weight: bold;
+  font-size: 14px;
+  line-height: 20px;
+  margin: 0;
 }
 
 .domain-field-padding-top {
@@ -679,11 +689,11 @@
 }
 
 .domain-panel-header-no-theme {
-  background-color: $blue-border-solid !important;
+  background-color: $brand-primary !important;
 }
 
 .domain-panel-no-theme {
-  border-color: $blue-border-solid !important;
+  border-color: $brand-primary !important;
 }
 
 .domain-panel-header-collapsed {
diff --git a/packages/components/src/theme/filter.scss b/packages/components/src/theme/filter.scss
index 304878d6a3..d252490b5b 100644
--- a/packages/components/src/theme/filter.scss
+++ b/packages/components/src/theme/filter.scss
@@ -84,7 +84,7 @@
         }
         .disabled-action-text {
             font-size: 14px;
-            color: $light-gray;
+            color: $text-muted;
         }
     }
 
diff --git a/packages/components/src/theme/lineage.scss b/packages/components/src/theme/lineage.scss
index e9be97fe90..cbcad4e432 100644
--- a/packages/components/src/theme/lineage.scss
+++ b/packages/components/src/theme/lineage.scss
@@ -47,6 +47,8 @@
 
 .lineage-name-data {
     display: inline;
+    font-size: 18px;
+    font-weight: 500;
 }
 
 .lineage-data-link {
diff --git a/packages/components/src/theme/modal.scss b/packages/components/src/theme/modal.scss
index 499ba15fc0..52b36e120c 100644
--- a/packages/components/src/theme/modal.scss
+++ b/packages/components/src/theme/modal.scss
@@ -33,3 +33,8 @@
     font-weight: normal;
     font-size: 14px;
 }
+
+.modal-title {
+    font-size: 18px;
+    font-weight: 700;
+}
diff --git a/packages/components/src/theme/navbar.scss b/packages/components/src/theme/navbar.scss
index d9d947eee5..3eb0724354 100644
--- a/packages/components/src/theme/navbar.scss
+++ b/packages/components/src/theme/navbar.scss
@@ -477,7 +477,7 @@
 
     li {
       a {
-        color: $blue-highlight !important;
+        color: $link-color !important;
         font-size: 14px;
         padding: 8px 10px 8px 0;
         white-space: nowrap;
@@ -501,7 +501,7 @@
   .navbar-nav {
       li {
           a {
-              color: $blue-highlight;
+              color: $link-color;
           }
       }
   }
diff --git a/packages/components/src/theme/notification.scss b/packages/components/src/theme/notification.scss
index 661df66b0f..baabfb887f 100644
--- a/packages/components/src/theme/notification.scss
+++ b/packages/components/src/theme/notification.scss
@@ -66,7 +66,7 @@
 }
 
 .server-notification-data {
-    color: $text-color-light;
+    color: $text-muted;
     max-width: 200px;
     text-overflow: ellipsis;
     overflow: hidden;
diff --git a/packages/components/src/theme/panel.scss b/packages/components/src/theme/panel.scss
index 3bfee4c8a9..80cd535920 100644
--- a/packages/components/src/theme/panel.scss
+++ b/packages/components/src/theme/panel.scss
@@ -26,12 +26,18 @@
         .panel-content-title,
         .panel-content-title-medium {
             display: inline-block;
+            font-weight: normal;
             font-size: 18px;
+            margin-block-start: 0;
+            margin-block-end: 0;
         }
 
         .panel-content-title-large {
             display: inline-block;
+            font-weight: normal;
             font-size: 28px;
+            margin-block-start: 0;
+            margin-block-end: 0;
         }
 
         .panel-content-caption {
@@ -43,6 +49,10 @@
 .panel-default:not(.domain-form-panel) .panel-heading,
 .panel-info .panel-heading {
     font-size: 18px;
+    font-weight: normal;
+    margin-top: 0;
+    margin-bottom: 0;
+    line-height: 1.4;
 }
 .panel-default:not(.domain-form-panel) .panel-heading {
     background-color: $white;
@@ -50,6 +60,13 @@
     margin: 15px 15px 0 15px;
     padding: 0;
 }
+.section-heading {
+    font-size: 18px;
+    font-weight: 500;
+    margin-bottom: 10px;
+    margin-top: 3px;
+}
+
 
 // revert panel heading font-size for those within a tabbed-grid-panel
 .tabbed-grid-panel .panel-heading {
@@ -79,3 +96,16 @@
 .vertical-scroll-panel {
     overflow: auto;
 }
+
+.heading4 {
+    font-size: 16px;
+    font-weight: 700;
+}
+.heading5 {
+    font-size: 14px;
+    font-weight: 700;
+}
+.heading6 {
+    font-size: 12px;
+    font-weight: 500;
+}
diff --git a/packages/components/src/theme/tabs.scss b/packages/components/src/theme/tabs.scss
index b9509f5687..1f52bf9abe 100644
--- a/packages/components/src/theme/tabs.scss
+++ b/packages/components/src/theme/tabs.scss
@@ -13,7 +13,7 @@
             & > a {
                 background-color: inherit;
                 border: 3px solid transparent;
-                color: $blue-highlight;
+                color: $link-color;
                 font-weight: bold;
                 text-align: center;
                 text-transform: uppercase;
diff --git a/packages/components/src/theme/utils.scss b/packages/components/src/theme/utils.scss
index aceeaadcf5..c7616336dc 100644
--- a/packages/components/src/theme/utils.scss
+++ b/packages/components/src/theme/utils.scss
@@ -160,7 +160,7 @@
 }
 
 .display-light {
-    color: darkgray
+    color: $text-muted;
 }
 
 .as-primary-color {
diff --git a/packages/components/src/theme/variables.scss b/packages/components/src/theme/variables.scss
index 4a1ed49b4f..8ddf6885d4 100644
--- a/packages/components/src/theme/variables.scss
+++ b/packages/components/src/theme/variables.scss
@@ -4,7 +4,7 @@ $brand-primary: #2679AD;
 $brand-secondary: #116596;
 $brand-danger:    #D43F3A;
 $brand-warning:   #f0ad4e;
-$brand-success: #5AA54A;
+$brand-success: #238722;
 
 $light-gray: #d3d3d3;
 $white: #fff;
@@ -28,6 +28,7 @@ $blue-icon-background: #CCE5FF;
 $blue-dark:   #1e4f6f;
 $text-color-gray:   #9d9d9d;
 $text-color-light:   #6B6B6B;
+$text-muted: #767676;
 
 $text-color:            $gray-dark !default;
 $link-color: #0F72C2;