diff --git a/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/components/about/about.component.html b/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/components/about/about.component.html
index c495d3ea9c3bc5a323a97053d9c3a30ad466f83c..437e586a41efdb9f1d860bf09014a62619c4a0bd 100644
--- a/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/components/about/about.component.html
+++ b/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/components/about/about.component.html
@@ -34,7 +34,7 @@
 
         <li>
           <div>
-            <button mat-raised-button color="primary">Add Curve</button>
+            <button mat-raised-button class="primary">Add Curve</button>
           </div>
 
           <span>
@@ -61,7 +61,7 @@
 
         <li>
           <div>
-            <button mat-raised-button color="warn">Clear Plot</button>
+            <button mat-raised-button class="error">Clear Plot</button>
           </div>
 
           <span>
diff --git a/projects/nshmp-apps/src/app/gmm/spectra/components/event-parameters/event-parameters.component.html b/projects/nshmp-apps/src/app/gmm/spectra/components/event-parameters/event-parameters.component.html
index f8987d5015b089807b76329a10ab3b8311671e9c..8c312367dd48d8c8c89760336fd9fd983e04a7b2 100644
--- a/projects/nshmp-apps/src/app/gmm/spectra/components/event-parameters/event-parameters.component.html
+++ b/projects/nshmp-apps/src/app/gmm/spectra/components/event-parameters/event-parameters.component.html
@@ -77,9 +77,8 @@
       <!-- Event Parameters: centered down dip -->
       <div class="grid-col-8">
         <mat-checkbox
-          class="down-dip-checkbox"
+          class="primary down-dip-checkbox"
           [formControl]="form.controls.zHypCentered"
-          color="primary"
         >
           Centered down-dip
         </mat-checkbox>
diff --git a/projects/nshmp-apps/src/app/gmm/spectra/components/path-parameters/path-parameters.component.html b/projects/nshmp-apps/src/app/gmm/spectra/components/path-parameters/path-parameters.component.html
index 06b0961a45fe468a0aa8c4a2ea9b61a219d79c60..03931310796f1b50f93f39d64b94e2b17072faf8 100644
--- a/projects/nshmp-apps/src/app/gmm/spectra/components/path-parameters/path-parameters.component.html
+++ b/projects/nshmp-apps/src/app/gmm/spectra/components/path-parameters/path-parameters.component.html
@@ -66,7 +66,6 @@
     <div class="grid-row">
       <mat-checkbox
         class="grid-col-12 rjb-rrup-checkbox"
-        color="primary"
         [formControl]="form.controls.derivePathParams"
       >
         Derive R<sub>JB</sub> and R<sub>RUP</sub>
diff --git a/projects/nshmp-apps/src/app/hazard/disagg/components/disagg-contributors/disagg-contributors.component.html b/projects/nshmp-apps/src/app/hazard/disagg/components/disagg-contributors/disagg-contributors.component.html
index 7367b3299a9e1a28ad6d4fa65ffbc8529638eb5a..0869c54509c6d0e33f75d999ad61b554253848e1 100644
--- a/projects/nshmp-apps/src/app/hazard/disagg/components/disagg-contributors/disagg-contributors.component.html
+++ b/projects/nshmp-apps/src/app/hazard/disagg/components/disagg-contributors/disagg-contributors.component.html
@@ -7,7 +7,7 @@
           <div class="print-display-none">
             <button
               mat-raised-button
-              color="primary"
+              class="primary"
               (click)="
                 service.saveContributions(componentData(), form.getRawValue())
               "
diff --git a/projects/nshmp-apps/src/app/hazard/disagg/components/disagg-data/disagg-data.component.html b/projects/nshmp-apps/src/app/hazard/disagg/components/disagg-data/disagg-data.component.html
index 60fad13793b636a249d7544c477c49aa9dd49bfd..70b49caef43f6d2e8db03254519e32ac6b16693e 100644
--- a/projects/nshmp-apps/src/app/hazard/disagg/components/disagg-data/disagg-data.component.html
+++ b/projects/nshmp-apps/src/app/hazard/disagg/components/disagg-data/disagg-data.component.html
@@ -4,9 +4,8 @@
       <!-- Export button -->
       <div class="print-display-none">
         <button
-          class="export-button"
+          class="primary export-button"
           mat-raised-button
-          color="primary"
           [disabled]="componentData().data === null"
           (click)="service.saveComponentData()"
         >
diff --git a/projects/nshmp-apps/src/app/hazard/disagg/components/disagg-summary/disagg-summary.component.html b/projects/nshmp-apps/src/app/hazard/disagg/components/disagg-summary/disagg-summary.component.html
index a49c9e9a6dd9675aca848d1e53c5cc8b4a0c67ed..19a0147c0147fa695939f4e0e20cc32f8bc1147d 100644
--- a/projects/nshmp-apps/src/app/hazard/disagg/components/disagg-summary/disagg-summary.component.html
+++ b/projects/nshmp-apps/src/app/hazard/disagg/components/disagg-summary/disagg-summary.component.html
@@ -6,7 +6,7 @@
         <div class="print-display-none">
           <button
             mat-raised-button
-            color="primary"
+            class="primary"
             (click)="service.saveSummary(componentData(), form.getRawValue())"
           >
             Export as Text
diff --git a/projects/nshmp-apps/src/app/hazard/disagg/components/plots/plots.component.html b/projects/nshmp-apps/src/app/hazard/disagg/components/plots/plots.component.html
index edd15e955156f04b1603574a53b9597484189c97..57ffd0284a5ee62ccdf8250f403ae54a1d36bef2 100644
--- a/projects/nshmp-apps/src/app/hazard/disagg/components/plots/plots.component.html
+++ b/projects/nshmp-apps/src/app/hazard/disagg/components/plots/plots.component.html
@@ -3,7 +3,7 @@
   <div>
     <button
       mat-raised-button
-      color="primary"
+      class="primary"
       [disabled]="disaggData() === null"
       (click)="exportReport()"
     >
@@ -14,9 +14,8 @@
   <!-- Export summary button -->
   <div>
     <button
-      class="export-button"
+      class="primary export-button"
       mat-raised-button
-      color="primary"
       [disabled]="disaggData() === null"
       (click)="service.saveSummaryReport()"
     >
diff --git a/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/about/about.component.html b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/about/about.component.html
index 12a9708f49ce9aba30d3bb1c3d58d01b81783e1c..7d566fa0a5d5b31831a6377a1c9507218fd66873 100644
--- a/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/about/about.component.html
+++ b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/about/about.component.html
@@ -31,7 +31,7 @@
 
         <li>
           <div>
-            <button mat-raised-button color="primary">Show Logs</button>
+            <button mat-raised-button class="primary">Show Logs</button>
           </div>
 
           <span>
@@ -58,7 +58,7 @@
 
         <li>
           <div>
-            <button mat-raised-button color="warn">Terminate Job</button>
+            <button mat-raised-button class="error">Terminate Job</button>
           </div>
 
           <span>
diff --git a/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/control-panel/control-panel.component.html b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/control-panel/control-panel.component.html
index d5ded724e9343c090f7fbbe90199f892fba1fa95..2396d198d862701ebe3235781dad5b4bca57bc34 100644
--- a/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/control-panel/control-panel.component.html
+++ b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/control-panel/control-panel.component.html
@@ -13,9 +13,8 @@
   >
     <div class="grid-col-6 padding-x-1">
       <button
-        class="grid-col-12"
+        class="primary grid-col-12"
         mat-raised-button
-        color="primary"
         type="submit"
         [disabled]="form?.invalid"
       >
@@ -25,9 +24,8 @@
 
     <div class="grid-col-6 padding-x-1">
       <button
-        class="grid-col-12"
+        class="error grid-col-12"
         mat-raised-button
-        color="warn"
         type="button"
         [disabled]="logResponse() === null"
         (click)="service.callJobInfoService()"
diff --git a/projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/about/about.component.html b/projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/about/about.component.html
index d37f102ff22e06b5ec21c79aa56271fb108eb2bc..964d2a464ee040df8b284466769088be86ee362f 100644
--- a/projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/about/about.component.html
+++ b/projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/about/about.component.html
@@ -34,7 +34,7 @@
 
         <li>
           <div>
-            <button mat-raised-button color="primary">Get Job History</button>
+            <button mat-raised-button class="primary">Get Job History</button>
           </div>
 
           <span>
diff --git a/projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/control-panel/control-panel.component.html b/projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/control-panel/control-panel.component.html
index 905b0609ce6f04a5198be5f06da5391e91bb2144..e5ce74a03d5906dc78c52b34c849dbe87b5f68e4 100644
--- a/projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/control-panel/control-panel.component.html
+++ b/projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/control-panel/control-panel.component.html
@@ -27,9 +27,8 @@
   >
     <div class="grid-col-12 padding-x-1">
       <button
-        class="grid-col-12"
+        class="primary grid-col-12"
         mat-raised-button
-        color="primary"
         type="submit"
         [disabled]="form.invalid"
       >
diff --git a/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/history/history.component.html b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/history/history.component.html
index c3018fa9ad6098e5f978e2cab24a336db9bf1d5a..a9d1ea24a91dc615374d80f49aa03fc4f1d0680f 100644
--- a/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/history/history.component.html
+++ b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/history/history.component.html
@@ -96,7 +96,7 @@
   <div class="padding-y-2">
     <button
       mat-raised-button
-      color="primary"
+      class="primary"
       type="button"
       [disabled]="history().length === 0"
       (click)="service.clearHistory()"
diff --git a/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/job-submitted/job-submitted.component.html b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/job-submitted/job-submitted.component.html
index 4ea7f4b9b89db561fac33e76c76680cf6655aee8..8841a66f1c2fe408a21f31560c4269c97df64087 100644
--- a/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/job-submitted/job-submitted.component.html
+++ b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/job-submitted/job-submitted.component.html
@@ -30,7 +30,7 @@
         @if (serviceResponse?.response; as response) {
           <button
             mat-raised-button
-            color="primary"
+            class="primary"
             (click)="checkJob(response)"
           >
             Check on Job
@@ -43,10 +43,9 @@
 
 <div mat-dialog-actions>
   <button
-    class="float-right"
+    class="secondary float-right"
     mat-raised-button
     [mat-dialog-close]="true"
-    color="accent"
   >
     Close
   </button>
diff --git a/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/components/about/about.component.html b/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/components/about/about.component.html
index d1f384294926e495a65f7333160e012002c5baba..3fe991168f14f73b327f04ae832a6132aa0a398a 100644
--- a/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/components/about/about.component.html
+++ b/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/components/about/about.component.html
@@ -34,7 +34,7 @@
 
         <li>
           <div>
-            <button mat-raised-button color="warn">Terminate Job</button>
+            <button mat-raised-button class="error">Terminate Job</button>
           </div>
 
           <span>
diff --git a/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/control-panel/control-panel.component.html b/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/control-panel/control-panel.component.html
index 1defdd8025f3e43687b10a8c8ea75787b22e9eb3..31658e81353166e52b197496859fc46abc5ee320 100644
--- a/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/control-panel/control-panel.component.html
+++ b/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/control-panel/control-panel.component.html
@@ -120,7 +120,7 @@
     extended
     (click)="service.addLocationForm()"
     type="button"
-    color="secondary"
+    class="secondary"
   >
     <mat-icon>add</mat-icon>
     Add additional location
diff --git a/projects/nshmp-apps/src/app/source/mfd/components/control-panel/control-panel.component.html b/projects/nshmp-apps/src/app/source/mfd/components/control-panel/control-panel.component.html
index 36c03aa08c323652eabee9fc15e619cd74927ef8..1c5323702c4373ad73bf881e35de85b9ea04307f 100644
--- a/projects/nshmp-apps/src/app/source/mfd/components/control-panel/control-panel.component.html
+++ b/projects/nshmp-apps/src/app/source/mfd/components/control-panel/control-panel.component.html
@@ -49,20 +49,14 @@
     <div class="plot-options">
       <!-- Cumulative -->
       <div class="grid-row">
-        <mat-slide-toggle
-          color="primary"
-          [formControl]="formGroup.controls.cumulative"
-        >
+        <mat-slide-toggle [formControl]="formGroup.controls.cumulative">
           Cumulative
         </mat-slide-toggle>
       </div>
 
       <!-- Weighted MFDs -->
       <div class="grid-row">
-        <mat-slide-toggle
-          color="primary"
-          [formControl]="formGroup.controls.weightedMfds"
-        >
+        <mat-slide-toggle [formControl]="formGroup.controls.weightedMfds">
           Weighted MFDs
         </mat-slide-toggle>
       </div>
diff --git a/projects/nshmp-apps/src/app/source/model-maps/components/about/about.component.html b/projects/nshmp-apps/src/app/source/model-maps/components/about/about.component.html
index ab077dcbbe4a42ac00c5079a26935a73bcdeac8c..67b23cb0e5f456f848378a7bdffbdb7f70d32c48 100644
--- a/projects/nshmp-apps/src/app/source/model-maps/components/about/about.component.html
+++ b/projects/nshmp-apps/src/app/source/model-maps/components/about/about.component.html
@@ -23,7 +23,7 @@
       <ul class="icon-list">
         <li>
           <div>
-            <mat-slide-toggle color="primary" />
+            <mat-slide-toggle />
           </div>
 
           <span> Click on the toggle to toggle visibility of that layer. </span>
diff --git a/projects/nshmp-apps/src/app/source/model-maps/components/info-popup/info-popup.component.html b/projects/nshmp-apps/src/app/source/model-maps/components/info-popup/info-popup.component.html
index 9fa0c207b355c476ad5e39a31f2615f4a944b5c0..d96409433ef97c1a0efb6aec2593f62cd76d13b6 100644
--- a/projects/nshmp-apps/src/app/source/model-maps/components/info-popup/info-popup.component.html
+++ b/projects/nshmp-apps/src/app/source/model-maps/components/info-popup/info-popup.component.html
@@ -48,7 +48,7 @@
       </mat-card-content>
 
       <mat-card-footer align="end">
-        <button mat-raised-button color="primary" (click)="close()">
+        <button mat-raised-button class="primary" (click)="close()">
           Close
         </button>
       </mat-card-footer>
@@ -105,7 +105,7 @@
       </mat-card-content>
 
       <mat-card-footer align="end">
-        <button mat-raised-button color="primary" (click)="close()">
+        <button mat-raised-button class="primary" (click)="close()">
           Close
         </button>
       </mat-card-footer>