diff --git a/src/app/core/components/material-color-picker/material-color-picker.component.html b/src/app/core/components/material-color-picker/material-color-picker.component.html
index 982968b4..0e22118b 100644
--- a/src/app/core/components/material-color-picker/material-color-picker.component.html
+++ b/src/app/core/components/material-color-picker/material-color-picker.component.html
@@ -45,7 +45,7 @@
 
             <div fxLayout="row" fxLayoutWrap
                  fxLayoutAlign="start start"
-                 class="colors" perfect-scrollbar>
+                 class="colors" perfectScrollbar>
                 <div class="color"
                      [ngClass]="'md-'+color.key+'-bg'"
                      *ngFor="let color of (colors | keys)"
@@ -63,7 +63,7 @@
              [@slideInRight]>
             <div fxLayout="row" fxLayoutWrap
                  fxLayoutAlign="start start"
-                 class="colors" perfect-scrollbar>
+                 class="colors" perfectScrollbar>
                 <div class="color"
                      *ngFor="let hue of hues"
                      [fxHide]="selectedPalette === 'white' && hue !== '500'|| selectedPalette === 'black' && hue !== '500'"
diff --git a/src/app/core/components/shortcuts/shortcuts.component.html b/src/app/core/components/shortcuts/shortcuts.component.html
index ca3f7e0f..0bf67594 100644
--- a/src/app/core/components/shortcuts/shortcuts.component.html
+++ b/src/app/core/components/shortcuts/shortcuts.component.html
@@ -47,7 +47,7 @@
             </md-input-container>
 
             <md-divider></md-divider>
-            <md-nav-list *ngIf="!searching" style="max-height: 312px; overflow: auto" perfect-scrollbar>
+            <md-nav-list *ngIf="!searching" style="max-height: 312px; overflow: auto" perfectScrollbar>
 
                 <md-list-item *ngFor="let shortcutItem of shortcutItems"
                               (click)="toggleShortcut($event, shortcutItem)">
@@ -68,7 +68,7 @@
                 </md-list-item>
             </md-nav-list>
 
-            <md-nav-list *ngIf="searching" style="max-height: 312px; overflow: auto" perfect-scrollbar>
+            <md-nav-list *ngIf="searching" style="max-height: 312px; overflow: auto" perfectScrollbar>
                 <md-list-item *ngFor="let navigationItem of filteredNavigationItems"
                               (click)="toggleShortcut($event, navigationItem)">
                     <div class="w-100-p" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/content/apps/calendar/calendar.component.html b/src/app/main/content/apps/calendar/calendar.component.html
index fc913755..783c76ab 100644
--- a/src/app/main/content/apps/calendar/calendar.component.html
+++ b/src/app/main/content/apps/calendar/calendar.component.html
@@ -1,4 +1,4 @@
-<div id="calendar" class="page-layout simple fullwidth" perfect-scrollbar>
+<div id="calendar" class="page-layout simple fullwidth" perfectScrollbar>
 
     <!-- HEADER -->
     <div class="header" [ngClass]="viewDate | date:'MMM'">
@@ -86,7 +86,7 @@
     <!-- / HEADER -->
 
     <!-- CONTENT -->
-    <div class="content" perfect-scrollbar>
+    <div class="content" perfectScrollbar>
         <div [ngSwitch]="view">
             <mwl-calendar-month-view
                 *ngSwitchCase="'month'"
diff --git a/src/app/main/content/apps/calendar/event-form/event-form.component.html b/src/app/main/content/apps/calendar/event-form/event-form.component.html
index e7e219a6..16733e02 100644
--- a/src/app/main/content/apps/calendar/event-form/event-form.component.html
+++ b/src/app/main/content/apps/calendar/event-form/event-form.component.html
@@ -9,7 +9,7 @@
     </div>
 </md-toolbar>
 
-<div md-dialog-content class="p-24 m-0" perfect-scrollbar>
+<div md-dialog-content class="p-24 m-0" perfectScrollbar>
 
     <form name="eventForm" [formGroup]="eventForm" class="event-form" fxLayout="column" fxFlex>
 
diff --git a/src/app/main/content/apps/chat/chat-view/chat-view.component.html b/src/app/main/content/apps/chat/chat-view/chat-view.component.html
index 7168346f..bc8352f6 100644
--- a/src/app/main/content/apps/chat/chat-view/chat-view.component.html
+++ b/src/app/main/content/apps/chat/chat-view/chat-view.component.html
@@ -57,7 +57,7 @@
     <!-- / CHAT TOOLBAR -->
 
     <!-- CHAT CONTENT -->
-    <div id="chat-content" fxFlex perfect-scrollbar>
+    <div id="chat-content" fxFlex perfectScrollbar>
 
         <!-- CHAT MESSAGES -->
         <div class="chat-messages">
diff --git a/src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.html b/src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.html
index be018d5c..a613b33b 100644
--- a/src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.html
+++ b/src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.html
@@ -98,7 +98,7 @@
 <!-- / SIDENAV HEADER -->
 
 <!-- SIDENAV CONTENT -->
-<div class="sidenav-content" perfect-scrollbar fxFlex>
+<div class="sidenav-content" perfectScrollbar fxFlex>
 
     <!-- CHATS CONTENT -->
     <div>
diff --git a/src/app/main/content/apps/chat/sidenavs/left/user/user.component.html b/src/app/main/content/apps/chat/sidenavs/left/user/user.component.html
index 4b40de6d..42422e48 100644
--- a/src/app/main/content/apps/chat/sidenavs/left/user/user.component.html
+++ b/src/app/main/content/apps/chat/sidenavs/left/user/user.component.html
@@ -29,7 +29,7 @@
 </div>
 
 <!-- SIDENAV CONTENT -->
-<div class="sidenav-content p-16" perfect-scrollbar fxFlex>
+<div class="sidenav-content p-16" perfectScrollbar fxFlex>
 
     <!-- USER MOOD -->
     <md-card>
diff --git a/src/app/main/content/apps/chat/sidenavs/right/contact/contact.component.html b/src/app/main/content/apps/chat/sidenavs/right/contact/contact.component.html
index 2677e347..5034e3e6 100644
--- a/src/app/main/content/apps/chat/sidenavs/right/contact/contact.component.html
+++ b/src/app/main/content/apps/chat/sidenavs/right/contact/contact.component.html
@@ -31,7 +31,7 @@
 </div>
 
 <!-- SIDENAV CONTENT -->
-<div class="sidenav-content p-16" perfect-scrollbar fxFlex *ngIf="contact">
+<div class="sidenav-content p-16" perfectScrollbar fxFlex *ngIf="contact">
 
     <!-- CONTACT MOOD -->
     <md-card>
diff --git a/src/app/main/content/apps/contacts/contact-form/contact-form.component.html b/src/app/main/content/apps/contacts/contact-form/contact-form.component.html
index 498e54d1..3852138f 100644
--- a/src/app/main/content/apps/contacts/contact-form/contact-form.component.html
+++ b/src/app/main/content/apps/contacts/contact-form/contact-form.component.html
@@ -15,7 +15,7 @@
     </md-toolbar-row>
 </md-toolbar>
 
-<div md-dialog-content class="p-24 m-0" perfect-scrollbar>
+<div md-dialog-content class="p-24 m-0" perfectScrollbar>
 
     <form [formGroup]="contactForm">
 
diff --git a/src/app/main/content/apps/contacts/contacts.component.html b/src/app/main/content/apps/contacts/contacts.component.html
index 3fcf40e5..88748549 100644
--- a/src/app/main/content/apps/contacts/contacts.component.html
+++ b/src/app/main/content/apps/contacts/contacts.component.html
@@ -1,4 +1,4 @@
-<div id="contacts" class="page-layout simple left-sidenav inner-sidenav" perfect-scrollbar>
+<div id="contacts" class="page-layout simple left-sidenav inner-sidenav" perfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24" fxLayout="column" fxLayoutAlign="start start"
@@ -51,7 +51,7 @@
         <!-- / SIDENAV -->
 
         <!-- CENTER -->
-        <div class="center p-24 pr-sm-92" perfect-scrollbar>
+        <div class="center p-24 pr-sm-92" perfectScrollbar>
 
             <!-- CONTENT -->
             <div class="content md-white-bg mat-elevation-z4">
diff --git a/src/app/main/content/apps/contacts/sidenavs/main/main.component.html b/src/app/main/content/apps/contacts/sidenavs/main/main.component.html
index b0d07b8b..4f400d0a 100644
--- a/src/app/main/content/apps/contacts/sidenavs/main/main.component.html
+++ b/src/app/main/content/apps/contacts/sidenavs/main/main.component.html
@@ -13,7 +13,7 @@
         <!-- / SIDENAV HEADER -->
 
         <!-- SIDENAV CONTENT -->
-        <div class="content py-16" perfect-scrollbar>
+        <div class="content py-16" perfectScrollbar>
 
             <div class="nav">
 
diff --git a/src/app/main/content/apps/dashboards/project/project.component.html b/src/app/main/content/apps/dashboards/project/project.component.html
index a08ead08..ef6f8b7b 100644
--- a/src/app/main/content/apps/dashboards/project/project.component.html
+++ b/src/app/main/content/apps/dashboards/project/project.component.html
@@ -1,9 +1,9 @@
-<div id="dashboard-project" class="page-layout simple right-sidenav" fxLayout="row" perfect-scrollbar>
+<div id="dashboard-project" class="page-layout simple right-sidenav" fxLayout="row" perfectScrollbar>
 
     <md-sidenav-container>
 
         <!-- CENTER -->
-        <div class="center" fxFlex perfect-scrollbar>
+        <div class="center" fxFlex perfectScrollbar>
 
             <!-- HEADER -->
             <div class="header md-accent-bg p-24 pb-0" fxLayout="column" fxLayoutAlign="space-between">
@@ -690,7 +690,7 @@
         <!-- SIDENAV -->
         <md-sidenav class="sidenav mat-sidenav-opened" align="end" mode="side" fuseMdSidenavHelper="dashboards-right-sidenav" md-is-locked-open="gt-md">
 
-            <div class="sidenav-content" perfect-scrollbar>
+            <div class="sidenav-content" perfectScrollbar>
                 <!-- WIDGET GROUP -->
                 <div class="widget-group" fxLayout="column" fxFlex="100">
 
diff --git a/src/app/main/content/apps/file-manager/file-manager.component.html b/src/app/main/content/apps/file-manager/file-manager.component.html
index 40926094..ab7dcdfd 100644
--- a/src/app/main/content/apps/file-manager/file-manager.component.html
+++ b/src/app/main/content/apps/file-manager/file-manager.component.html
@@ -1,4 +1,4 @@
-<div id="file-manager" class="page-layout simple right-sidenav" perfect-scrollbar>
+<div id="file-manager" class="page-layout simple right-sidenav" perfectScrollbar>
 
     <md-sidenav-container>
 
@@ -58,7 +58,7 @@
             <!-- / HEADER -->
 
             <!-- CONTENT -->
-            <div class="content md-white-bg" perfect-scrollbar>
+            <div class="content md-white-bg" perfectScrollbar>
                 <fuse-file-list></fuse-file-list>
             </div>
             <!-- / CONTENT -->
diff --git a/src/app/main/content/apps/file-manager/sidenavs/details/details.component.html b/src/app/main/content/apps/file-manager/sidenavs/details/details.component.html
index 77979f25..ee9ab507 100644
--- a/src/app/main/content/apps/file-manager/sidenavs/details/details.component.html
+++ b/src/app/main/content/apps/file-manager/sidenavs/details/details.component.html
@@ -27,7 +27,7 @@
 <!-- / SIDENAV HEADER -->
 
 <!-- SIDENAV CONTENT -->
-<div class="content p-24 md-white-bg" perfect-scrollbar>
+<div class="content p-24 md-white-bg" perfectScrollbar>
 
     <div class="file-details">
 
diff --git a/src/app/main/content/apps/file-manager/sidenavs/main/main.component.html b/src/app/main/content/apps/file-manager/sidenavs/main/main.component.html
index d640990a..4387a1cc 100644
--- a/src/app/main/content/apps/file-manager/sidenavs/main/main.component.html
+++ b/src/app/main/content/apps/file-manager/sidenavs/main/main.component.html
@@ -10,7 +10,7 @@
 <!-- / SIDENAV HEADER -->
 
 <!-- SIDENAV CONTENT -->
-<div class="content py-16" perfect-scrollbar>
+<div class="content py-16" perfectScrollbar>
 
     <div class="nav">
 
diff --git a/src/app/main/content/apps/mail/dialogs/compose/compose.component.html b/src/app/main/content/apps/mail/dialogs/compose/compose.component.html
index 26bcf994..703ae091 100644
--- a/src/app/main/content/apps/mail/dialogs/compose/compose.component.html
+++ b/src/app/main/content/apps/mail/dialogs/compose/compose.component.html
@@ -9,7 +9,7 @@
     </div>
 </md-toolbar>
 
-<div md-dialog-content class="p-24 m-0" perfect-scrollbar>
+<div md-dialog-content class="p-24 m-0" perfectScrollbar>
 
     <form name="composeForm" [formGroup]="composeForm" class="compose-form" fxLayout="column" fxFlex>
 
diff --git a/src/app/main/content/apps/mail/mail.component.html b/src/app/main/content/apps/mail/mail.component.html
index b4bbc8ee..0ab84d6e 100644
--- a/src/app/main/content/apps/mail/mail.component.html
+++ b/src/app/main/content/apps/mail/mail.component.html
@@ -1,4 +1,4 @@
-<div id="mail" class="page-layout carded left-sidenav" perfect-scrollbar>
+<div id="mail" class="page-layout carded left-sidenav" perfectScrollbar>
 
     <!-- TOP BACKGROUND -->
     <div class="top-bg md-accent-bg"></div>
@@ -96,9 +96,9 @@
                 <!-- CONTENT -->
                 <div class="content" fxLayoutAlign="row">
 
-                    <fuse-mail-list perfect-scrollbar fxFlex></fuse-mail-list>
+                    <fuse-mail-list perfectScrollbar fxFlex></fuse-mail-list>
 
-                    <fuse-mail-details perfect-scrollbar fxFlex></fuse-mail-details>
+                    <fuse-mail-details perfectScrollbar fxFlex></fuse-mail-details>
 
                 </div>
                 <!-- / CONTENT -->
diff --git a/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.html b/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.html
index ade0e181..eb9bbfa2 100644
--- a/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.html
+++ b/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.html
@@ -21,7 +21,7 @@
 <!-- / SIDENAV HEADER -->
 
 <!-- SIDENAV CONTENT -->
-<div class="content" perfect-scrollbar>
+<div class="content" perfectScrollbar>
 
     <div class="p-24">
         <button md-raised-button fxFlex
diff --git a/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.html b/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.html
index d713ac37..9acf27b3 100644
--- a/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.html
+++ b/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.html
@@ -123,7 +123,7 @@
     </div>
 </md-toolbar>
 
-<div *ngIf="card" md-dialog-content class="p-24 m-0" perfect-scrollbar>
+<div *ngIf="card" md-dialog-content class="p-24 m-0" perfectScrollbar>
 
     <div fxLayout.gt-xs="row" fxLayoutAlign.gt-xs="space-between center"
          fxLayout.xs="column" fxLayoutAlign="center center">
diff --git a/src/app/main/content/apps/scrumboard/board/dialogs/card/label-selector/label-selector.component.html b/src/app/main/content/apps/scrumboard/board/dialogs/card/label-selector/label-selector.component.html
index 8011f485..cdce00c1 100644
--- a/src/app/main/content/apps/scrumboard/board/dialogs/card/label-selector/label-selector.component.html
+++ b/src/app/main/content/apps/scrumboard/board/dialogs/card/label-selector/label-selector.component.html
@@ -10,7 +10,7 @@
             </button>
         </div>
 
-        <div fxFlex fxLayout="column" perfect-scrollbar>
+        <div fxFlex fxLayout="column" perfectScrollbar>
 
             <div class="label pl-12 mx-8 mb-8" *ngFor="let label of board.labels" fxFlex="0 0 auto" fxLayout="row" fxFlexAlign="space-between center"
                  [class]="label.color">
diff --git a/src/app/main/content/apps/scrumboard/board/list/list.component.html b/src/app/main/content/apps/scrumboard/board/list/list.component.html
index 62b1b29a..11b00722 100644
--- a/src/app/main/content/apps/scrumboard/board/list/list.component.html
+++ b/src/app/main/content/apps/scrumboard/board/list/list.component.html
@@ -26,7 +26,7 @@
 
         <div class="list-cards ngx-dnd-container"
              [model]="list.idCards" ngxDroppable="card" (out)="onDrop($event)"
-             perfect-scrollbar #listScroll>
+             perfectScrollbar #listScroll>
             <fuse-scrumboard-board-card ngxDraggable
                                         (click)="openCardDialog(cardId)"
                                         class="scrumboard-board-card mat-elevation-z2 ngx-dnd-item"
diff --git a/src/app/main/content/apps/scrumboard/board/sidenavs/settings/settings.component.html b/src/app/main/content/apps/scrumboard/board/sidenavs/settings/settings.component.html
index 43dd7966..cbd13873 100644
--- a/src/app/main/content/apps/scrumboard/board/sidenavs/settings/settings.component.html
+++ b/src/app/main/content/apps/scrumboard/board/sidenavs/settings/settings.component.html
@@ -9,7 +9,7 @@
         <!-- / SIDENAV HEADER -->
 
         <!-- SIDENAV CONTENT -->
-        <div class="content py-16" perfect-scrollbar>
+        <div class="content py-16" perfectScrollbar>
 
             <div class="nav">
                 <div class="nav-item">
@@ -67,7 +67,7 @@
         <!-- / SIDENAV HEADER -->
 
         <!-- SIDENAV CONTENT -->
-        <div class="content p-8" perfect-scrollbar>
+        <div class="content p-8" perfectScrollbar>
             <fuse-scrumboard-board-color-selector></fuse-scrumboard-board-color-selector>
         </div>
         <!-- / SIDENAV CONTENT -->
diff --git a/src/app/main/content/apps/scrumboard/scrumboard.component.html b/src/app/main/content/apps/scrumboard/scrumboard.component.html
index 8c5a97a2..5c155f91 100644
--- a/src/app/main/content/apps/scrumboard/scrumboard.component.html
+++ b/src/app/main/content/apps/scrumboard/scrumboard.component.html
@@ -1,5 +1,5 @@
 <!-- BOARDS -->
-<div id="boards" class="md-primary-400-bg" fxLayout="column" fxLayoutAlign="start center" fxFlex perfect-scrollbar>
+<div id="boards" class="md-primary-400-bg" fxLayout="column" fxLayoutAlign="start center" fxFlex perfectScrollbar>
 
     <div class="header pt-44 pt-md-88" fxFlex="0 0 auto">
         <h1>Scrumboard App</h1>
diff --git a/src/app/main/content/apps/todo/sidenavs/main/main-sidenav.component.html b/src/app/main/content/apps/todo/sidenavs/main/main-sidenav.component.html
index 849f77f0..06204091 100644
--- a/src/app/main/content/apps/todo/sidenavs/main/main-sidenav.component.html
+++ b/src/app/main/content/apps/todo/sidenavs/main/main-sidenav.component.html
@@ -21,7 +21,7 @@
 <!-- / SIDENAV HEADER -->
 
 <!-- SIDENAV CONTENT -->
-<div class="content" perfect-scrollbar>
+<div class="content" perfectScrollbar>
 
     <div class="p-24">
         <button md-raised-button fxFlex
diff --git a/src/app/main/content/apps/todo/todo.component.html b/src/app/main/content/apps/todo/todo.component.html
index e53cb3a5..e270c87d 100644
--- a/src/app/main/content/apps/todo/todo.component.html
+++ b/src/app/main/content/apps/todo/todo.component.html
@@ -1,4 +1,4 @@
-<div id="todo" class="page-layout carded left-sidenav" perfect-scrollbar>
+<div id="todo" class="page-layout carded left-sidenav" perfectScrollbar>
 
     <!-- TOP BACKGROUND -->
     <div class="top-bg md-accent-bg"></div>
@@ -82,9 +82,9 @@
                 <!-- CONTENT -->
                 <div class="content" fxFlexAlign="row">
 
-                    <fuse-todo-list perfect-scrollbar fxFlex></fuse-todo-list>
+                    <fuse-todo-list perfectScrollbar fxFlex></fuse-todo-list>
 
-                    <fuse-todo-details perfect-scrollbar fxFlex></fuse-todo-details>
+                    <fuse-todo-details perfectScrollbar fxFlex></fuse-todo-details>
 
                 </div>
                 <!-- / CONTENT -->
diff --git a/src/app/main/content/components-third-party/datatable/ngx-datatable.component.html b/src/app/main/content/components-third-party/datatable/ngx-datatable.component.html
index ccc416a1..4208b7ee 100644
--- a/src/app/main/content/components-third-party/datatable/ngx-datatable.component.html
+++ b/src/app/main/content/components-third-party/datatable/ngx-datatable.component.html
@@ -1,4 +1,4 @@
-<div id="ngx-datatable" class="page-layout simple fullwidth" perfect-scrollbar>
+<div id="ngx-datatable" class="page-layout simple fullwidth" perfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="space-between">
diff --git a/src/app/main/content/components/countdown/countdown.component.html b/src/app/main/content/components/countdown/countdown.component.html
index e5bbe156..595f16d6 100644
--- a/src/app/main/content/components/countdown/countdown.component.html
+++ b/src/app/main/content/components/countdown/countdown.component.html
@@ -1,4 +1,4 @@
-<div id="countdown" class="page-layout simple fullwidth" perfect-scrollbar>
+<div id="countdown" class="page-layout simple fullwidth" perfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/content/components/hljs/hljs.component.html b/src/app/main/content/components/hljs/hljs.component.html
index 86c42a92..7031b830 100644
--- a/src/app/main/content/components/hljs/hljs.component.html
+++ b/src/app/main/content/components/hljs/hljs.component.html
@@ -1,4 +1,4 @@
-<div id="hljs" class="page-layout simple fullwidth" perfect-scrollbar>
+<div id="hljs" class="page-layout simple fullwidth" perfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/content/components/material-color-picker/material-color-picker.component.html b/src/app/main/content/components/material-color-picker/material-color-picker.component.html
index e88a8fa4..421afdd8 100644
--- a/src/app/main/content/components/material-color-picker/material-color-picker.component.html
+++ b/src/app/main/content/components/material-color-picker/material-color-picker.component.html
@@ -1,4 +1,4 @@
-<div id="material-color-picker" class="page-layout simple fullwidth" perfect-scrollbar>
+<div id="material-color-picker" class="page-layout simple fullwidth" perfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/content/components/navigation/navigation.component.html b/src/app/main/content/components/navigation/navigation.component.html
index 5db515ee..42f5dd18 100644
--- a/src/app/main/content/components/navigation/navigation.component.html
+++ b/src/app/main/content/components/navigation/navigation.component.html
@@ -1,4 +1,4 @@
-<div id="navigation" class="page-layout simple fullwidth" perfect-scrollbar>
+<div id="navigation" class="page-layout simple fullwidth" perfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/content/components/price-tables/price-tables.component.html b/src/app/main/content/components/price-tables/price-tables.component.html
index 81d2b20a..360ad49f 100644
--- a/src/app/main/content/components/price-tables/price-tables.component.html
+++ b/src/app/main/content/components/price-tables/price-tables.component.html
@@ -1,4 +1,4 @@
-<div id="price-tables" class="page-layout simple fullwidth" perfect-scrollbar>
+<div id="price-tables" class="page-layout simple fullwidth" perfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/content/components/search-bar/search-bar.component.html b/src/app/main/content/components/search-bar/search-bar.component.html
index ac112ac1..cce891da 100644
--- a/src/app/main/content/components/search-bar/search-bar.component.html
+++ b/src/app/main/content/components/search-bar/search-bar.component.html
@@ -1,4 +1,4 @@
-<div id="search-bar" class="page-layout simple fullwidth" perfect-scrollbar>
+<div id="search-bar" class="page-layout simple fullwidth" perfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/content/components/shortcuts/shortcuts.component.html b/src/app/main/content/components/shortcuts/shortcuts.component.html
index 4726c795..20c80877 100644
--- a/src/app/main/content/components/shortcuts/shortcuts.component.html
+++ b/src/app/main/content/components/shortcuts/shortcuts.component.html
@@ -1,4 +1,4 @@
-<div id="shortcuts" class="page-layout simple fullwidth" perfect-scrollbar>
+<div id="shortcuts" class="page-layout simple fullwidth" perfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/content/components/widget/widget.component.html b/src/app/main/content/components/widget/widget.component.html
index d00b16a6..852d1994 100644
--- a/src/app/main/content/components/widget/widget.component.html
+++ b/src/app/main/content/components/widget/widget.component.html
@@ -1,4 +1,4 @@
-<div id="widget" class="page-layout simple fullwidth" perfect-scrollbar>
+<div id="widget" class="page-layout simple fullwidth" perfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/content/pages/authentication/forgot-password/forgot-password.component.html b/src/app/main/content/pages/authentication/forgot-password/forgot-password.component.html
index f95e311b..82f826bc 100644
--- a/src/app/main/content/pages/authentication/forgot-password/forgot-password.component.html
+++ b/src/app/main/content/pages/authentication/forgot-password/forgot-password.component.html
@@ -1,4 +1,4 @@
-<div id="forgot-password" fxLayout="column" perfect-scrollbar>
+<div id="forgot-password" fxLayout="column" perfectScrollbar>
 
     <div id="forgot-password-form-wrapper" fxLayout="column" fxLayoutAlign="center center">
 
diff --git a/src/app/main/content/pages/authentication/lock/lock.component.html b/src/app/main/content/pages/authentication/lock/lock.component.html
index dcdd83fa..05b03cfa 100644
--- a/src/app/main/content/pages/authentication/lock/lock.component.html
+++ b/src/app/main/content/pages/authentication/lock/lock.component.html
@@ -1,4 +1,4 @@
-<div id="lock" fxLayout="column" perfect-scrollbar>
+<div id="lock" fxLayout="column" perfectScrollbar>
 
     <div id="lock-form-wrapper" fxLayout="column" fxLayoutAlign="center center">
 
diff --git a/src/app/main/content/pages/authentication/login-2/login-2.component.html b/src/app/main/content/pages/authentication/login-2/login-2.component.html
index 2a39a8d7..1c5a6a87 100644
--- a/src/app/main/content/pages/authentication/login-2/login-2.component.html
+++ b/src/app/main/content/pages/authentication/login-2/login-2.component.html
@@ -15,7 +15,7 @@
         </div>
     </div>
 
-    <div id="login-form-wrapper" perfect-scrollbar>
+    <div id="login-form-wrapper" perfectScrollbar>
 
         <div id="login-form">
 
diff --git a/src/app/main/content/pages/authentication/login/login.component.html b/src/app/main/content/pages/authentication/login/login.component.html
index 4f030829..31dc57fc 100644
--- a/src/app/main/content/pages/authentication/login/login.component.html
+++ b/src/app/main/content/pages/authentication/login/login.component.html
@@ -1,4 +1,4 @@
-<div id="login" fxLayout="column" perfect-scrollbar>
+<div id="login" fxLayout="column" perfectScrollbar>
 
     <div id="login-form-wrapper" fxLayout="column" fxLayoutAlign="center center">
 
diff --git a/src/app/main/content/pages/authentication/register-2/register-2.component.html b/src/app/main/content/pages/authentication/register-2/register-2.component.html
index 98bb9e64..bead6516 100644
--- a/src/app/main/content/pages/authentication/register-2/register-2.component.html
+++ b/src/app/main/content/pages/authentication/register-2/register-2.component.html
@@ -15,7 +15,7 @@
         </div>
     </div>
 
-    <div id="register-form-wrapper" perfect-scrollbar>
+    <div id="register-form-wrapper" perfectScrollbar>
 
         <div id="register-form">
 
diff --git a/src/app/main/content/pages/authentication/register/register.component.html b/src/app/main/content/pages/authentication/register/register.component.html
index 7fe77d7c..aba4ffad 100644
--- a/src/app/main/content/pages/authentication/register/register.component.html
+++ b/src/app/main/content/pages/authentication/register/register.component.html
@@ -1,4 +1,4 @@
-<div id="register" fxLayout="column" perfect-scrollbar>
+<div id="register" fxLayout="column" perfectScrollbar>
 
     <div id="register-form-wrapper" fxLayout="column" fxLayoutAlign="center center">
 
diff --git a/src/app/main/content/pages/authentication/reset-password/reset-password.component.html b/src/app/main/content/pages/authentication/reset-password/reset-password.component.html
index 095e9d28..7c466e7b 100644
--- a/src/app/main/content/pages/authentication/reset-password/reset-password.component.html
+++ b/src/app/main/content/pages/authentication/reset-password/reset-password.component.html
@@ -1,4 +1,4 @@
-<div id="reset-password" fxLayout="column" perfect-scrollbar>
+<div id="reset-password" fxLayout="column" perfectScrollbar>
 
     <div id="reset-password-form-wrapper" fxLayout="column" fxLayoutAlign="center center">
 
diff --git a/src/app/main/content/pages/coming-soon/coming-soon.component.html b/src/app/main/content/pages/coming-soon/coming-soon.component.html
index dcf0fa23..39de6389 100644
--- a/src/app/main/content/pages/coming-soon/coming-soon.component.html
+++ b/src/app/main/content/pages/coming-soon/coming-soon.component.html
@@ -1,4 +1,4 @@
-<div id="coming-soon" fxLayout="column" perfect-scrollbar>
+<div id="coming-soon" fxLayout="column" perfectScrollbar>
 
     <div id="coming-soon-form-wrapper" fxLayout="column" fxLayoutAlign="center center">
 
diff --git a/src/app/main/content/pages/invoices/compact/compact.component.html b/src/app/main/content/pages/invoices/compact/compact.component.html
index c4279c8b..ec3da93d 100644
--- a/src/app/main/content/pages/invoices/compact/compact.component.html
+++ b/src/app/main/content/pages/invoices/compact/compact.component.html
@@ -1,4 +1,4 @@
-<div id="invoice" class="compact page-layout blank" fxLayout="row" perfect-scrollbar>
+<div id="invoice" class="compact page-layout blank" fxLayout="row" perfectScrollbar>
 
     <div class="invoice-container">
 
diff --git a/src/app/main/content/pages/invoices/modern/modern.component.html b/src/app/main/content/pages/invoices/modern/modern.component.html
index 1ed1c845..0021b3bd 100644
--- a/src/app/main/content/pages/invoices/modern/modern.component.html
+++ b/src/app/main/content/pages/invoices/modern/modern.component.html
@@ -1,4 +1,4 @@
-<div id="invoice" class="modern page-layout blank" fxLayout="row" perfect-scrollbar>
+<div id="invoice" class="modern page-layout blank" fxLayout="row" perfectScrollbar>
 
     <div class="invoice-container">
 
diff --git a/src/app/main/content/pages/maintenance/maintenance.component.html b/src/app/main/content/pages/maintenance/maintenance.component.html
index 848319da..d4721910 100644
--- a/src/app/main/content/pages/maintenance/maintenance.component.html
+++ b/src/app/main/content/pages/maintenance/maintenance.component.html
@@ -1,4 +1,4 @@
-<div id="maintenance" fxLayout="column" perfect-scrollbar>
+<div id="maintenance" fxLayout="column" perfectScrollbar>
 
     <div id="maintenance-form-wrapper" fxLayout="column" fxLayoutAlign="center center">
 
diff --git a/src/app/main/content/pages/profile/profile.component.html b/src/app/main/content/pages/profile/profile.component.html
index 01edc781..e33e5e60 100644
--- a/src/app/main/content/pages/profile/profile.component.html
+++ b/src/app/main/content/pages/profile/profile.component.html
@@ -1,4 +1,4 @@
-<div id="profile" class="page-layout simple tabbed" perfect-scrollbar>
+<div id="profile" class="page-layout simple tabbed" perfectScrollbar>
 
     <!-- HEADER -->
     <div class="header p-24" fxLayout="column" fxLayoutAlign="center center" fxLayout.gt-sm="row"
diff --git a/src/app/main/content/pages/search/search.component.html b/src/app/main/content/pages/search/search.component.html
index 119be965..3f789344 100644
--- a/src/app/main/content/pages/search/search.component.html
+++ b/src/app/main/content/pages/search/search.component.html
@@ -1,4 +1,4 @@
-<div id="search" class="page-layout simple tabbed" perfect-scrollbar>
+<div id="search" class="page-layout simple tabbed" perfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24" fxLayout="column" fxLayoutAlign="center center" fxLayout.gt-sm="row"
diff --git a/src/app/main/content/services/config/config.component.html b/src/app/main/content/services/config/config.component.html
index 958f8310..d4db2c5e 100644
--- a/src/app/main/content/services/config/config.component.html
+++ b/src/app/main/content/services/config/config.component.html
@@ -1,4 +1,4 @@
-<div id="config" class="page-layout simple fullwidth" perfect-scrollbar>
+<div id="config" class="page-layout simple fullwidth" perfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/content/services/splash-screen/splash-screen.component.html b/src/app/main/content/services/splash-screen/splash-screen.component.html
index 2004cc1f..39e3c392 100644
--- a/src/app/main/content/services/splash-screen/splash-screen.component.html
+++ b/src/app/main/content/services/splash-screen/splash-screen.component.html
@@ -1,4 +1,4 @@
-<div id="splash-screen" class="page-layout simple fullwidth" perfect-scrollbar>
+<div id="splash-screen" class="page-layout simple fullwidth" perfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/content/ui/colors/colors.component.html b/src/app/main/content/ui/colors/colors.component.html
index b2dc5486..67da3633 100644
--- a/src/app/main/content/ui/colors/colors.component.html
+++ b/src/app/main/content/ui/colors/colors.component.html
@@ -1,4 +1,4 @@
-<div id="material-colors" class="page-layout simple tabbed" fxLayout="column" perfect-scrollbar>
+<div id="material-colors" class="page-layout simple tabbed" fxLayout="column" perfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="space-between center">
diff --git a/src/app/main/content/ui/forms/forms.component.html b/src/app/main/content/ui/forms/forms.component.html
index b5c32111..2a64ee2f 100644
--- a/src/app/main/content/ui/forms/forms.component.html
+++ b/src/app/main/content/ui/forms/forms.component.html
@@ -1,4 +1,4 @@
-<div id="forms" class="page-layout simple fullwidth" fxLayout="column" perfect-scrollbar>
+<div id="forms" class="page-layout simple fullwidth" fxLayout="column" perfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/content/ui/helper-classes/helper-classes.component.html b/src/app/main/content/ui/helper-classes/helper-classes.component.html
index e8d21168..375dde1f 100644
--- a/src/app/main/content/ui/helper-classes/helper-classes.component.html
+++ b/src/app/main/content/ui/helper-classes/helper-classes.component.html
@@ -1,4 +1,4 @@
-<div id="helper-classes" class="page-layout simple tabbed" fxLayout="column" perfect-scrollbar>
+<div id="helper-classes" class="page-layout simple tabbed" fxLayout="column" perfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/content/ui/icons/icons.component.html b/src/app/main/content/ui/icons/icons.component.html
index 422f430b..535acd27 100644
--- a/src/app/main/content/ui/icons/icons.component.html
+++ b/src/app/main/content/ui/icons/icons.component.html
@@ -1,4 +1,4 @@
-<div id="helper-classes" class="page-layout simple tabbed" fxLayout="column" perfect-scrollbar>
+<div id="helper-classes" class="page-layout simple tabbed" fxLayout="column" perfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="space-between center">
diff --git a/src/app/main/content/ui/page-layouts/blank/blank.component.html b/src/app/main/content/ui/page-layouts/blank/blank.component.html
index 53b0ba78..e8b26ddb 100644
--- a/src/app/main/content/ui/page-layouts/blank/blank.component.html
+++ b/src/app/main/content/ui/page-layouts/blank/blank.component.html
@@ -1,4 +1,4 @@
-<div class="page-layout blank p-24" perfect-scrollbar>
+<div class="page-layout blank p-24" perfectScrollbar>
 
     <h2>Blank Page</h2>
 
diff --git a/src/app/main/content/ui/page-layouts/carded/fullwidth-2/fullwidth-2.component.html b/src/app/main/content/ui/page-layouts/carded/fullwidth-2/fullwidth-2.component.html
index 9034087b..a907e53a 100644
--- a/src/app/main/content/ui/page-layouts/carded/fullwidth-2/fullwidth-2.component.html
+++ b/src/app/main/content/ui/page-layouts/carded/fullwidth-2/fullwidth-2.component.html
@@ -1,4 +1,4 @@
-<div class="page-layout carded fullwidth single-scroll" perfect-scrollbar>
+<div class="page-layout carded fullwidth single-scroll" perfectScrollbar>
 
     <!-- TOP BACKGROUND -->
     <div class="top-bg md-accent-bg"></div>
diff --git a/src/app/main/content/ui/page-layouts/carded/fullwidth/fullwidth.component.html b/src/app/main/content/ui/page-layouts/carded/fullwidth/fullwidth.component.html
index 4dc282f2..b773dc15 100644
--- a/src/app/main/content/ui/page-layouts/carded/fullwidth/fullwidth.component.html
+++ b/src/app/main/content/ui/page-layouts/carded/fullwidth/fullwidth.component.html
@@ -1,4 +1,4 @@
-<div class="page-layout carded fullwidth" perfect-scrollbar>
+<div class="page-layout carded fullwidth" perfectScrollbar>
 
     <!-- TOP BACKGROUND -->
     <div class="top-bg md-accent-bg"></div>
@@ -23,7 +23,7 @@
             <!-- / CONTENT TOOLBAR -->
 
             <!-- CONTENT -->
-            <div class="content p-24" perfect-scrollbar>
+            <div class="content p-24" perfectScrollbar>
 
                 <fuse-demo-content></fuse-demo-content>
 
diff --git a/src/app/main/content/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.html b/src/app/main/content/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.html
index 894a42dd..a3142a62 100644
--- a/src/app/main/content/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.html
+++ b/src/app/main/content/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.html
@@ -1,4 +1,4 @@
-<div class="page-layout carded left-sidenav single-scroll" perfect-scrollbar>
+<div class="page-layout carded left-sidenav single-scroll" perfectScrollbar>
 
     <!-- TOP BACKGROUND -->
     <div class="top-bg md-accent-bg"></div>
@@ -17,7 +17,7 @@
             <!-- / SIDENAV HEADER -->
 
             <!-- SIDENAV CONTENT -->
-            <div class="content p-24" perfect-scrollbar>
+            <div class="content p-24" perfectScrollbar>
                 <fuse-demo-sidenav></fuse-demo-sidenav>
             </div>
             <!-- / SIDENAV CONTENT -->
@@ -50,7 +50,7 @@
                 <!-- / CONTENT TOOLBAR -->
 
                 <!-- CONTENT -->
-                <div class="content p-24" perfect-scrollbar>
+                <div class="content p-24" perfectScrollbar>
 
                     <fuse-demo-content></fuse-demo-content>
 
diff --git a/src/app/main/content/ui/page-layouts/carded/left-sidenav/left-sidenav.component.html b/src/app/main/content/ui/page-layouts/carded/left-sidenav/left-sidenav.component.html
index df2365d5..291bf374 100644
--- a/src/app/main/content/ui/page-layouts/carded/left-sidenav/left-sidenav.component.html
+++ b/src/app/main/content/ui/page-layouts/carded/left-sidenav/left-sidenav.component.html
@@ -1,4 +1,4 @@
-<div class="page-layout carded left-sidenav" perfect-scrollbar>
+<div class="page-layout carded left-sidenav" perfectScrollbar>
 
     <!-- TOP BACKGROUND -->
     <div class="top-bg md-accent-bg"></div>
@@ -17,7 +17,7 @@
             <!-- / SIDENAV HEADER -->
 
             <!-- SIDENAV CONTENT -->
-            <div class="content p-24" perfect-scrollbar>
+            <div class="content p-24" perfectScrollbar>
 
                 <fuse-demo-sidenav></fuse-demo-sidenav>
 
@@ -52,7 +52,7 @@
                 <!-- / CONTENT TOOLBAR -->
 
                 <!-- CONTENT -->
-                <div class="content p-24" perfect-scrollbar>
+                <div class="content p-24" perfectScrollbar>
 
                     <fuse-demo-content></fuse-demo-content>
 
diff --git a/src/app/main/content/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.html b/src/app/main/content/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.html
index 351dcbc7..3609d0e2 100644
--- a/src/app/main/content/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.html
+++ b/src/app/main/content/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.html
@@ -1,4 +1,4 @@
-<div class="page-layout carded right-sidenav single-scroll" perfect-scrollbar>
+<div class="page-layout carded right-sidenav single-scroll" perfectScrollbar>
 
     <!-- TOP BACKGROUND -->
     <div class="top-bg md-accent-bg"></div>
@@ -31,7 +31,7 @@
                 <!-- / CONTENT TOOLBAR -->
 
                 <!-- CONTENT -->
-                <div class="content p-24" perfect-scrollbar>
+                <div class="content p-24" perfectScrollbar>
 
                     <fuse-demo-content></fuse-demo-content>
 
@@ -55,7 +55,7 @@
             <!-- / SIDENAV HEADER -->
 
             <!-- SIDENAV CONTENT -->
-            <div class="content p-24" perfect-scrollbar>
+            <div class="content p-24" perfectScrollbar>
                 <fuse-demo-sidenav></fuse-demo-sidenav>
             </div>
             <!-- / SIDENAV CONTENT -->
diff --git a/src/app/main/content/ui/page-layouts/carded/right-sidenav/right-sidenav.component.html b/src/app/main/content/ui/page-layouts/carded/right-sidenav/right-sidenav.component.html
index ff20f210..58fa1092 100644
--- a/src/app/main/content/ui/page-layouts/carded/right-sidenav/right-sidenav.component.html
+++ b/src/app/main/content/ui/page-layouts/carded/right-sidenav/right-sidenav.component.html
@@ -1,4 +1,4 @@
-<div class="page-layout carded right-sidenav" perfect-scrollbar>
+<div class="page-layout carded right-sidenav" perfectScrollbar>
 
     <!-- TOP BACKGROUND -->
     <div class="top-bg md-accent-bg"></div>
@@ -31,7 +31,7 @@
                 <!-- / CONTENT TOOLBAR -->
 
                 <!-- CONTENT -->
-                <div class="content p-24" perfect-scrollbar>
+                <div class="content p-24" perfectScrollbar>
 
                     <fuse-demo-content></fuse-demo-content>
 
@@ -55,7 +55,7 @@
             <!-- / SIDENAV HEADER -->
 
             <!-- SIDENAV CONTENT -->
-            <div class="content p-24" perfect-scrollbar>
+            <div class="content p-24" perfectScrollbar>
                 <fuse-demo-sidenav></fuse-demo-sidenav>
             </div>
             <!-- / SIDENAV CONTENT -->
diff --git a/src/app/main/content/ui/page-layouts/simple/fullwidth/fullwidth.component.html b/src/app/main/content/ui/page-layouts/simple/fullwidth/fullwidth.component.html
index cb512f52..dce9c771 100644
--- a/src/app/main/content/ui/page-layouts/simple/fullwidth/fullwidth.component.html
+++ b/src/app/main/content/ui/page-layouts/simple/fullwidth/fullwidth.component.html
@@ -1,4 +1,4 @@
-<div class="page-layout simple fullwidth" perfect-scrollbar>
+<div class="page-layout simple fullwidth" perfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/content/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component.html b/src/app/main/content/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component.html
index 1c2b9ad7..32f5ca49 100644
--- a/src/app/main/content/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component.html
+++ b/src/app/main/content/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component.html
@@ -1,4 +1,4 @@
-<div class="page-layout simple left-sidenav single-scroll" perfect-scrollbar>
+<div class="page-layout simple left-sidenav single-scroll" perfectScrollbar>
 
     <md-sidenav-container>
 
@@ -12,7 +12,7 @@
         <!-- / SIDENAV -->
 
         <!-- CENTER -->
-        <div class="center" perfect-scrollbar>
+        <div class="center" perfectScrollbar>
 
             <!-- HEADER -->
             <div class="header md-accent-bg p-24" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/content/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.html b/src/app/main/content/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.html
index 7740289f..2209e661 100644
--- a/src/app/main/content/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.html
+++ b/src/app/main/content/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.html
@@ -1,4 +1,4 @@
-<div class="page-layout simple left-sidenav inner-sidenav" perfect-scrollbar>
+<div class="page-layout simple left-sidenav inner-sidenav" perfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24" fxLayout="row" fxLayoutAlign="start center">
@@ -22,7 +22,7 @@
         <md-sidenav class="sidenav mat-sidenav-opened" align="start" opened="true" mode="side"
                     fuseMdSidenavHelper="simple-left-sidenav-3" md-is-locked-open="gt-md">
 
-            <div class="sidenav-content" perfect-scrollbar>
+            <div class="sidenav-content" perfectScrollbar>
 
                 <fuse-demo-sidenav></fuse-demo-sidenav>
 
@@ -32,7 +32,7 @@
         <!-- / SIDENAV -->
 
         <!-- CENTER -->
-        <div class="center p-24" perfect-scrollbar>
+        <div class="center p-24" perfectScrollbar>
 
             <!-- CONTENT -->
             <div class="content p-24 mat-elevation-z4 md-white-bg">
diff --git a/src/app/main/content/ui/page-layouts/simple/left-sidenav/left-sidenav.component.html b/src/app/main/content/ui/page-layouts/simple/left-sidenav/left-sidenav.component.html
index 4df8ed46..cce37f1d 100644
--- a/src/app/main/content/ui/page-layouts/simple/left-sidenav/left-sidenav.component.html
+++ b/src/app/main/content/ui/page-layouts/simple/left-sidenav/left-sidenav.component.html
@@ -1,4 +1,4 @@
-<div class="page-layout simple left-sidenav" perfect-scrollbar>
+<div class="page-layout simple left-sidenav" perfectScrollbar>
 
     <md-sidenav-container>
 
@@ -6,7 +6,7 @@
         <md-sidenav class="sidenav mat-sidenav-opened" align="start" opened="true" mode="side"
                     fuseMdSidenavHelper="simple-left-sidenav" md-is-locked-open="gt-md">
 
-            <div class="sidenav-content p-24" perfect-scrollbar>
+            <div class="sidenav-content p-24" perfectScrollbar>
 
                 <fuse-demo-sidenav></fuse-demo-sidenav>
 
@@ -16,7 +16,7 @@
         <!-- / SIDENAV -->
 
         <!-- CENTER -->
-        <div class="center" perfect-scrollbar>
+        <div class="center" perfectScrollbar>
 
             <!-- HEADER -->
             <div class="header md-accent-bg p-24" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/content/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.html b/src/app/main/content/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.html
index 01ae0e65..f43fec7f 100644
--- a/src/app/main/content/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.html
+++ b/src/app/main/content/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.html
@@ -1,9 +1,9 @@
-<div class="page-layout simple right-sidenav single-scroll" perfect-scrollbar>
+<div class="page-layout simple right-sidenav single-scroll" perfectScrollbar>
 
     <md-sidenav-container>
 
         <!-- CENTER -->
-        <div class="center" perfect-scrollbar>
+        <div class="center" perfectScrollbar>
 
             <!-- HEADER -->
             <div class="header md-accent-bg p-24" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/content/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component.html b/src/app/main/content/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component.html
index 7329505e..aa320940 100644
--- a/src/app/main/content/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component.html
+++ b/src/app/main/content/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component.html
@@ -1,4 +1,4 @@
-<div class="page-layout simple right-sidenav inner-sidenav" perfect-scrollbar>
+<div class="page-layout simple right-sidenav inner-sidenav" perfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24" fxLayout="row" fxLayoutAlign="start center">
@@ -19,7 +19,7 @@
     <md-sidenav-container>
 
         <!-- CENTER -->
-        <div class="center p-24" perfect-scrollbar>
+        <div class="center p-24" perfectScrollbar>
 
             <!-- CONTENT -->
             <div class="content p-24 mat-elevation-z4 md-white-bg">
@@ -36,7 +36,7 @@
         <md-sidenav class="sidenav mat-sidenav-opened" align="end" opened="true" mode="side"
                     fuseMdSidenavHelper="simple-right-sidenav-3" md-is-locked-open="gt-md">
 
-            <div class="sidenav-content" perfect-scrollbar>
+            <div class="sidenav-content" perfectScrollbar>
 
                 <fuse-demo-sidenav></fuse-demo-sidenav>
 
diff --git a/src/app/main/content/ui/page-layouts/simple/right-sidenav/right-sidenav.component.html b/src/app/main/content/ui/page-layouts/simple/right-sidenav/right-sidenav.component.html
index b8988210..f530784d 100644
--- a/src/app/main/content/ui/page-layouts/simple/right-sidenav/right-sidenav.component.html
+++ b/src/app/main/content/ui/page-layouts/simple/right-sidenav/right-sidenav.component.html
@@ -1,9 +1,9 @@
-<div class="page-layout simple right-sidenav" perfect-scrollbar>
+<div class="page-layout simple right-sidenav" perfectScrollbar>
 
     <md-sidenav-container>
 
         <!-- CENTER -->
-        <div class="center" perfect-scrollbar>
+        <div class="center" perfectScrollbar>
 
             <!-- HEADER -->
             <div class="header md-accent-bg p-24" fxLayout="row" fxLayoutAlign="start center">
@@ -36,7 +36,7 @@
         <md-sidenav class="sidenav mat-sidenav-opened" align="end" opened="true" mode="side"
                     fuseMdSidenavHelper="simple-right-sidenav" md-is-locked-open="gt-md">
 
-            <div class="sidenav-content p-24" perfect-scrollbar>
+            <div class="sidenav-content p-24" perfectScrollbar>
 
                 <fuse-demo-sidenav></fuse-demo-sidenav>
 
diff --git a/src/app/main/content/ui/page-layouts/simple/tabbed/tabbed.component.html b/src/app/main/content/ui/page-layouts/simple/tabbed/tabbed.component.html
index 4dd2b6d2..299b3c9f 100644
--- a/src/app/main/content/ui/page-layouts/simple/tabbed/tabbed.component.html
+++ b/src/app/main/content/ui/page-layouts/simple/tabbed/tabbed.component.html
@@ -1,4 +1,4 @@
-<div class="page-layout simple tabbed" perfect-scrollbar>
+<div class="page-layout simple tabbed" perfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24">
diff --git a/src/app/main/content/ui/typography/typography.component.html b/src/app/main/content/ui/typography/typography.component.html
index bbfa8e2d..53e180f3 100644
--- a/src/app/main/content/ui/typography/typography.component.html
+++ b/src/app/main/content/ui/typography/typography.component.html
@@ -1,4 +1,4 @@
-<div id="typography" class="page-layout simple tabbed" fxLayout="column" perfect-scrollbar>
+<div id="typography" class="page-layout simple tabbed" fxLayout="column" perfectScrollbar>
 
     <!-- HEADER -->
     <div class="header md-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
diff --git a/src/app/main/footer/footer.component.html b/src/app/main/footer/footer.component.html
index 0153af89..e41f96d1 100644
--- a/src/app/main/footer/footer.component.html
+++ b/src/app/main/footer/footer.component.html
@@ -1,14 +1,20 @@
 <md-toolbar>
 
-    <div fxLayout="row" fxLayoutAlign="center center" fxFlex>
+    <div fxLayout="row" fxLayoutAlign="center center" fxLayoutAlign.gt-xs="space-between center" fxFlex>
 
         <a href="http://themeforest.net/item/fuse-angularjs-material-design-admin-template/12931855?ref=srcn"
-           target="_blank" md-button class="ml-8 ml-sm-24 md-accent-800-bg" fxFlex="0 0 auto" fxLayout="row"
+           target="_blank" md-button class="md-pink-bg" fxFlex="0 0 auto" fxLayout="row"
            fxLayoutAlign="start center">
             <md-icon class="s-16 mr-sm-4">shopping_cart</md-icon>
-            <span>Purchase Fuse template (Angular4+)</span>
+            <span>Purchase FUSE (Angular4+)</span>
         </a>
 
+        <div fxLayout="row" fxLayoutAlign="start center" fxHide fxShow.gt-xs>
+            <a md-button href="http://fuse-angular-material-docs.withinpixels.com/" target="_blank">Documentation</a>
+            <span>&bull;</span>
+            <a md-button href="http://withinpixels.com/themes/fuse/changelog" target="_blank">Changelog</a>
+        </div>
+
     </div>
 
 </md-toolbar>
diff --git a/src/app/main/toolbar/toolbar.component.html b/src/app/main/toolbar/toolbar.component.html
index 4f6ab0ef..ad5da2d1 100644
--- a/src/app/main/toolbar/toolbar.component.html
+++ b/src/app/main/toolbar/toolbar.component.html
@@ -13,7 +13,7 @@
 
             <div fxLayout="row" fxLayoutAlign="start center" *ngIf="horizontalNav">
                 <div class="logo ml-16">
-                    <span class="logo-icon">F</span>
+                    <img class="logo-icon" src="assets/images/logos/fuse.svg">
                 </div>
             </div>