diff --git a/src/@fuse/components/navigation/vertical/collapsable/collapsable.component.html b/src/@fuse/components/navigation/vertical/collapsable/collapsable.component.html
index f85fbd4d..c9b212ab 100644
--- a/src/@fuse/components/navigation/vertical/collapsable/collapsable.component.html
+++ b/src/@fuse/components/navigation/vertical/collapsable/collapsable.component.html
@@ -7,7 +7,7 @@
 
     <!-- item.url -->
     <a class="nav-link" *ngIf="item.url && !item.externalUrl && !item.function" (click)="toggleOpen($event)"
-       [routerLink]="[item.url]" routerLinkActive="active"
+       [routerLink]="[item.url]" [routerLinkActive]="['active', 'mat-accent-bg']"
        [routerLinkActiveOptions]="{exact: item.exactMatch || false}"
        [target]="item.openInNewTab ? '_blank' : '_self'" matRipple>
         <ng-container *ngTemplateOutlet="itemContent"></ng-container>
@@ -28,7 +28,7 @@
     <!-- item.url && item.function -->
     <a class="nav-link" *ngIf="item.url && !item.externalUrl && item.function"
        (click)="toggleOpen($event);item.function()"
-       [routerLink]="[item.url]" routerLinkActive="active"
+       [routerLink]="[item.url]" [routerLinkActive]="['active', 'mat-accent-bg']"
        [routerLinkActiveOptions]="{exact: item.exactMatch || false}" matRipple>
         <ng-container *ngTemplateOutlet="itemContent"></ng-container>
     </a>
diff --git a/src/@fuse/components/navigation/vertical/item/item.component.html b/src/@fuse/components/navigation/vertical/item/item.component.html
index 927f3cb3..1cedfb65 100644
--- a/src/@fuse/components/navigation/vertical/item/item.component.html
+++ b/src/@fuse/components/navigation/vertical/item/item.component.html
@@ -2,7 +2,7 @@
 
     <!-- item.url -->
     <a class="nav-link" *ngIf="item.url && !item.externalUrl && !item.function"
-       [routerLink]="[item.url]" routerLinkActive="active"
+       [routerLink]="[item.url]" [routerLinkActive]="['active', 'mat-accent-bg']"
        [routerLinkActiveOptions]="{exact: item.exactMatch || false}"
        [target]="item.openInNewTab ? '_blank' : '_self'" matRipple>
         <ng-container *ngTemplateOutlet="itemContent"></ng-container>
@@ -22,7 +22,7 @@
 
     <!-- item.url && item.function -->
     <a class="nav-link" *ngIf="item.url && !item.externalUrl && item.function" (click)="item.function()"
-       [routerLink]="[item.url]" routerLinkActive="active"
+       [routerLink]="[item.url]" [routerLinkActive]="['active', 'mat-accent-bg']"
        [routerLinkActiveOptions]="{exact: item.exactMatch || false}"
        [target]="item.openInNewTab ? '_blank' : '_self'" matRipple>
         <ng-container *ngTemplateOutlet="itemContent"></ng-container>
diff --git a/src/@fuse/scss/partials/_colors.scss b/src/@fuse/scss/partials/_colors.scss
index 9b7bc22f..7b98456d 100644
--- a/src/@fuse/scss/partials/_colors.scss
+++ b/src/@fuse/scss/partials/_colors.scss
@@ -227,6 +227,35 @@ $matColorHues: 50, 100, 200, 300, 400, 500, 600, 700, 800, 900, A100, A200, A400
     }
 }
 
+@mixin generateFuseColorClasses($primary, $accent, $warn) {
+
+    $colorMap: (
+        primary: $primary,
+        accent: $accent,
+        warn: $warn
+    );
+
+    // Generate the color classes...
+    @each $name, $map in $colorMap {
+
+        @each $hue in $matColorHues {
+
+            $color: map-get($map, $hue);
+            $contrastColor: map-get(map-get($map, 'contrast'), $hue);
+
+            @if ($color != null and $contrastColor != null) {
+
+                @include generateColorClasses($name, $color, $contrastColor, '-#{$hue}');
+
+                // Run the generator one more time for default values (500)
+                @if ($hue == 500) {
+                    @include generateColorClasses($name, $color, $contrastColor, '');
+                }
+            }
+        }
+    }
+}
+
 // Generate the color classes...
 @each $colorName, $colorMap in $matColorsMap {
 
diff --git a/src/@fuse/scss/partials/_navigation.scss b/src/@fuse/scss/partials/_navigation.scss
index 4e52dc95..468add93 100644
--- a/src/@fuse/scss/partials/_navigation.scss
+++ b/src/@fuse/scss/partials/_navigation.scss
@@ -72,14 +72,14 @@
             }
 
             &.active {
-                background-color: mat-color($accent);
+                //background-color: mat-color($accent);
 
                 .mat-ripple-element {
-                    background-color: mat-color($accent, default-contrast, 0.1);
+                    //background-color: mat-color($accent, default-contrast, 0.1);
                 }
 
                 &, .nav-link-icon {
-                    color: mat-color($accent, default-contrast);
+                    //color: mat-color($accent, default-contrast);
                 }
 
                 .nav-link-badge {
diff --git a/src/app/main/apps/chat/chat-start/chat-start.component.html b/src/app/main/apps/chat/chat-start/chat-start.component.html
index 77c6eb9e..50ad6b3d 100644
--- a/src/app/main/apps/chat/chat-start/chat-start.component.html
+++ b/src/app/main/apps/chat/chat-start/chat-start.component.html
@@ -3,13 +3,15 @@
     <div class="big-circle mat-elevation-z1 app-logo" fxLayout="column" fxLayoutAlign="center center"
          *fuseIfOnDom [@animate]="{value:'*',params:{delay:'50ms',scale:'0.2'}}">
 
-        <mat-icon class="s-64 s-mat-128">chat</mat-icon>
+        <mat-icon class="s-64 s-mat-128 mat-accent">chat</mat-icon>
 
     </div>
 
     <span class="app-title my-24" *fuseIfOnDom [@animate]="{value:'*',params:{delay:'100ms',y:'25px'}}">Chat App</span>
 
-    <span fxHide fxShow.gt-md class="app-message" *fuseIfOnDom [@animate]="{value:'*',params:{delay:'200ms',y:'50px'}}">Select contact to start the chat!..</span>
+    <span fxHide fxShow.gt-md class="app-message" *fuseIfOnDom [@animate]="{value:'*',params:{delay:'200ms',y:'50px'}}">
+        Select contact to start the chat!..
+    </span>
 
     <button mat-raised-button fxHide.gt-md class="" fuseMatSidenavToggler="chat-left-sidenav">
         Select contact to start the chat!..
diff --git a/src/app/main/apps/chat/chat-start/chat-start.component.scss b/src/app/main/apps/chat/chat-start/chat-start.component.scss
index c6f0ad4d..3a6fb4ee 100644
--- a/src/app/main/apps/chat/chat-start/chat-start.component.scss
+++ b/src/app/main/apps/chat/chat-start/chat-start.component.scss
@@ -18,10 +18,6 @@
             height: 160px;
             line-height: 160px;
         }
-
-        mat-icon {
-            color: mat-color($accent);
-        }
     }
 
     .app-title {
diff --git a/src/app/main/apps/chat/sidenavs/left/chats/chats.component.html b/src/app/main/apps/chat/sidenavs/left/chats/chats.component.html
index b210bf42..c59c1e21 100644
--- a/src/app/main/apps/chat/sidenavs/left/chats/chats.component.html
+++ b/src/app/main/apps/chat/sidenavs/left/chats/chats.component.html
@@ -136,7 +136,7 @@
                             <div class="contact-last-message-time">
                                 {{chat.lastMessageTime | date}}
                             </div>
-                            <div *ngIf="chat.unread" class="unread-message-count">{{chat.unread}}</div>
+                            <div *ngIf="chat.unread" class="unread-message-count mat-accent-bg">{{chat.unread}}</div>
                         </div>
                     </div>
                 </div>
diff --git a/src/app/main/apps/chat/sidenavs/left/chats/chats.component.scss b/src/app/main/apps/chat/sidenavs/left/chats/chats.component.scss
index a49f5163..4fa85df8 100644
--- a/src/app/main/apps/chat/sidenavs/left/chats/chats.component.scss
+++ b/src/app/main/apps/chat/sidenavs/left/chats/chats.component.scss
@@ -94,8 +94,6 @@
                     width: 24px;
                     height: 24px;
                     line-height: 24px;
-                    background-color: mat-color($accent);
-                    color: map-get($accent, default-contrast);
                 }
             }
         }
diff --git a/src/app/main/apps/chat/sidenavs/left/user/user.component.html b/src/app/main/apps/chat/sidenavs/left/user/user.component.html
index 59ce9639..9ecb4ddf 100644
--- a/src/app/main/apps/chat/sidenavs/left/user/user.component.html
+++ b/src/app/main/apps/chat/sidenavs/left/user/user.component.html
@@ -2,7 +2,7 @@
 <div class="sidenav-header">
 
     <!-- USER TOOLBAR -->
-    <mat-toolbar>
+    <mat-toolbar class="mat-accent-bg">
 
         <!-- TOOLBAR TOP -->
         <mat-toolbar-row fxLayout="row" fxLayoutAlign="space-between center">
diff --git a/src/app/main/apps/chat/sidenavs/left/user/user.component.scss b/src/app/main/apps/chat/sidenavs/left/user/user.component.scss
index 40d65ae3..7130f9cb 100644
--- a/src/app/main/apps/chat/sidenavs/left/user/user.component.scss
+++ b/src/app/main/apps/chat/sidenavs/left/user/user.component.scss
@@ -6,8 +6,6 @@
     flex-direction: column;
 
     mat-toolbar {
-        background-color: mat-color($accent);
-        color: map-get($accent, default-contrast);
 
         .toolbar-bottom {
             height: 240px;
@@ -16,7 +14,6 @@
                 height: 180px;
             }
         }
-
     }
 
     .sidenav-content {
diff --git a/src/app/main/apps/chat/sidenavs/right/contact/contact.component.html b/src/app/main/apps/chat/sidenavs/right/contact/contact.component.html
index a7dd59f9..a60d9c39 100644
--- a/src/app/main/apps/chat/sidenavs/right/contact/contact.component.html
+++ b/src/app/main/apps/chat/sidenavs/right/contact/contact.component.html
@@ -2,7 +2,7 @@
 <div class="sidenav-header" *ngIf="contact">
 
     <!-- CONTACT TOOLBAR -->
-    <mat-toolbar>
+    <mat-toolbar class="mat-accent-bg">
 
         <!-- TOOLBAR TOP -->
         <mat-toolbar-row fxLayout="row" fxLayoutAlign="space-between center">
diff --git a/src/app/main/apps/chat/sidenavs/right/contact/contact.component.scss b/src/app/main/apps/chat/sidenavs/right/contact/contact.component.scss
index 40d65ae3..7130f9cb 100644
--- a/src/app/main/apps/chat/sidenavs/right/contact/contact.component.scss
+++ b/src/app/main/apps/chat/sidenavs/right/contact/contact.component.scss
@@ -6,8 +6,6 @@
     flex-direction: column;
 
     mat-toolbar {
-        background-color: mat-color($accent);
-        color: map-get($accent, default-contrast);
 
         .toolbar-bottom {
             height: 240px;
@@ -16,7 +14,6 @@
                 height: 180px;
             }
         }
-
     }
 
     .sidenav-content {
diff --git a/src/app/main/apps/contacts/contact-list/contact-list.component.html b/src/app/main/apps/contacts/contact-list/contact-list.component.html
index 0416c57c..015d2a70 100644
--- a/src/app/main/apps/contacts/contact-list/contact-list.component.html
+++ b/src/app/main/apps/contacts/contact-list/contact-list.component.html
@@ -97,7 +97,7 @@
     <mat-row *cdkRowDef="let contact; columns: displayedColumns;"
              class="contact"
              (click)="editContact(contact)"
-             [ngClass]="{'mat-light-blue-50-bg':checkboxes[contact.id]}"
+             [ngClass]="{'mat-accent-50-bg':checkboxes[contact.id]}"
              matRipple
              [@animate]="{value:'*',params:{y:'100%'}}">
     </mat-row>
diff --git a/src/app/main/apps/contacts/sidenavs/main/main.component.html b/src/app/main/apps/contacts/sidenavs/main/main.component.html
index 7d25084c..5856fc5f 100644
--- a/src/app/main/apps/contacts/sidenavs/main/main.component.html
+++ b/src/app/main/apps/contacts/sidenavs/main/main.component.html
@@ -18,19 +18,20 @@
             <div class="nav">
 
                 <div class="nav-item" aria-label="inbox">
-                    <a class="nav-link" matRipple (click)="changeFilter('all')" [ngClass]="{'active':filterBy ==='all'}">
+                    <a class="nav-link" matRipple (click)="changeFilter('all')"
+                       [ngClass]="{'active mat-accent-bg':filterBy ==='all'}">
                         <span class="title">All Contacts</span>
                     </a>
                 </div>
 
                 <div class="nav-item" aria-label="frequently contacted" (click)="changeFilter('frequent')">
-                    <a class="nav-link" matRipple [ngClass]="{'active':filterBy ==='frequent'}">
+                    <a class="nav-link" matRipple [ngClass]="{'active mat-accent-bg':filterBy ==='frequent'}">
                         <div class="title">Freequently contacted</div>
                     </a>
                 </div>
 
                 <div class="nav-item" aria-label="starred" (click)="changeFilter('starred')">
-                    <a class="nav-link" matRipple [ngClass]="{'active':filterBy ==='starred'}">
+                    <a class="nav-link" matRipple [ngClass]="{'active mat-accent-bg':filterBy ==='starred'}">
                         <div class="title">Starred Contacts</div>
                     </a>
                 </div>
diff --git a/src/app/main/apps/e-commerce/order/order.component.html b/src/app/main/apps/e-commerce/order/order.component.html
index 2987e515..69e5bbb3 100644
--- a/src/app/main/apps/e-commerce/order/order.component.html
+++ b/src/app/main/apps/e-commerce/order/order.component.html
@@ -8,7 +8,7 @@
     <div class="center">
 
         <!-- HEADER -->
-        <div class="header white-fg"
+        <div class="header mat-accent-bg"
              fxLayout="row" fxLayoutAlign="space-between center">
 
             <!-- APP TITLE -->
diff --git a/src/app/main/apps/e-commerce/orders/orders.component.html b/src/app/main/apps/e-commerce/orders/orders.component.html
index 0b4462e6..a7d66abe 100644
--- a/src/app/main/apps/e-commerce/orders/orders.component.html
+++ b/src/app/main/apps/e-commerce/orders/orders.component.html
@@ -8,7 +8,7 @@
     <div class="center">
 
         <!-- HEADER -->
-        <div class="header white-fg"
+        <div class="header mat-accent-bg"
              fxLayout="column" fxLayoutAlign="center center"
              fxLayout.gt-xs="row" fxLayoutAlign.gt-xs="space-between center">
 
diff --git a/src/app/main/apps/e-commerce/product/product.component.html b/src/app/main/apps/e-commerce/product/product.component.html
index d1c683fb..f2444081 100644
--- a/src/app/main/apps/e-commerce/product/product.component.html
+++ b/src/app/main/apps/e-commerce/product/product.component.html
@@ -8,7 +8,7 @@
     <div class="center">
 
         <!-- HEADER -->
-        <div class="header white-fg" fxLayout="row" fxLayoutAlign="space-between center">
+        <div class="header mat-accent-bg" fxLayout="row" fxLayoutAlign="space-between center">
 
             <!-- APP TITLE -->
             <div fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/apps/e-commerce/products/products.component.html b/src/app/main/apps/e-commerce/products/products.component.html
index cee86b70..d44b7c43 100644
--- a/src/app/main/apps/e-commerce/products/products.component.html
+++ b/src/app/main/apps/e-commerce/products/products.component.html
@@ -8,7 +8,7 @@
     <div class="center">
 
         <!-- HEADER -->
-        <div class="header white-fg"
+        <div class="header mat-accent-bg"
              fxLayout="column" fxLayoutAlign="center center"
              fxLayout.gt-xs="row" fxLayoutAlign.gt-xs="space-between center">
 
diff --git a/src/app/main/apps/file-manager/file-list/file-list.component.html b/src/app/main/apps/file-manager/file-list/file-list.component.html
index 83aef234..67e565a6 100644
--- a/src/app/main/apps/file-manager/file-list/file-list.component.html
+++ b/src/app/main/apps/file-manager/file-list/file-list.component.html
@@ -52,9 +52,8 @@
     <mat-header-row *cdkHeaderRowDef="displayedColumns"></mat-header-row>
     <mat-row *cdkRowDef="let row; columns: displayedColumns;"
              (click)="onSelect(row)"
-             [ngClass]="{'mat-light-blue-50-bg':row == selected}"
-             matRipple
-             [@animate]="{value:'*',params:{y:'100%'}}"
+             [ngClass]="{'mat-accent-50-bg':row == selected}"
+             matRipple [@animate]="{value:'*',params:{y:'100%'}}"
     >
     </mat-row>
 </mat-table>
diff --git a/src/app/main/apps/mail-ngrx/mail-list/mail-list-item/mail-list-item.component.html b/src/app/main/apps/mail-ngrx/mail-list/mail-list-item/mail-list-item.component.html
index f9224cbc..4df2f5d8 100644
--- a/src/app/main/apps/mail-ngrx/mail-list/mail-list-item/mail-list-item.component.html
+++ b/src/app/main/apps/mail-ngrx/mail-list/mail-list-item/mail-list-item.component.html
@@ -10,7 +10,7 @@
 
             <div class="name" fxLayout="row" fxLayoutAlign="start center" fxFlex>
                 <img class="avatar" *ngIf="mail.from?.avatar" alt="{{mail.from?.name}}" src="{{mail.from?.avatar}}"/>
-                <div class="avatar" *ngIf="!mail.from?.avatar">{{mail.from?.name[0]}}</div>
+                <div class="avatar mat-accent-bg" *ngIf="!mail.from?.avatar">{{mail.from?.name[0]}}</div>
                 <span class="text-truncate" *ngIf="mail?.from">{{mail.from?.name}}</span>
                 <mat-icon *ngIf="mail.hasAttachments">attachment</mat-icon>
             </div>
diff --git a/src/app/main/apps/mail-ngrx/mail-list/mail-list-item/mail-list-item.component.scss b/src/app/main/apps/mail-ngrx/mail-list/mail-list-item/mail-list-item.component.scss
index 89566a09..7eb73acf 100644
--- a/src/app/main/apps/mail-ngrx/mail-list/mail-list-item/mail-list-item.component.scss
+++ b/src/app/main/apps/mail-ngrx/mail-list/mail-list-item/mail-list-item.component.scss
@@ -44,20 +44,6 @@
         }
     }
 
-    &.current-mail {
-        background: #E3F2FD;
-
-        .info {
-
-            .row-2 {
-
-                .labels {
-                    background: #E3F2FD;
-                }
-            }
-        }
-    }
-
     .info {
         overflow: hidden;
         width: 0;
@@ -76,7 +62,6 @@
                     width: 32px;
                     height: 32px;
                     line-height: 32px;
-                    background-color: mat-color($accent);
                 }
             }
 
@@ -104,11 +89,7 @@
             }
 
             .labels {
-                position: absolute;
-                background: #FFFFFF;
-                bottom: 0;
-                right: 0;
-                padding-left: 6px;
+                margin-top: 8px;
 
                 .label {
                     font-size: 11px;
diff --git a/src/app/main/apps/mail-ngrx/mail-list/mail-list.component.html b/src/app/main/apps/mail-ngrx/mail-list/mail-list.component.html
index 94e1ff3b..9e94b60c 100644
--- a/src/app/main/apps/mail-ngrx/mail-list/mail-list.component.html
+++ b/src/app/main/apps/mail-ngrx/mail-list/mail-list.component.html
@@ -4,6 +4,6 @@
 
 <div class="mail-list">
     <mail-list-item matRipple *ngFor="let mail of mails" [mail]="mail" (click)="readMail(mail.id)"
-                    [ngClass]="{'current-mail':mail?.id == currentMail?.id}">
+                    [ngClass]="{'current-mail mat-accent-50-bg':mail?.id == currentMail?.id}">
     </mail-list-item>
 </div>
diff --git a/src/app/main/apps/mail-ngrx/mail.component.html b/src/app/main/apps/mail-ngrx/mail.component.html
index 701983ae..fc8e0816 100644
--- a/src/app/main/apps/mail-ngrx/mail.component.html
+++ b/src/app/main/apps/mail-ngrx/mail.component.html
@@ -65,11 +65,11 @@
                         <div class="toolbar-separator" *ngIf="hasSelectedMails"></div>
 
                         <button mat-icon-button (click)="setFolderOnSelectedMails(4)" *ngIf="hasSelectedMails">
-                            <mat-icon>delete</mat-icon>
+                            <mat-icon class="secondary-text">delete</mat-icon>
                         </button>
 
                         <button mat-icon-button [matMenuTriggerFor]="folderMenu" *ngIf="hasSelectedMails">
-                            <mat-icon>folder</mat-icon>
+                            <mat-icon class="secondary-text">folder</mat-icon>
                         </button>
                         <mat-menu #folderMenu="matMenu">
                             <button mat-menu-item *ngFor="let folder of folders$ | async"
@@ -78,7 +78,7 @@
                         </mat-menu>
 
                         <button mat-icon-button [matMenuTriggerFor]="labelMenu" *ngIf="hasSelectedMails">
-                            <mat-icon>label</mat-icon>
+                            <mat-icon class="secondary-text">label</mat-icon>
                         </button>
                         <mat-menu #labelMenu="matMenu">
                             <button mat-menu-item *ngFor="let label of labels$ | async"
@@ -89,7 +89,7 @@
 
                     <div *ngIf="currentMail$ | async" fxHide.gt-xs>
                         <button mat-icon-button (click)="deselectCurrentMail()">
-                            <mat-icon>arrow_back</mat-icon>
+                            <mat-icon class="secondary-text">arrow_back</mat-icon>
                         </button>
                     </div>
                 </div>
diff --git a/src/app/main/apps/mail-ngrx/sidenavs/main/main-sidenav.component.html b/src/app/main/apps/mail-ngrx/sidenavs/main/main-sidenav.component.html
index a3d8f041..a858a439 100644
--- a/src/app/main/apps/mail-ngrx/sidenavs/main/main-sidenav.component.html
+++ b/src/app/main/apps/mail-ngrx/sidenavs/main/main-sidenav.component.html
@@ -1,6 +1,6 @@
 <!-- SIDENAV HEADER -->
 <div fxLayout="column" fxLayoutAlign="space-between start"
-     class="header p-24 pb-4" ngClass="mat-accent-bg" ngClass.gt-md="white-fg">
+     class="header mat-accent-bg p-24 pb-4">
 
     <div class="logo" fxFlex fxLayout="row" fxLayoutAlign="start center">
         <mat-icon class="logo-icon s-32">mail</mat-icon>
@@ -39,8 +39,9 @@
         <div class="nav-subheader">{{ 'MAIL.FOLDERS' | translate }}</div>
 
         <div class="nav-item" *ngFor="let folder of (folders$ | async)">
-            <a class="nav-link" matRipple [routerLink]="'/apps/mail-ngrx/' + folder.handle" routerLinkActive="active">
-                <mat-icon class="nav-link-icon" *ngIf="folder.icon">{{folder.icon}}</mat-icon>
+            <a class="nav-link" matRipple [routerLink]="'/apps/mail-ngrx/' + folder.handle"
+               [routerLinkActive]="['active', 'mat-accent-bg']">
+                <mat-icon class="nav-link-icon secondary-text" *ngIf="folder.icon">{{folder.icon}}</mat-icon>
                 <span>{{folder.title}}</span>
             </a>
         </div>
@@ -49,7 +50,7 @@
 
         <div class="nav-item" *ngFor="let filter of (filters$ | async)">
             <a class="nav-link" matRipple [routerLink]="'/apps/mail-ngrx/filter/' + filter.handle"
-               routerLinkActive="active">
+               [routerLinkActive]="['active', 'mat-accent-bg']">
                 <mat-icon class="nav-link-icon" [ngClass]="filter.color" *ngIf="filter.icon">{{filter.icon}}</mat-icon>
                 <span>{{filter.title}}</span>
             </a>
@@ -59,7 +60,7 @@
 
         <div class="nav-item" *ngFor="let label of (labels$ | async)">
             <a class="nav-link" matRipple [routerLink]="'/apps/mail-ngrx/label/' + label.handle"
-               routerLinkActive="active">
+               [routerLinkActive]="['active', 'mat-accent-bg']">
                 <mat-icon class="nav-link-icon" [ngStyle]="{'color':label.color}">label</mat-icon>
                 <span>{{label.title}}</span>
             </a>
diff --git a/src/app/main/apps/mail/mail-list/mail-list-item/mail-list-item.component.html b/src/app/main/apps/mail/mail-list/mail-list-item/mail-list-item.component.html
index 6d4d2872..474e190b 100644
--- a/src/app/main/apps/mail/mail-list/mail-list-item/mail-list-item.component.html
+++ b/src/app/main/apps/mail/mail-list/mail-list-item/mail-list-item.component.html
@@ -9,7 +9,7 @@
 
             <div class="name" fxLayout="row" fxLayoutAlign="start center" fxFlex>
                 <img class="avatar" *ngIf="mail.from?.avatar" alt="{{mail.from?.name}}" src="{{mail.from?.avatar}}"/>
-                <div class="avatar" *ngIf="!mail.from?.avatar">{{mail.from?.name[0]}}</div>
+                <div class="avatar mat-accent-bg" *ngIf="!mail.from?.avatar">{{mail.from?.name[0]}}</div>
                 <span class="text-truncate" *ngIf="mail?.from">{{mail.from?.name}}</span>
                 <mat-icon *ngIf="mail.hasAttachments">attachment</mat-icon>
             </div>
diff --git a/src/app/main/apps/mail/mail-list/mail-list-item/mail-list-item.component.scss b/src/app/main/apps/mail/mail-list/mail-list-item/mail-list-item.component.scss
index 7c068432..0d03ea06 100644
--- a/src/app/main/apps/mail/mail-list/mail-list-item/mail-list-item.component.scss
+++ b/src/app/main/apps/mail/mail-list/mail-list-item/mail-list-item.component.scss
@@ -43,20 +43,6 @@
         }
     }
 
-    &.current-mail {
-        background: #E3F2FD;
-
-        .info {
-
-            .row-2 {
-
-                .labels {
-                    background: #E3F2FD;
-                }
-            }
-        }
-    }
-
     .info {
         overflow: hidden;
         width: 0;
@@ -75,7 +61,6 @@
                     width: 32px;
                     height: 32px;
                     line-height: 32px;
-                    background-color: mat-color($accent);
                 }
             }
 
@@ -103,11 +88,7 @@
             }
 
             .labels {
-                position: absolute;
-                background: #FFFFFF;
-                bottom: 0;
-                right: 0;
-                padding-left: 6px;
+                margin-top: 8px;
 
                 .label {
                     font-size: 11px;
diff --git a/src/app/main/apps/mail/mail-list/mail-list.component.html b/src/app/main/apps/mail/mail-list/mail-list.component.html
index 5804f075..a2a42d71 100644
--- a/src/app/main/apps/mail/mail-list/mail-list.component.html
+++ b/src/app/main/apps/mail/mail-list/mail-list.component.html
@@ -4,7 +4,7 @@
 
 <div class="mail-list" *fuseIfOnDom [@animateStagger]="{value:'50'}">
     <mail-list-item matRipple *ngFor="let mail of mails" [mail]="mail" (click)="readMail(mail.id)"
-                    [ngClass]="{'current-mail':mail?.id == currentMail?.id}"
+                    [ngClass]="{'current-mail mat-accent-50-bg':mail?.id == currentMail?.id}"
                     [@animate]="{value:'*',params:{y:'100%'}}">
     </mail-list-item>
 </div>
diff --git a/src/app/main/apps/mail/mail.component.html b/src/app/main/apps/mail/mail.component.html
index 570edba8..daae3a07 100644
--- a/src/app/main/apps/mail/mail.component.html
+++ b/src/app/main/apps/mail/mail.component.html
@@ -63,11 +63,11 @@
                         <div class="toolbar-separator" *ngIf="hasSelectedMails"></div>
 
                         <button mat-icon-button (click)="setFolderOnSelectedMails(4)" *ngIf="hasSelectedMails">
-                            <mat-icon>delete</mat-icon>
+                            <mat-icon class="secondary-text">delete</mat-icon>
                         </button>
 
                         <button mat-icon-button [matMenuTriggerFor]="folderMenu" *ngIf="hasSelectedMails">
-                            <mat-icon>folder</mat-icon>
+                            <mat-icon class="secondary-text">folder</mat-icon>
                         </button>
                         <mat-menu #folderMenu="matMenu">
                             <button mat-menu-item *ngFor="let folder of folders"
@@ -76,7 +76,7 @@
                         </mat-menu>
 
                         <button mat-icon-button [matMenuTriggerFor]="labelMenu" *ngIf="hasSelectedMails">
-                            <mat-icon>label</mat-icon>
+                            <mat-icon class="secondary-text">label</mat-icon>
                         </button>
                         <mat-menu #labelMenu="matMenu">
                             <button mat-menu-item *ngFor="let label of labels"
@@ -87,7 +87,7 @@
 
                     <div *ngIf="currentMail" fxHide.gt-xs>
                         <button mat-icon-button (click)="deselectCurrentMail()">
-                            <mat-icon>arrow_back</mat-icon>
+                            <mat-icon class="secondary-text">arrow_back</mat-icon>
                         </button>
                     </div>
                 </div>
diff --git a/src/app/main/apps/mail/sidenavs/main/main-sidenav.component.html b/src/app/main/apps/mail/sidenavs/main/main-sidenav.component.html
index e467ee42..46e6b939 100644
--- a/src/app/main/apps/mail/sidenavs/main/main-sidenav.component.html
+++ b/src/app/main/apps/mail/sidenavs/main/main-sidenav.component.html
@@ -1,9 +1,10 @@
 <!-- SIDENAV HEADER -->
 <div fxLayout="column" fxLayoutAlign="space-between start"
-     class="header p-24 pb-4" ngClass="mat-accent-bg" ngClass.gt-md="white-fg">
+     class="header mat-accent-bg p-24 pb-4">
 
     <div class="logo" fxFlex fxLayout="row" fxLayoutAlign="start center">
-        <mat-icon class="logo-icon s-32" *fuseIfOnDom [@animate]="{value:'*',params:{delay:'50ms',scale:'0.2'}}">mail</mat-icon>
+        <mat-icon class="logo-icon s-32" *fuseIfOnDom [@animate]="{value:'*',params:{delay:'50ms',scale:'0.2'}}">mail
+        </mat-icon>
         <span class="logo-text" *fuseIfOnDom [@animate]="{value:'*',params:{delay:'100ms',x:'-25px'}}">Mailbox</span>
     </div>
 
@@ -39,8 +40,9 @@
         <div class="nav-subheader">{{ 'MAIL.FOLDERS' | translate }}</div>
 
         <div class="nav-item" *ngFor="let folder of folders">
-            <a class="nav-link" matRipple [routerLink]="'/apps/mail/' + folder.handle" routerLinkActive="active">
-                <mat-icon class="nav-link-icon" *ngIf="folder.icon">{{folder.icon}}</mat-icon>
+            <a class="nav-link" matRipple [routerLink]="'/apps/mail/' + folder.handle"
+               [routerLinkActive]="['active', 'mat-accent-bg']">
+                <mat-icon class="nav-link-icon secondary-text" *ngIf="folder.icon">{{folder.icon}}</mat-icon>
                 <span>{{folder.title}}</span>
             </a>
         </div>
@@ -48,7 +50,8 @@
         <div class="nav-subheader">{{ 'MAIL.FILTERS' | translate }}</div>
 
         <div class="nav-item" *ngFor="let filter of filters">
-            <a class="nav-link" matRipple [routerLink]="'/apps/mail/filter/' + filter.handle" routerLinkActive="active">
+            <a class="nav-link" matRipple [routerLink]="'/apps/mail/filter/' + filter.handle"
+               [routerLinkActive]="['active', 'mat-accent-bg']">
                 <mat-icon class="nav-link-icon" [ngClass]="filter.color" *ngIf="filter.icon">{{filter.icon}}</mat-icon>
                 <span>{{filter.title}}</span>
             </a>
@@ -57,7 +60,8 @@
         <div class="nav-subheader">{{ 'MAIL.LABELS' | translate }}</div>
 
         <div class="nav-item" *ngFor="let label of labels">
-            <a class="nav-link" matRipple [routerLink]="'/apps/mail/label/' + label.handle" routerLinkActive="active">
+            <a class="nav-link" matRipple [routerLink]="'/apps/mail/label/' + label.handle"
+               [routerLinkActive]="['active', 'mat-accent-bg']">
                 <mat-icon class="nav-link-icon" [ngStyle]="{'color':label.color}">label</mat-icon>
                 <span>{{label.title}}</span>
             </a>
diff --git a/src/app/main/apps/todo/sidenavs/main/main-sidenav.component.html b/src/app/main/apps/todo/sidenavs/main/main-sidenav.component.html
index 50d1356d..9e4840a8 100644
--- a/src/app/main/apps/todo/sidenavs/main/main-sidenav.component.html
+++ b/src/app/main/apps/todo/sidenavs/main/main-sidenav.component.html
@@ -1,8 +1,10 @@
 <!-- SIDENAV HEADER -->
 <div fxLayout="column" fxLayoutAlign="space-between start"
-     class="header p-24 pb-4" ngClass="mat-accent-bg" ngClass.gt-md="white-fg">
+     class="header mat-accent-bg p-24 pb-4">
     <div class="logo" fxFlex fxLayout="row" fxLayoutAlign="start center">
-        <mat-icon class="logo-icon s-32" *fuseIfOnDom [@animate]="{value:'*',params:{delay:'50ms',scale:'0.2'}}">check_box</mat-icon>
+        <mat-icon class="logo-icon s-32" *fuseIfOnDom [@animate]="{value:'*',params:{delay:'50ms',scale:'0.2'}}">
+            check_box
+        </mat-icon>
         <span class="logo-text" *fuseIfOnDom [@animate]="{value:'*',params:{delay:'100ms',x:'-25px'}}">To-Do</span>
     </div>
 
@@ -36,8 +38,9 @@
     <div class="nav">
 
         <div class="nav-item">
-            <a class="nav-link" matRipple [routerLink]="'/apps/todo/all'" routerLinkActive="active">
-                <mat-icon class="nav-link-icon">view_headline</mat-icon>
+            <a class="nav-link" matRipple [routerLink]="'/apps/todo/all'"
+               [routerLinkActive]="['active', 'mat-accent-bg']">
+                <mat-icon class="nav-link-icon secondary-text">view_headline</mat-icon>
                 <span>All</span>
             </a>
         </div>
@@ -45,8 +48,9 @@
         <div class="nav-subheader">FILTERS</div>
 
         <div class="nav-item" *ngFor="let filter of filters">
-            <a class="nav-link" matRipple [routerLink]="'/apps/todo/filter/' + filter.handle" routerLinkActive="active">
-                <mat-icon class="nav-link-icon" *ngIf="filter.icon">{{filter.icon}}</mat-icon>
+            <a class="nav-link" matRipple [routerLink]="'/apps/todo/filter/' + filter.handle"
+               [routerLinkActive]="['active', 'mat-accent-bg']">
+                <mat-icon class="nav-link-icon secondary-text" *ngIf="filter.icon">{{filter.icon}}</mat-icon>
                 <span>{{filter.title}}</span>
             </a>
         </div>
@@ -54,7 +58,8 @@
         <div class="nav-subheader">TAGS</div>
 
         <div class="nav-item" *ngFor="let tag of tags">
-            <a class="nav-link" matRipple [routerLink]="'/apps/todo/tag/' + tag.handle" routerLinkActive="active">
+            <a class="nav-link" matRipple [routerLink]="'/apps/todo/tag/' + tag.handle"
+               [routerLinkActive]="['active', 'mat-accent-bg']">
                 <mat-icon class="nav-link-icon" [ngStyle]="{'color':tag.color}">label</mat-icon>
                 <span>{{tag.title}}</span>
             </a>
diff --git a/src/app/main/apps/todo/todo-list/todo-list.component.html b/src/app/main/apps/todo/todo-list/todo-list.component.html
index 02e5de2d..6e97f9db 100644
--- a/src/app/main/apps/todo/todo-list/todo-list.component.html
+++ b/src/app/main/apps/todo/todo-list/todo-list.component.html
@@ -1,5 +1,5 @@
 <div *ngIf="todos.length === 0" fxLayout="column" fxLayoutAlign="center center" fxFlexFill>
-    <span class="no-todos-text  hint-text">There are no todos!</span>
+    <span class="no-todos-text hint-text">There are no todos!</span>
 </div>
 <div class="todo-list" ngxDroppable [model]="todos" (out)="onDrop($event)" *fuseIfOnDom [@animateStagger]="{value:'50'}">
     <todo-list-item class="todo-list-item has-handle"
@@ -7,7 +7,7 @@
                     ngxDraggable
                     [model]="todo"
                     (click)="readTodo(todo.id)"
-                    [ngClass]="{'current-todo':todo?.id == currentTodo?.id}"
+                    [ngClass]="{'current-todo mat-accent-50-bg':todo?.id == currentTodo?.id}"
                     matRipple
                     [@animate]="{value:'*',params:{y:'100%'}}">
     </todo-list-item>
diff --git a/src/app/main/apps/todo/todo.component.html b/src/app/main/apps/todo/todo.component.html
index 1216ed34..64b105d9 100644
--- a/src/app/main/apps/todo/todo.component.html
+++ b/src/app/main/apps/todo/todo.component.html
@@ -63,7 +63,7 @@
                         <div class="toolbar-separator" *ngIf="hasSelectedTodos"></div>
 
                         <button mat-icon-button [matMenuTriggerFor]="labelMenu" *ngIf="hasSelectedTodos">
-                            <mat-icon>label</mat-icon>
+                            <mat-icon class="secondary-text">label</mat-icon>
                         </button>
                         <mat-menu #labelMenu="matMenu">
                             <button mat-menu-item *ngFor="let tag of tags" (click)="toggleTagOnSelectedTodos(tag.id)">
@@ -74,7 +74,7 @@
 
                     <div *ngIf="currentTodo" fxHide.gt-lg>
                         <button mat-icon-button (click)="deselectCurrentTodo()">
-                            <mat-icon>arrow_back</mat-icon>
+                            <mat-icon class="secondary-text">arrow_back</mat-icon>
                         </button>
                     </div>
 
diff --git a/src/app/main/pages/authentication/mail-confirm/mail-confirm.component.html b/src/app/main/pages/authentication/mail-confirm/mail-confirm.component.html
index cd3d0cd2..e1d3dc96 100644
--- a/src/app/main/pages/authentication/mail-confirm/mail-confirm.component.html
+++ b/src/app/main/pages/authentication/mail-confirm/mail-confirm.component.html
@@ -5,7 +5,7 @@
         <div id="mail-confirm-form" *fuseIfOnDom [@animate]="{value:'*',params:{duration:'300ms',y:'100px'}}">
 
             <div class="logo">
-                <mat-icon class="blue-fg s-96">email</mat-icon>
+                <mat-icon class="mat-accent s-96">email</mat-icon>
             </div>
 
             <div class="title">Confirm your email address!</div>
diff --git a/src/app/main/ui/page-layouts/carded/full-width-1/full-width-1.component.html b/src/app/main/ui/page-layouts/carded/full-width-1/full-width-1.component.html
index 5e08db5f..e7d2ab7e 100644
--- a/src/app/main/ui/page-layouts/carded/full-width-1/full-width-1.component.html
+++ b/src/app/main/ui/page-layouts/carded/full-width-1/full-width-1.component.html
@@ -8,7 +8,7 @@
     <div class="center">
 
         <!-- CONTENT HEADER -->
-        <div class="header white-fg p-24" fxLayout="row" fxLayoutAlign="start center">
+        <div class="header mat-accent-bg p-24" fxLayout="row" fxLayoutAlign="start center">
             <h2>Full width with content scroll</h2>
         </div>
         <!-- / CONTENT HEADER -->
diff --git a/src/app/main/ui/page-layouts/carded/full-width-2/full-width-2.component.html b/src/app/main/ui/page-layouts/carded/full-width-2/full-width-2.component.html
index a9a45f3a..c2d18241 100644
--- a/src/app/main/ui/page-layouts/carded/full-width-2/full-width-2.component.html
+++ b/src/app/main/ui/page-layouts/carded/full-width-2/full-width-2.component.html
@@ -8,7 +8,7 @@
     <div class="center">
 
         <!-- CONTENT HEADER -->
-        <div class="header white-fg p-24" fxLayout="row" fxLayoutAlign="start center">
+        <div class="header mat-accent-bg p-24" fxLayout="row" fxLayoutAlign="start center">
             <h2>Full width with inner scroll</h2>
         </div>
         <!-- / CONTENT HEADER -->
diff --git a/src/app/main/ui/page-layouts/carded/full-width-tabbed-1/full-width-tabbed-1.component.html b/src/app/main/ui/page-layouts/carded/full-width-tabbed-1/full-width-tabbed-1.component.html
index b5f75269..b659fa07 100644
--- a/src/app/main/ui/page-layouts/carded/full-width-tabbed-1/full-width-tabbed-1.component.html
+++ b/src/app/main/ui/page-layouts/carded/full-width-tabbed-1/full-width-tabbed-1.component.html
@@ -8,7 +8,7 @@
     <div class="center">
 
         <!-- CONTENT HEADER -->
-        <div class="header white-fg p-24" fxLayout="row" fxLayoutAlign="start center">
+        <div class="header mat-accent-bg p-24" fxLayout="row" fxLayoutAlign="start center">
             <h2>Full width with tabs and content scroll</h2>
         </div>
         <!-- / CONTENT HEADER -->
diff --git a/src/app/main/ui/page-layouts/carded/full-width-tabbed-2/full-width-tabbed-2.component.html b/src/app/main/ui/page-layouts/carded/full-width-tabbed-2/full-width-tabbed-2.component.html
index 0c008df2..cb0db816 100644
--- a/src/app/main/ui/page-layouts/carded/full-width-tabbed-2/full-width-tabbed-2.component.html
+++ b/src/app/main/ui/page-layouts/carded/full-width-tabbed-2/full-width-tabbed-2.component.html
@@ -8,7 +8,7 @@
     <div class="center">
 
         <!-- CONTENT HEADER -->
-        <div class="header white-fg p-24" fxLayout="row" fxLayoutAlign="start center">
+        <div class="header mat-accent-bg p-24" fxLayout="row" fxLayoutAlign="start center">
             <h2>Full width with tabs and inner scroll</h2>
         </div>
         <!-- / CONTENT HEADER -->
diff --git a/src/app/main/ui/page-layouts/carded/left-sidenav-1/left-sidenav-1.component.html b/src/app/main/ui/page-layouts/carded/left-sidenav-1/left-sidenav-1.component.html
index b982e7c0..75406653 100644
--- a/src/app/main/ui/page-layouts/carded/left-sidenav-1/left-sidenav-1.component.html
+++ b/src/app/main/ui/page-layouts/carded/left-sidenav-1/left-sidenav-1.component.html
@@ -11,7 +11,7 @@
                      fuseMatSidenavHelper="carded-left-sidenav" mat-is-locked-open="gt-md">
 
             <!-- SIDENAV HEADER -->
-            <div class="header p-24" ngClass="mat-accent-bg" ngClass.gt-md="white-fg">
+            <div class="header p-24 mat-accent-bg">
                 <h2>Sidenav header</h2>
             </div>
             <!-- / SIDENAV HEADER -->
@@ -31,7 +31,7 @@
         <div class="center">
 
             <!-- CONTENT HEADER -->
-            <div class="header white-fg p-24">
+            <div class="header mat-accent-bg p-24">
                 <h2>Left sidenav with content scroll</h2>
             </div>
             <!-- / CONTENT HEADER -->
diff --git a/src/app/main/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.html b/src/app/main/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.html
index 5f828a44..74f053a5 100644
--- a/src/app/main/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.html
+++ b/src/app/main/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.html
@@ -11,7 +11,7 @@
                      fuseMatSidenavHelper="carded-left-sidenav" mat-is-locked-open="gt-md">
 
             <!-- SIDENAV HEADER -->
-            <div class="header p-24" ngClass="mat-accent-bg" ngClass.gt-md="white-fg">
+            <div class="header mat-accent-bg p-24">
                 <h2>Sidenav header</h2>
             </div>
             <!-- / SIDENAV HEADER -->
@@ -31,7 +31,7 @@
         <div class="center">
 
             <!-- CONTENT HEADER -->
-            <div class="header white-fg p-24">
+            <div class="header mat-accent-bg p-24">
                 <h2>Left sidenav with inner scroll</h2>
             </div>
             <!-- / CONTENT HEADER -->
diff --git a/src/app/main/ui/page-layouts/carded/left-sidenav-tabbed-1/left-sidenav-tabbed-1.component.html b/src/app/main/ui/page-layouts/carded/left-sidenav-tabbed-1/left-sidenav-tabbed-1.component.html
index 37159c86..8e56abfa 100644
--- a/src/app/main/ui/page-layouts/carded/left-sidenav-tabbed-1/left-sidenav-tabbed-1.component.html
+++ b/src/app/main/ui/page-layouts/carded/left-sidenav-tabbed-1/left-sidenav-tabbed-1.component.html
@@ -11,7 +11,7 @@
                      fuseMatSidenavHelper="carded-left-sidenav" mat-is-locked-open="gt-md">
 
             <!-- SIDENAV HEADER -->
-            <div class="header p-24" ngClass="mat-accent-bg" ngClass.gt-md="white-fg">
+            <div class="header mat-accent-bg p-24">
                 <h2>Sidenav header</h2>
             </div>
             <!-- / SIDENAV HEADER -->
@@ -31,7 +31,7 @@
         <div class="center">
 
             <!-- CONTENT HEADER -->
-            <div class="header white-fg p-24">
+            <div class="header mat-accent-bg p-24">
 
                 <div fxLayout="row" fxLayoutAlign="start center">
 
diff --git a/src/app/main/ui/page-layouts/carded/left-sidenav-tabbed-2/left-sidenav-tabbed-2.component.html b/src/app/main/ui/page-layouts/carded/left-sidenav-tabbed-2/left-sidenav-tabbed-2.component.html
index 03e69569..a69e51b8 100644
--- a/src/app/main/ui/page-layouts/carded/left-sidenav-tabbed-2/left-sidenav-tabbed-2.component.html
+++ b/src/app/main/ui/page-layouts/carded/left-sidenav-tabbed-2/left-sidenav-tabbed-2.component.html
@@ -11,7 +11,7 @@
                      fuseMatSidenavHelper="carded-left-sidenav" mat-is-locked-open="gt-md">
 
             <!-- SIDENAV HEADER -->
-            <div class="header p-24" ngClass="mat-accent-bg" ngClass.gt-md="white-fg">
+            <div class="header mat-accent-bg p-24">
                 <h2>Sidenav header</h2>
             </div>
             <!-- / SIDENAV HEADER -->
@@ -31,7 +31,7 @@
         <div class="center">
 
             <!-- CONTENT HEADER -->
-            <div class="header white-fg p-24">
+            <div class="header mat-accent-bg p-24">
 
                 <div fxLayout="row" fxLayoutAlign="start center">
 
diff --git a/src/app/main/ui/page-layouts/carded/right-sidenav-1/right-sidenav-1.component.html b/src/app/main/ui/page-layouts/carded/right-sidenav-1/right-sidenav-1.component.html
index f6bf47f2..501bf26c 100644
--- a/src/app/main/ui/page-layouts/carded/right-sidenav-1/right-sidenav-1.component.html
+++ b/src/app/main/ui/page-layouts/carded/right-sidenav-1/right-sidenav-1.component.html
@@ -10,7 +10,7 @@
         <div class="center">
 
             <!-- CONTENT HEADER -->
-            <div class="header white-fg p-24">
+            <div class="header mat-accent-bg p-24">
                 <h2>Right sidenav with content scroll</h2>
             </div>
             <!-- / CONTENT HEADER -->
@@ -49,7 +49,7 @@
                      fuseMatSidenavHelper="carded-right-sidenav" mat-is-locked-open="gt-md">
 
             <!-- SIDENAV HEADER -->
-            <div class="header p-24" ngClass="mat-accent-bg" ngClass.gt-md="white-fg">
+            <div class="header mat-accent-bg p-24">
                 <h2>Sidenav header</h2>
             </div>
             <!-- / SIDENAV HEADER -->
diff --git a/src/app/main/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.html b/src/app/main/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.html
index 35e5cf2b..355e56d6 100644
--- a/src/app/main/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.html
+++ b/src/app/main/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.html
@@ -10,7 +10,7 @@
         <div class="center">
 
             <!-- CONTENT HEADER -->
-            <div class="header white-fg p-24">
+            <div class="header mat-accent-bg p-24">
                 <h2>Right sidenav with inner scroll</h2>
             </div>
             <!-- / CONTENT HEADER -->
@@ -49,7 +49,7 @@
                      fuseMatSidenavHelper="carded-right-sidenav" mat-is-locked-open="gt-md">
 
             <!-- SIDENAV HEADER -->
-            <div class="header p-24" ngClass="mat-accent-bg" ngClass.gt-md="white-fg">
+            <div class="header mat-accent-bg p-24">
                 <h2>Sidenav header</h2>
             </div>
             <!-- / SIDENAV HEADER -->
diff --git a/src/app/main/ui/page-layouts/carded/right-sidenav-tabbed-1/right-sidenav-tabbed-1.component.html b/src/app/main/ui/page-layouts/carded/right-sidenav-tabbed-1/right-sidenav-tabbed-1.component.html
index 5fe94776..474144b3 100644
--- a/src/app/main/ui/page-layouts/carded/right-sidenav-tabbed-1/right-sidenav-tabbed-1.component.html
+++ b/src/app/main/ui/page-layouts/carded/right-sidenav-tabbed-1/right-sidenav-tabbed-1.component.html
@@ -10,7 +10,7 @@
         <div class="center">
 
             <!-- CONTENT HEADER -->
-            <div class="header white-fg p-24">
+            <div class="header mat-accent-bg p-24">
 
                 <div fxLayout="row" fxLayoutAlign="start center">
 
@@ -130,7 +130,7 @@
                      fuseMatSidenavHelper="carded-left-sidenav" mat-is-locked-open="gt-md">
 
             <!-- SIDENAV HEADER -->
-            <div class="header p-24" ngClass="mat-accent-bg" ngClass.gt-md="white-fg">
+            <div class="header mat-accent-bg p-24">
                 <h2>Sidenav header</h2>
             </div>
             <!-- / SIDENAV HEADER -->
diff --git a/src/app/main/ui/page-layouts/carded/right-sidenav-tabbed-2/right-sidenav-tabbed-2.component.html b/src/app/main/ui/page-layouts/carded/right-sidenav-tabbed-2/right-sidenav-tabbed-2.component.html
index d56483ae..9f6c2a64 100644
--- a/src/app/main/ui/page-layouts/carded/right-sidenav-tabbed-2/right-sidenav-tabbed-2.component.html
+++ b/src/app/main/ui/page-layouts/carded/right-sidenav-tabbed-2/right-sidenav-tabbed-2.component.html
@@ -10,7 +10,7 @@
         <div class="center">
 
             <!-- CONTENT HEADER -->
-            <div class="header white-fg p-24">
+            <div class="header mat-accent-bg p-24">
 
                 <div fxLayout="row" fxLayoutAlign="start center">
 
@@ -130,7 +130,7 @@
                      fuseMatSidenavHelper="carded-left-sidenav" mat-is-locked-open="gt-md">
 
             <!-- SIDENAV HEADER -->
-            <div class="header p-24" ngClass="mat-accent-bg" ngClass.gt-md="white-fg">
+            <div class="header mat-accent-bg p-24">
                 <h2>Sidenav header</h2>
             </div>
             <!-- / SIDENAV HEADER -->
diff --git a/src/styles.scss b/src/styles.scss
index 47998044..b8f60696 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -1,2 +1,24 @@
 // Import Fuse core library
-@import "@fuse/scss/core";
\ No newline at end of file
+@import "@fuse/scss/core";
+
+// -----------------------------------------------------------------------------------------------------
+// @ Multiple material themes example
+// -----------------------------------------------------------------------------------------------------
+
+// Define the Material palettes
+$yellow-theme-primary: mat-palette($mat-fusedark);
+$yellow-theme-accent: mat-palette($mat-yellow, 600, 400, 700);
+$yellow-theme-warn: mat-palette($mat-red);
+
+// Create the Material theme object
+$yellow-theme: mat-light-theme($yellow-theme-primary, $yellow-theme-accent, $yellow-theme-warn);
+
+// Add ".yellow-theme" class to the body to activate this theme
+.yellow-theme {
+
+    // Generate the Angular Material theme
+    @include angular-material-theme($yellow-theme);
+
+    // Generate the fuse color classes with the new colors...
+    @include generateFuseColorClasses($yellow-theme-primary, $yellow-theme-accent, $yellow-theme-warn);
+}
\ No newline at end of file