From f1bfb40d7357d7e0be4b265e29a42ab5a737e017 Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Fri, 23 Jan 2026 19:56:56 +0100
Subject: [PATCH] Feature/migrate from Angular Material design 2 to 3 (#6163)

* Migrate from M2 to M3

* Update changelog

---------

Co-authored-by: Kenrick Tandrian <60643640+KenTandrian@users.noreply.github.com>
---
 CHANGELOG.md                                  |   6 +
 apps/client/src/app/app.component.ts          |   2 +
 .../components/header/header.component.html   |  60 ++-
 .../components/header/header.component.scss   |   2 +-
 apps/client/src/styles.scss                   |  83 +--
 apps/client/src/styles/m3-theme.scss          | 155 ++++++
 apps/client/src/styles/theme.scss             | 506 ++++++++++++++----
 7 files changed, 616 insertions(+), 198 deletions(-)
 create mode 100644 apps/client/src/styles/m3-theme.scss

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4e7bbb40b..f6c052bd7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Next
+
+### Changed
+
+- Migrated from _Material Design_ 2 to _Material Design_ 3
+
 ## Unreleased
 
 ### Changed
diff --git a/apps/client/src/app/app.component.ts b/apps/client/src/app/app.component.ts
index a4af01124..3410bc274 100644
--- a/apps/client/src/app/app.component.ts
+++ b/apps/client/src/app/app.component.ts
@@ -336,7 +336,9 @@ export class GfAppComponent implements OnDestroy, OnInit {
 
     if (isDarkTheme) {
       this.document.body.classList.add('theme-dark');
+      this.document.body.classList.remove('theme-light');
     } else {
+      this.document.body.classList.add('theme-light');
       this.document.body.classList.remove('theme-dark');
     }
 
diff --git a/apps/client/src/app/components/header/header.component.html b/apps/client/src/app/components/header/header.component.html
index 501119b31..6dae99227 100644
--- a/apps/client/src/app/components/header/header.component.html
+++ b/apps/client/src/app/components/header/header.component.html
@@ -2,7 +2,7 @@
   @if (user) {
     <div class="d-flex h-100 logo-container" [ngClass]="{ filled: hasTabs }">
       <a
-        class="align-items-center justify-content-start rounded-0"
+        class="align-items-center h-100 justify-content-start rounded-0"
         mat-button
         [ngClass]="{ 'w-100': hasTabs }"
         [routerLink]="['/']"
@@ -15,9 +15,9 @@
     <ul class="align-items-center d-flex list-inline m-0 px-2">
       <li class="list-inline-item">
         <a
-          class="d-none d-sm-block"
+          class="d-none d-sm-block rounded"
           i18n
-          mat-flat-button
+          mat-button
           [ngClass]="{
             'font-weight-bold':
               currentRoute === internalRoutes.home.path ||
@@ -32,9 +32,9 @@
       </li>
       <li class="list-inline-item">
         <a
-          class="d-none d-sm-block"
+          class="d-none d-sm-block rounded"
           i18n
-          mat-flat-button
+          mat-button
           [ngClass]="{
             'font-weight-bold': currentRoute === internalRoutes.portfolio.path,
             'text-decoration-underline':
@@ -46,9 +46,9 @@
       </li>
       <li class="list-inline-item">
         <a
-          class="d-none d-sm-block"
+          class="d-none d-sm-block rounded"
           i18n
-          mat-flat-button
+          mat-button
           [ngClass]="{
             'font-weight-bold': currentRoute === internalRoutes.accounts.path,
             'text-decoration-underline':
@@ -61,9 +61,9 @@
       @if (hasPermissionToAccessAdminControl) {
         <li class="list-inline-item">
           <a
-            class="d-none d-sm-block"
+            class="d-none d-sm-block rounded"
             i18n
-            mat-flat-button
+            mat-button
             [ngClass]="{
               'font-weight-bold':
                 currentRoute === internalRoutes.adminControl.path,
@@ -77,9 +77,9 @@
       }
       <li class="list-inline-item">
         <a
-          class="d-none d-sm-block"
+          class="d-none d-sm-block rounded"
           i18n
-          mat-flat-button
+          mat-button
           [ngClass]="{
             'font-weight-bold': currentRoute === routeResources,
             'text-decoration-underline': currentRoute === routeResources
@@ -93,8 +93,8 @@
       ) {
         <li class="list-inline-item">
           <a
-            class="d-none d-sm-block"
-            mat-flat-button
+            class="d-none d-sm-block rounded"
+            mat-button
             [ngClass]="{
               'font-weight-bold': currentRoute === routePricing,
               'text-decoration-underline': currentRoute === routePricing
@@ -112,9 +112,9 @@
       }
       <li class="list-inline-item">
         <a
-          class="d-none d-sm-block"
+          class="d-none d-sm-block rounded"
           i18n
-          mat-flat-button
+          mat-button
           [ngClass]="{
             'font-weight-bold': currentRoute === routeAbout,
             'text-decoration-underline': currentRoute === routeAbout
@@ -164,7 +164,7 @@
       <li class="list-inline-item">
         <button
           class="no-min-width px-1"
-          mat-flat-button
+          mat-button
           [matMenuTriggerFor]="accountMenu"
           (menuClosed)="onMenuClosed()"
           (menuOpened)="onMenuOpened()"
@@ -334,7 +334,7 @@
   @if (user === null) {
     <div class="d-flex h-100 logo-container" [ngClass]="{ filled: hasTabs }">
       <a
-        class="align-items-center justify-content-start rounded-0"
+        class="align-items-center h-100 justify-content-start rounded-0"
         mat-button
         [ngClass]="{ 'w-100': hasTabs }"
         [routerLink]="['/']"
@@ -350,9 +350,9 @@
     <ul class="align-items-center d-flex list-inline m-0 px-2">
       <li class="list-inline-item">
         <a
-          class="d-none d-sm-block"
+          class="d-none d-sm-block rounded"
           i18n
-          mat-flat-button
+          mat-button
           [ngClass]="{
             'font-weight-bold': currentRoute === routeFeatures,
             'text-decoration-underline': currentRoute === routeFeatures
@@ -363,9 +363,9 @@
       </li>
       <li class="list-inline-item">
         <a
-          class="d-none d-sm-block"
+          class="d-none d-sm-block rounded"
           i18n
-          mat-flat-button
+          mat-button
           [ngClass]="{
             'font-weight-bold': currentRoute === routeAbout,
             'text-decoration-underline': currentRoute === routeAbout
@@ -377,8 +377,8 @@
       @if (hasPermissionForSubscription) {
         <li class="list-inline-item">
           <a
-            class="d-sm-block"
-            mat-flat-button
+            class="d-sm-block rounded"
+            mat-button
             [ngClass]="{
               'font-weight-bold': currentRoute === routePricing,
               'text-decoration-underline': currentRoute === routePricing
@@ -397,9 +397,9 @@
       @if (hasPermissionToAccessFearAndGreedIndex) {
         <li class="list-inline-item">
           <a
-            class="d-none d-sm-block"
+            class="d-none d-sm-block rounded"
             i18n
-            mat-flat-button
+            mat-button
             [ngClass]="{
               'font-weight-bold': currentRoute === routeMarkets,
               'text-decoration-underline': currentRoute === routeMarkets
@@ -413,19 +413,23 @@
         <a
           class="d-none d-sm-block no-min-width p-1"
           href="https://github.com/ghostfolio/ghostfolio"
-          mat-flat-button
+          mat-button
           ><ion-icon name="logo-github"
         /></a>
       </li>
       <li class="list-inline-item">
-        <button class="d-sm-block" mat-flat-button (click)="openLoginDialog()">
+        <button
+          class="d-sm-block rounded"
+          mat-button
+          (click)="openLoginDialog()"
+        >
           <ng-container i18n>Sign in</ng-container>
         </button>
       </li>
       @if (currentRoute !== 'register' && hasPermissionToCreateUser) {
         <li class="list-inline-item ml-1">
           <a
-            class="d-none d-sm-block"
+            class="d-none d-sm-block px-3 rounded"
             color="primary"
             i18n
             mat-flat-button
diff --git a/apps/client/src/app/components/header/header.component.scss b/apps/client/src/app/components/header/header.component.scss
index 97f8cd354..28927abec 100644
--- a/apps/client/src/app/components/header/header.component.scss
+++ b/apps/client/src/app/components/header/header.component.scss
@@ -24,7 +24,7 @@
     }
 
     .mdc-button {
-      height: 100%;
+      color: var(--mdc-text-button-label-text-color);
 
       &:not(.mat-primary) {
         background-color: transparent;
diff --git a/apps/client/src/styles.scss b/apps/client/src/styles.scss
index b7a031bfa..6256fe2df 100644
--- a/apps/client/src/styles.scss
+++ b/apps/client/src/styles.scss
@@ -1,3 +1,5 @@
+@use '@angular/material' as mat;
+
 @import './styles/bootstrap';
 @import './styles/table';
 @import './styles/variables';
@@ -256,46 +258,10 @@ body {
       }
     }
 
-    .mat-mdc-card {
-      --mat-card-elevated-container-color: var(--dark-background);
-      --mat-card-outlined-container-color: var(--dark-background);
-    }
-
-    .mat-mdc-fab {
-      &.mat-primary {
-        --mat-fab-icon-color: rgba(var(--dark-primary-text));
-        --mat-mdc-fab-color: rgba(var(--dark-primary-text));
-      }
-    }
-
     .mat-mdc-paginator {
       background-color: rgba(var(--palette-foreground-base-dark), 0.02);
     }
 
-    .mat-mdc-slide-toggle {
-      .mdc-switch__track {
-        --mat-slide-toggle-selected-focus-track-color: rgba(
-          255,
-          255,
-          255,
-          0.12
-        );
-        --mat-slide-toggle-selected-hover-track-color: rgba(
-          255,
-          255,
-          255,
-          0.12
-        );
-        --mat-slide-toggle-selected-pressed-track-color: rgba(
-          255,
-          255,
-          255,
-          0.12
-        );
-        --mat-slide-toggle-selected-track-color: rgba(255, 255, 255, 0.12);
-      }
-    }
-
     .mdc-button {
       &.mat-accent,
       &.mat-primary {
@@ -305,10 +271,6 @@ body {
 
     .page {
       &.has-tabs {
-        .mat-mdc-tab-nav-bar {
-          --mat-tab-inactive-label-text-color: rgba(var(--light-primary-text));
-        }
-
         @media (min-width: 576px) {
           .mat-mdc-tab-header {
             background-color: rgba(var(--palette-foreground-base-dark), 0.02);
@@ -443,8 +405,6 @@ ngx-skeleton-loader {
 
 .mat-mdc-card {
   .mat-mdc-card-title {
-    --mat-card-title-text-line-height: 1.2;
-
     margin-bottom: 0.5rem;
   }
 }
@@ -468,15 +428,6 @@ ngx-skeleton-loader {
   }
 }
 
-.mat-mdc-fab {
-  color: var(--mat-mdc-fab-color, inherit) !important;
-
-  &.mat-primary {
-    --mat-fab-icon-color: rgba(var(--light-primary-text));
-    --mat-mdc-fab-color: rgba(var(--light-primary-text));
-  }
-}
-
 .mat-mdc-form-field {
   &.without-hint {
     .mat-mdc-form-field-subscript-wrapper {
@@ -517,15 +468,6 @@ ngx-skeleton-loader {
   }
 }
 
-.mat-mdc-slide-toggle {
-  .mdc-switch__track {
-    --mat-slide-toggle-selected-focus-track-color: rgba(0, 0, 0, 0.12);
-    --mat-slide-toggle-selected-hover-track-color: rgba(0, 0, 0, 0.12);
-    --mat-slide-toggle-selected-pressed-track-color: rgba(0, 0, 0, 0.12);
-    --mat-slide-toggle-selected-track-color: rgba(0, 0, 0, 0.12);
-  }
-}
-
 .mat-stepper-vertical,
 .mat-stepper-horizontal {
   background: transparent !important;
@@ -583,32 +525,23 @@ ngx-skeleton-loader {
       }
     }
 
-    .mat-mdc-tab-nav-bar {
-      --mat-tab-active-focus-indicator-color: transparent;
-      --mat-tab-active-hover-indicator-color: transparent;
-      --mat-tab-inactive-label-text-color: rgba(var(--dark-primary-text));
-      --mat-tab-active-indicator-color: transparent;
-    }
-
     .mat-mdc-tab-nav-panel {
       padding: 2rem 0;
     }
 
-    @media (max-width: 575.98px) {
-      .mat-mdc-tab-link {
-        --mat-tab-container-height: 3rem;
-      }
-    }
-
     @media (min-width: 576px) {
       flex-direction: row-reverse;
 
+      @include mat.tabs-overrides(
+        (
+          divider-height: 0
+        )
+      );
+
       .mat-mdc-tab-header {
         background-color: rgba(var(--palette-foreground-base), 0.02);
         padding: 2rem 0;
         width: 14rem;
-        --mat-tab-label-text-tracking: normal;
-        --mat-tab-container-height: 2rem;
 
         .mat-mdc-tab-links {
           flex-direction: column;
diff --git a/apps/client/src/styles/m3-theme.scss b/apps/client/src/styles/m3-theme.scss
new file mode 100644
index 000000000..69be1fd7c
--- /dev/null
+++ b/apps/client/src/styles/m3-theme.scss
@@ -0,0 +1,155 @@
+// This file was generated by running 'ng generate @angular/material:m3-theme'.
+// Proceed with caution if making changes to this file.
+
+@use 'sass:map';
+@use '@angular/material' as mat;
+
+// Note: Color palettes are generated from primary: #36cfcc, secondary: #3686cf
+$_palettes: (
+  primary: (
+    0: #000000,
+    10: #00201f,
+    20: #003736,
+    25: #004342,
+    30: #00504e,
+    35: #005d5b,
+    40: #006a68,
+    50: #008583,
+    60: #00a19f,
+    70: #11bebc,
+    80: #47dbd7,
+    90: #6bf7f4,
+    95: #affffc,
+    98: #e3fffd,
+    99: #f2fffe,
+    100: #ffffff
+  ),
+  secondary: (
+    0: #000000,
+    10: #001d36,
+    20: #003258,
+    25: #003d6a,
+    30: #00497c,
+    35: #00558f,
+    40: #0061a3,
+    50: #267bc3,
+    60: #4895df,
+    70: #66b0fb,
+    80: #9ecaff,
+    90: #d1e4ff,
+    95: #e9f1ff,
+    98: #f8f9ff,
+    99: #fdfcff,
+    100: #ffffff
+  ),
+  tertiary: (
+    0: #000000,
+    10: #031d35,
+    20: #1b324b,
+    25: #273d57,
+    30: #324863,
+    35: #3e546f,
+    40: #4a607b,
+    50: #637995,
+    60: #7c92b0,
+    70: #97adcc,
+    80: #b2c8e8,
+    90: #d2e4ff,
+    95: #eaf1ff,
+    98: #f8f9ff,
+    99: #fdfcff,
+    100: #ffffff
+  ),
+  neutral: (
+    0: #000000,
+    10: #191c1c,
+    20: #2d3131,
+    25: #383c3c,
+    30: #444747,
+    35: #4f5353,
+    40: #5b5f5e,
+    50: #747877,
+    60: #8e9191,
+    70: #a9acab,
+    80: #c4c7c6,
+    90: #e0e3e2,
+    95: #eff1f0,
+    98: #f7faf9,
+    99: #fafdfc,
+    100: #ffffff,
+    4: #0b0f0f,
+    6: #101414,
+    12: #1d2020,
+    17: #272b2a,
+    22: #323535,
+    24: #363a39,
+    87: #d8dada,
+    92: #e6e9e8,
+    94: #eceeed,
+    96: #f2f4f3
+  ),
+  neutral-variant: (
+    0: #000000,
+    10: #141d1d,
+    20: #293232,
+    25: #343d3d,
+    30: #3f4948,
+    35: #4a5454,
+    40: #566060,
+    50: #6f7978,
+    60: #889392,
+    70: #a3adac,
+    80: #bec9c7,
+    90: #dae5e3,
+    95: #e8f3f2,
+    98: #f1fbfa,
+    99: #f4fefd,
+    100: #ffffff
+  ),
+  error: (
+    0: #000000,
+    10: #410002,
+    20: #690005,
+    25: #7e0007,
+    30: #93000a,
+    35: #a80710,
+    40: #ba1a1a,
+    50: #de3730,
+    60: #ff5449,
+    70: #ff897d,
+    80: #ffb4ab,
+    90: #ffdad6,
+    95: #ffedea,
+    98: #fff8f7,
+    99: #fffbff,
+    100: #ffffff
+  )
+);
+
+$_rest: (
+  secondary: map.get($_palettes, secondary),
+  neutral: map.get($_palettes, neutral),
+  neutral-variant: map.get($_palettes, neutral-variant),
+  error: map.get($_palettes, error)
+);
+$_primary: map.merge(map.get($_palettes, primary), $_rest);
+$_tertiary: map.merge(map.get($_palettes, tertiary), $_rest);
+
+$light-theme: mat.define-theme(
+  (
+    color: (
+      theme-type: light,
+      primary: $_primary,
+      tertiary: $_tertiary
+    )
+  )
+);
+$dark-theme: mat.define-theme(
+  (
+    color: (
+      theme-type: dark,
+      primary: $_primary,
+      tertiary: $_tertiary
+    )
+  )
+);
diff --git a/apps/client/src/styles/theme.scss b/apps/client/src/styles/theme.scss
index 8dd6d8e36..7de0b0cf3 100644
--- a/apps/client/src/styles/theme.scss
+++ b/apps/client/src/styles/theme.scss
@@ -1,109 +1,427 @@
 @use '@angular/material' as mat;
+@use 'sass:map';
 
-@use './variables.scss' as variables;
-
-$gf-primary: (
-  50: var(--gf-theme-primary-50),
-  100: var(--gf-theme-primary-100),
-  200: var(--gf-theme-primary-200),
-  300: var(--gf-theme-primary-300),
-  400: var(--gf-theme-primary-400),
-  500: var(--gf-theme-primary-500),
-  600: var(--gf-theme-primary-600),
-  700: var(--gf-theme-primary-700),
-  800: var(--gf-theme-primary-800),
-  900: var(--gf-theme-primary-900),
-  A100: var(--gf-theme-primary-A100),
-  A200: var(--gf-theme-primary-A200),
-  A400: var(--gf-theme-primary-A400),
-  A700: var(--gf-theme-primary-A700),
-  contrast: (
-    50: variables.$dark-primary-text,
-    100: variables.$dark-primary-text,
-    200: variables.$dark-primary-text,
-    300: variables.$light-primary-text,
-    400: variables.$light-primary-text,
-    500: variables.$light-primary-text,
-    600: variables.$light-primary-text,
-    700: variables.$light-primary-text,
-    800: variables.$light-primary-text,
-    900: variables.$light-primary-text,
-    A100: variables.$dark-primary-text,
-    A200: variables.$light-primary-text,
-    A400: variables.$light-primary-text,
-    A700: variables.$light-primary-text
-  )
-);
+$dark-primary-text: rgba(black, 0.87);
+$light-primary-text: white;
 
-$gf-secondary: (
-  50: var(--gf-theme-secondary-50),
-  100: var(--gf-theme-secondary-100),
-  200: var(--gf-theme-secondary-200),
-  300: var(--gf-theme-secondary-300),
-  400: var(--gf-theme-secondary-400),
-  500: var(--gf-theme-secondary-500),
-  600: var(--gf-theme-secondary-600),
-  700: var(--gf-theme-secondary-700),
-  800: var(--gf-theme-secondary-800),
-  900: var(--gf-theme-secondary-900),
-  A100: var(--gf-theme-secondary-A100),
-  A200: var(--gf-theme-secondary-A200),
-  A400: var(--gf-theme-secondary-A400),
-  A700: var(--gf-theme-secondary-A700),
-  contrast: (
-    50: variables.$dark-primary-text,
-    100: variables.$dark-primary-text,
-    200: variables.$dark-primary-text,
-    300: variables.$light-primary-text,
-    400: variables.$light-primary-text,
-    500: variables.$light-primary-text,
-    600: variables.$light-primary-text,
-    700: variables.$light-primary-text,
-    800: variables.$light-primary-text,
-    900: variables.$light-primary-text,
-    A100: variables.$dark-primary-text,
-    A200: variables.$light-primary-text,
-    A400: variables.$light-primary-text,
-    A700: variables.$light-primary-text
+$_palettes: (
+  primary: (
+    0: #000000,
+    10: #00201f,
+    20: #003736,
+    25: #004342,
+    30: #00504e,
+    35: #005d5b,
+    40: #006a68,
+    50: #008583,
+    60: #00a19f,
+    70: #11bebc,
+    80: #47dbd7,
+    90: #6bf7f4,
+    95: #affffc,
+    98: #e3fffd,
+    99: #f2fffe,
+    100: #ffffff
+  ),
+  secondary: (
+    0: #000000,
+    10: #001d36,
+    20: #003258,
+    25: #003d6a,
+    30: #00497c,
+    35: #00558f,
+    40: #0061a3,
+    50: #267bc3,
+    60: #4895df,
+    70: #66b0fb,
+    80: #9ecaff,
+    90: #d1e4ff,
+    95: #e9f1ff,
+    98: #f8f9ff,
+    99: #fdfcff,
+    100: #ffffff
+  ),
+  tertiary: (
+    0: #000000,
+    10: #031d35,
+    20: #1b324b,
+    25: #273d57,
+    30: #324863,
+    35: #3e546f,
+    40: #4a607b,
+    50: #637995,
+    60: #7c92b0,
+    70: #97adcc,
+    80: #b2c8e8,
+    90: #d2e4ff,
+    95: #eaf1ff,
+    98: #f8f9ff,
+    99: #fdfcff,
+    100: #ffffff
+  ),
+  neutral: (
+    0: #000000,
+    10: #191c1c,
+    20: #2d3131,
+    25: #383c3c,
+    30: #444747,
+    35: #4f5353,
+    40: #5b5f5e,
+    50: #747877,
+    60: #8e9191,
+    70: #a9acab,
+    80: #c4c7c6,
+    90: #e0e3e2,
+    95: #eff1f0,
+    98: #f7faf9,
+    99: #fafdfc,
+    100: #ffffff,
+    4: #0b0f0f,
+    6: #101414,
+    12: #1d2020,
+    17: #272b2a,
+    22: #323535,
+    24: #363a39,
+    87: #d8dada,
+    92: #e6e9e8,
+    94: #eceeed,
+    96: #f2f4f3
+  ),
+  neutral-variant: (
+    0: #000000,
+    10: #141d1d,
+    20: #293232,
+    25: #343d3d,
+    30: #3f4948,
+    35: #4a5454,
+    40: #566060,
+    50: #6f7978,
+    60: #889392,
+    70: #a3adac,
+    80: #bec9c7,
+    90: #dae5e3,
+    95: #e8f3f2,
+    98: #f1fbfa,
+    99: #f4fefd,
+    100: #ffffff
+  ),
+  error: (
+    0: #000000,
+    10: #410002,
+    20: #690005,
+    25: #7e0007,
+    30: #93000a,
+    35: #a80710,
+    40: #ba1a1a,
+    50: #de3730,
+    60: #ff5449,
+    70: #ff897d,
+    80: #ffb4ab,
+    90: #ffdad6,
+    95: #ffedea,
+    98: #fff8f7,
+    99: #fffbff,
+    100: #ffffff
   )
 );
 
-$gf-typography: mat.m2-define-typography-config();
-
-// Create default theme
-$gf-theme-default: mat.m2-define-light-theme(
-  (
-    color: (
-      accent: mat.m2-define-palette($gf-secondary, 500, 900, A100),
-      primary: mat.m2-define-palette($gf-primary)
-    ),
-    density: -3,
-    typography: $gf-typography
-  )
+$_rest: (
+  secondary: map.get($_palettes, secondary),
+  neutral: map.get($_palettes, neutral),
+  neutral-variant: map.get($_palettes, neutral-variant),
+  error: map.get($_palettes, error)
 );
+$_primary: map.merge(map.get($_palettes, primary), $_rest);
+$_tertiary: map.merge(map.get($_palettes, tertiary), $_rest);
 
-@include mat.all-component-themes($gf-theme-default);
-
-// Create dark theme
-$gf-theme-dark: mat.m2-define-dark-theme(
-  (
-    color: (
-      accent: mat.m2-define-palette($gf-secondary, 500, 900, A100),
-      primary: mat.m2-define-palette($gf-primary)
-    ),
-    density: -3,
-    typography: $gf-typography
-  )
-);
+@include mat.app-background();
+@include mat.button-density(0);
+@include mat.elevation-classes();
+@include mat.table-density(-1);
+
+// $gf-typography: mat.m2-define-typography-config();
+
+.theme-light {
+  $gf-theme-default: mat.define-theme(
+    (
+      color: (
+        primary: $_primary,
+        theme-type: light,
+        tertiary: $_tertiary
+      ),
+      density: (
+        scale: -3
+      ),
+      // typography: $gf-typography
+    )
+  );
+
+  @include mat.all-component-themes($gf-theme-default);
+
+  @include mat.autocomplete-overrides(
+    (
+      background-color: var(--light-background)
+    )
+  );
+
+  @include mat.button-overrides(
+    (
+      outlined-label-text-color: var(--dark-primary-text),
+      text-label-text-color: var(--dark-primary-text)
+    )
+  );
+
+  @include mat.button-toggle-overrides(
+    (
+      selected-state-background-color: rgba(var(--dark-dividers)),
+      selected-state-text-color: var(--dark-primary-text)
+    )
+  );
+
+  @include mat.card-overrides(
+    (
+      outlined-container-color: var(--light-background),
+      outlined-outline-color: rgba(var(--dark-dividers)),
+      title-text-line-height: 1.2
+    )
+  );
+
+  @include mat.datepicker-overrides(
+    (
+      calendar-container-background-color: var(--light-background)
+    )
+  );
+
+  @include mat.dialog-overrides(
+    (
+      container-color: var(--light-background)
+    )
+  );
+
+  @include mat.menu-overrides(
+    (
+      container-color: var(--light-background)
+    )
+  );
+
+  @include mat.select-overrides(
+    (
+      panel-background-color: var(--light-background)
+    )
+  );
+
+  @include mat.slide-toggle-overrides(
+    (
+      selected-track-outline-color: rgba(var(--dark-dividers)),
+      track-outline-color: rgba(var(--dark-dividers))
+    )
+  );
+
+  @include mat.table-overrides(
+    (
+      row-item-outline-color: rgba(var(--dark-dividers))
+    )
+  );
+}
 
 .theme-dark {
-  @include mat.all-component-colors($gf-theme-dark);
+  $gf-theme-dark: mat.define-theme(
+    (
+      color: (
+        primary: $_primary,
+        theme-type: dark,
+        tertiary: $_tertiary
+      ),
+      density: (
+        scale: -3
+      ),
+      // typography: $gf-typography
+    )
+  );
+
+  @include mat.all-component-themes($gf-theme-dark);
+
+  @include mat.button-overrides(
+    (
+      outlined-label-text-color: var(--light-primary-text),
+      text-label-text-color: var(--light-primary-text)
+    )
+  );
+
+  @include mat.button-toggle-overrides(
+    (
+      selected-state-background-color: rgba(var(--light-dividers)),
+      selected-state-text-color: var(--light-primary-text)
+    )
+  );
+
+  @include mat.card-overrides(
+    (
+      outlined-container-color: var(--dark-background),
+      outlined-outline-color: rgba(var(--light-dividers)),
+      title-text-line-height: 1.2
+    )
+  );
+
+  @include mat.slide-toggle-overrides(
+    (
+      selected-track-outline-color: rgba(var(--light-dividers)),
+      track-outline-color: rgba(var(--light-dividers))
+    )
+  );
+
+  @include mat.table-overrides(
+    (
+      row-item-outline-color: rgba(var(--light-dividers))
+    )
+  );
 }
 
-@include mat.button-density(0);
-@include mat.elevation-classes();
-@include mat.app-background();
-@include mat.table-density(-1);
+.theme-dark,
+.theme-light {
+  @media (max-width: 575.98px) {
+    @include mat.dialog-overrides(
+      (
+        container-shape: 4px
+      )
+    );
+
+    .page.has-tabs {
+      @include mat.tabs-overrides(
+        (
+          container-height: 3rem
+        )
+      );
+    }
+  }
+
+  @media (min-width: 576px) {
+    .page.has-tabs {
+      @include mat.tabs-overrides(
+        (
+          container-height: 2rem
+        )
+      );
+    }
+  }
+
+  @include mat.button-overrides(
+    (
+      filled-container-color: var(--gf-theme-primary-500)
+    )
+  );
+
+  @include mat.checkbox-overrides(
+    (
+      selected-icon-color: var(--gf-theme-primary-500)
+    )
+  );
+
+  @include mat.datepicker-overrides(
+    (
+      calendar-container-elevation-shadow: var(
+          --mat-select-container-elevation-shadow
+        ),
+      calendar-date-selected-state-background-color: var(--gf-theme-primary-500),
+      calendar-date-today-selected-state-outline-color: var(
+          --gf-theme-primary-500
+        )
+    )
+  );
+
+  @include mat.dialog-overrides(
+    (
+      container-max-width: 80vw,
+      container-small-max-width: 96vw
+    )
+  );
+
+  @include mat.fab-overrides(
+    (
+      container-color: var(--gf-theme-primary-500)
+    )
+  );
+
+  @include mat.form-field-overrides(
+    (
+      outlined-focus-label-text-color: var(--gf-theme-primary-500),
+      outlined-focus-outline-color: var(--gf-theme-primary-500)
+    )
+  );
+
+  @include mat.progress-bar-overrides(
+    (
+      active-indicator-color: var(--gf-theme-primary-500)
+    )
+  );
+
+  @include mat.slide-toggle-overrides(
+    (
+      selected-focus-handle-color: var(--gf-theme-primary-500),
+      selected-focus-track-color: transparent,
+      selected-handle-color: var(--gf-theme-primary-500),
+      selected-hover-handle-color: var(--gf-theme-primary-500),
+      selected-hover-track-color: transparent,
+      selected-pressed-handle-color: var(--gf-theme-primary-500),
+      selected-pressed-track-color: transparent,
+      selected-track-color: transparent,
+      unselected-hover-track-color: transparent,
+      unselected-track-color: transparent
+    )
+  );
+
+  @include mat.slider-overrides(
+    (
+      active-track-color: var(--gf-theme-primary-500),
+      focus-handle-color: var(--gf-theme-primary-500),
+      handle-color: var(--gf-theme-primary-500)
+    )
+  );
+
+  @include mat.stepper-overrides(
+    (
+      header-selected-state-icon-background-color: var(--gf-theme-primary-500)
+    )
+  );
+
+  @include mat.tabs-overrides(
+    (
+      active-focus-label-text-color: var(--gf-theme-primary-500),
+      active-hover-label-text-color: var(--gf-theme-primary-500),
+      active-label-text-color: var(--gf-theme-primary-500),
+      active-ripple-color: var(--gf-theme-primary-500),
+      inactive-ripple-color: var(--gf-theme-primary-500)
+    )
+  );
+
+  .mat-accent {
+    @include mat.button-overrides(
+      (
+        filled-container-color: var(--gf-theme-secondary-500),
+        outlined-label-text-color: var(--gf-theme-secondary-500)
+      )
+    );
+  }
+
+  .mat-warn {
+    @include mat.button-overrides(
+      (
+        filled-container-color: #f44336,
+        filled-label-text-color: white,
+        outlined-label-text-color: #f44336
+      )
+    );
+  }
+
+  .page.has-tabs {
+    @include mat.tabs-overrides(
+      (
+        active-indicator-height: 0,
+        label-text-tracking: normal
+      )
+    );
+  }
+}
 
 :root {
   --gf-theme-alpha-hover: 0.04;