Added missing variables that prevents skeleton from building as it is

Merge branch 'master' into skeleton
Fixes #44 : Removed angular material elements assets
2025-12-22 19:57:06 +00:00 · 2017-11-13 12:30:11 +03:00 · 2017-11-13 11:09:27 +03:00 · 2017-11-08 15:11:20 +03:00 · 2017-11-08 15:10:51 +03:00 · 2017-11-04 16:50:03 +03:00
1200 changed files with 6241 additions and 72156 deletions
--- a/.angular-cli.json
+++ b/.angular-cli.json
@@ -0,0 +1,61 @@
+{
+    "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+    "project": {
+        "name": "fuse2"
+    },
+    "apps": [
+        {
+            "root": "src",
+            "outDir": "dist",
+            "assets": [
+                "assets",
+                "favicon.ico"
+            ],
+            "index": "index.html",
+            "main": "main.ts",
+            "polyfills": "polyfills.ts",
+            "test": "test.ts",
+            "tsconfig": "tsconfig.app.json",
+            "testTsconfig": "tsconfig.spec.json",
+            "prefix": "app",
+            "styles": [
+                "styles.scss"
+            ],
+            "scripts": [],
+            "environmentSource": "environments/environment.ts",
+            "environments": {
+                "dev": "environments/environment.ts",
+                "hmr": "environments/environment.hmr.ts",
+                "prod": "environments/environment.prod.ts"
+            }
+        }
+    ],
+    "e2e": {
+        "protractor": {
+            "config": "./protractor.conf.js"
+        }
+    },
+    "lint": [
+        {
+            "project": "src/tsconfig.app.json",
+            "exclude": "**/node_modules/**"
+        },
+        {
+            "project": "src/tsconfig.spec.json",
+            "exclude": "**/node_modules/**"
+        },
+        {
+            "project": "e2e/tsconfig.e2e.json",
+            "exclude": "**/node_modules/**"
+        }
+    ],
+    "test": {
+        "karma": {
+            "config": "./karma.conf.js"
+        }
+    },
+    "defaults": {
+        "styleExt": "scss",
+        "component": {}
+    }
+}
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,4 +1,3 @@
-# Editor configuration, see http://editorconfig.org
 root = true

 [*]
--- a/.gitignore
+++ b/.gitignore
@@ -30,10 +30,13 @@
 /coverage
 /libpeerconnection.log
 npm-debug.log
-yarn-error.log
 testem.log
 /typings

+# e2e
+/e2e/*.js
+/e2e/*.map
+
 # System Files
 .DS_Store
 Thumbs.db
--- a/1
+++ b/1
@@ -1 +0,0 @@
-https://themeforest.net/licenses/terms/regular
--- a/README.md
+++ b/README.md
@@ -1,12 +1,6 @@
 # Fuse2

-Material Design Admin Template with Angular 6+ and Angular Material 2
-
-## The Community
-
-Share your ideas, discuss Fuse and help each other.
-
-[Click here](http://fusetheme.com/community) to see our Community page.
+Material Design Admin Template with Angular 5+ and Angular Material 2

 ## Development server

@@ -14,11 +8,11 @@ Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app w

 ## Code scaffolding

-Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`.
+Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|module`.

 ## Build

-Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `--prod` flag for a production build.
+Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `-prod` flag for a production build.

 ## Running unit tests

@@ -27,8 +21,4 @@ Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.
 ## Running end-to-end tests

 Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
-
-## Further help
-
-To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).
-
+Before running the tests make sure you are serving the app via `ng serve`.
--- a/angular.json
+++ b/angular.json
@@ -1,140 +0,0 @@
-{
-    "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
-    "version": 1,
-    "newProjectRoot": "projects",
-    "projects": {
-        "fuse": {
-            "root": "",
-            "sourceRoot": "src",
-            "projectType": "application",
-            "prefix": "app",
-            "schematics": {
-                "@schematics/angular:component": {
-                    "styleext": "scss"
-                }
-            },
-            "architect": {
-                "build": {
-                    "builder": "@angular-devkit/build-angular:browser",
-                    "options": {
-                        "outputPath": "dist",
-                        "index": "src/index.html",
-                        "main": "src/main.ts",
-                        "polyfills": "src/polyfills.ts",
-                        "tsConfig": "src/tsconfig.app.json",
-                        "assets": [
-                            "src/favicon.ico",
-                            "src/assets",
-                            "src/app/main/content/components/angular-material"
-                        ],
-                        "styles": [
-                            "src/styles.scss"
-                        ],
-                        "scripts": []
-                    },
-                    "configurations": {
-                        "production": {
-                            "fileReplacements": [
-                                {
-                                    "replace": "src/environments/environment.ts",
-                                    "with": "src/environments/environment.prod.ts"
-                                }
-                            ],
-                            "optimization": true,
-                            "outputHashing": "all",
-                            "sourceMap": false,
-                            "extractCss": true,
-                            "namedChunks": false,
-                            "aot": true,
-                            "extractLicenses": true,
-                            "vendorChunk": false,
-                            "buildOptimizer": true
-                        }
-                    }
-                },
-                "serve": {
-                    "builder": "@angular-devkit/build-angular:dev-server",
-                    "options": {
-                        "browserTarget": "fuse:build"
-                    },
-                    "configurations": {
-                        "production": {
-                            "browserTarget": "fuse:build:production"
-                        },
-                        "hmr": {
-                            "hmr": true,
-                            "fileReplacements": [
-                                {
-                                    "replace": "src/environments/environment.ts",
-                                    "with": "src/environments/environment.hmr.ts"
-                                }
-                            ]
-                        }
-                    }
-                },
-                "extract-i18n": {
-                    "builder": "@angular-devkit/build-angular:extract-i18n",
-                    "options": {
-                        "browserTarget": "fuse:build"
-                    }
-                },
-                "test": {
-                    "builder": "@angular-devkit/build-angular:karma",
-                    "options": {
-                        "main": "src/test.ts",
-                        "polyfills": "src/polyfills.ts",
-                        "tsConfig": "src/tsconfig.spec.json",
-                        "karmaConfig": "src/karma.conf.js",
-                        "styles": [
-                            "styles.scss"
-                        ],
-                        "scripts": [],
-                        "assets": [
-                            "src/favicon.ico",
-                            "src/assets"
-                        ]
-                    }
-                },
-                "lint": {
-                    "builder": "@angular-devkit/build-angular:tslint",
-                    "options": {
-                        "tsConfig": [
-                            "src/tsconfig.app.json",
-                            "src/tsconfig.spec.json"
-                        ],
-                        "exclude": [
-                            "**/node_modules/**",
-                            "**/src/app/fuse-fake-db/**/*",
-                            "**/src/assets/angular-material-examples/**/*"
-                        ]
-                    }
-                }
-            }
-        },
-        "fuse-e2e": {
-            "root": "e2e/",
-            "projectType": "application",
-            "architect": {
-                "e2e": {
-                    "builder": "@angular-devkit/build-angular:protractor",
-                    "options": {
-                        "protractorConfig": "e2e/protractor.conf.js",
-                        "devServerTarget": "fuse:serve"
-                    }
-                },
-                "lint": {
-                    "builder": "@angular-devkit/build-angular:tslint",
-                    "options": {
-                        "tsConfig": "e2e/tsconfig.e2e.json",
-                        "exclude": [
-                            "**/node_modules/**",
-                            "**/src/app/fuse-fake-db/**/*",
-                            "**/src/assets/angular-material-examples/**/*"
-                        ]
-                    }
-                }
-            }
-        }
-    },
-    "defaultProject": "fuse"
-}
--- a/e2e/src/app.e2e-spec.ts
+++ b/e2e/src/app.e2e-spec.ts
@@ -9,6 +9,6 @@ describe('Fuse2 App', () => {

    it('should display welcome message', () => {
        page.navigateTo();
-        expect(page.getParagraphText()).toEqual('Welcome to Fuse2!');
+        expect(page.getParagraphText()).toEqual('Welcome to app!');
    });
 });
--- a/e2e/src/app.po.ts
+++ b/e2e/src/app.po.ts
--- a/e2e/protractor.conf.js
+++ b/e2e/protractor.conf.js
@@ -1,31 +0,0 @@
-// Protractor configuration file, see link for more information
-// https://github.com/angular/protractor/blob/master/lib/config.ts
-
-const {SpecReporter} = require('jasmine-spec-reporter');
-
-exports.config = {
-    allScriptsTimeout: 11000,
-    specs            : [
-        './src/**/*.e2e-spec.ts'
-    ],
-    capabilities     : {
-        'browserName': 'chrome'
-    },
-    directConnect    : true,
-    baseUrl          : 'http://localhost:4200/',
-    framework        : 'jasmine',
-    jasmineNodeOpts  : {
-        showColors            : true,
-        defaultTimeoutInterval: 30000,
-        print                 : function ()
-        {
-        }
-    },
-    onPrepare()
-    {
-        require('ts-node').register({
-            project: require('path').join(__dirname, './tsconfig.e2e.json')
-        });
-        jasmine.getEnv().addReporter(new SpecReporter({spec: {displayStacktrace: true}}));
-    }
-};
--- a/e2e/tsconfig.e2e.json
+++ b/e2e/tsconfig.e2e.json
@@ -1,7 +1,8 @@
 {
  "extends": "../tsconfig.json",
  "compilerOptions": {
-    "outDir": "../out-tsc/app",
+    "outDir": "../out-tsc/e2e",
+    "baseUrl": "./",
    "module": "commonjs",
    "target": "es5",
    "types": [
@@ -10,4 +11,4 @@
      "node"
    ]
  }
-}
+}
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -0,0 +1,33 @@
+// Karma configuration file, see link for more information
+// https://karma-runner.github.io/1.0/config/configuration-file.html
+
+module.exports = function (config) {
+    config.set({
+        basePath: '',
+        frameworks: ['jasmine', '@angular/cli'],
+        plugins: [
+            require('karma-jasmine'),
+            require('karma-chrome-launcher'),
+            require('karma-jasmine-html-reporter'),
+            require('karma-coverage-istanbul-reporter'),
+            require('@angular/cli/plugins/karma')
+        ],
+        client:{
+            clearContext: false // leave Jasmine Spec Runner output visible in browser
+        },
+        coverageIstanbulReporter: {
+            reports: [ 'html', 'lcovonly' ],
+            fixWebpackSourcePaths: true
+        },
+        angularCli: {
+            environment: 'dev'
+        },
+        reporters: ['progress', 'kjhtml'],
+        port: 9876,
+        colors: true,
+        logLevel: config.LOG_INFO,
+        autoWatch: true,
+        browsers: ['Chrome'],
+        singleRun: false
+    });
+};
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,88 +1,72 @@
 {
-  "name": "fuse",
-  "version": "6.0.0",
-  "license": "https://themeforest.net/licenses/terms/regular",
+  "name": "fuse2",
+  "version": "1.2.1",
+  "license": "",
  "scripts": {
    "ng": "ng",
-    "start": "ng serve --open",
-    "start-hmr": "ng serve --configuration hmr -sm=false",
+    "start": "ng serve",
+    "start-hmr": "ng serve --hmr -e=hmr -sm=false",
    "start-hmr-sourcemaps": "ng serve --hmr -e=hmr",
    "build": "node --max_old_space_size=6144 ./node_modules/@angular/cli/bin/ng build --dev",
-    "build-stats": "node --max_old_space_size=6144 ./node_modules/@angular/cli/bin/ng build --dev --stats-json",
    "build-prod": "node --max_old_space_size=6144 ./node_modules/@angular/cli/bin/ng build --prod",
-    "build-prod-stats": "node --max_old_space_size=6144 ./node_modules/@angular/cli/bin/ng build --prod --stats-json",
    "test": "ng test",
    "lint": "ng lint",
-    "e2e": "ng e2e",
-    "bundle-report": "webpack-bundle-analyzer dist/stats.json"
+    "e2e": "ng e2e"
  },
  "private": true,
  "dependencies": {
    "@agm/core": "1.0.0-beta.2",
-    "@angular/animations": "6.0.0",
-    "@angular/cdk": "6.0.0",
-    "@angular/common": "6.0.0",
-    "@angular/compiler": "6.0.0",
-    "@angular/core": "6.0.0",
-    "@angular/flex-layout": "6.0.0-beta.15",
-    "@angular/forms": "6.0.0",
-    "@angular/http": "6.0.0",
-    "@angular/material": "6.0.0",
-    "@angular/material-moment-adapter": "6.0.0",
-    "@angular/platform-browser": "6.0.0",
-    "@angular/platform-browser-dynamic": "6.0.0",
-    "@angular/router": "6.0.0",
-    "@ngrx/effects": "5.2.0",
-    "@ngrx/router-store": "5.2.0",
-    "@ngrx/store": "5.2.0",
-    "@ngrx/store-devtools": "5.2.0",
-    "@ngx-translate/core": "10.0.1",
-    "@swimlane/ngx-charts": "7.3.0",
-    "@swimlane/ngx-datatable": "11.3.2",
-    "@swimlane/ngx-dnd": "3.2.0",
-    "@types/prismjs": "1.9.0",
-    "angular-calendar": "0.24.0",
-    "angular-in-memory-web-api": "0.6.0",
-    "chart.js": "2.7.2",
+    "@angular/animations": "5.0.1",
+    "@angular/cdk": "5.0.0-rc0",
+    "@angular/common": "5.0.1",
+    "@angular/compiler": "5.0.1",
+    "@angular/core": "5.0.1",
+    "@angular/flex-layout": "2.0.0-beta.10",
+    "@angular/forms": "5.0.1",
+    "@angular/http": "5.0.1",
+    "@angular/material": "5.0.0-rc0",
+    "@angular/platform-browser": "5.0.1",
+    "@angular/platform-browser-dynamic": "5.0.1",
+    "@angular/router": "5.0.1",
+    "@ngx-translate/core": "8.0.0",
+    "@swimlane/ngx-charts": "6.1.0",
+    "@swimlane/ngx-datatable": "11.0.3",
+    "@withinpixels/ngx-dnd": "3.1.0",
+    "angular-calendar": "0.21.3",
    "classlist.js": "1.1.20150312",
-    "core-js": "2.5.5",
-    "d3": "5.1.0",
+    "core-js": "2.5.1",
+    "d3": "4.11.0",
    "hammerjs": "2.0.8",
-    "lodash": "4.17.10",
-    "moment": "2.22.1",
-    "ng2-charts": "1.6.0",
-    "ngrx-store-freeze": "0.2.2",
-    "ngx-color-picker": "5.3.8",
-    "ngx-cookie-service": "1.0.10",
-    "perfect-scrollbar": "1.3.0",
-    "prismjs": "1.14.0",
-    "rxjs": "6.1.0",
-    "rxjs-compat": "6.1.0",
+    "highlight.js": "9.12.0",
+    "intl": "1.2.5",
+    "moment": "2.19.2",
+    "ngx-color-picker": "4.4.0",
+    "ngx-cookie-service": "1.0.9",
+    "perfect-scrollbar": "1.0.3",
+    "rxjs": "5.5.2",
    "web-animations-js": "2.3.1",
-    "zone.js": "0.8.26"
+    "zone.js": "0.8.18"
  },
  "devDependencies": {
-    "@angular/cli": "6.0.0",
-    "@angular/compiler-cli": "6.0.0",
-    "@angular/language-service": "6.0.0",
-    "@angular-devkit/build-angular": "0.6.0",
+    "@angular/cli": "1.5.0",
+    "@angular/compiler-cli": "5.0.1",
+    "@angular/language-service": "5.0.1",
    "@angularclass/hmr": "2.1.3",
-    "@types/jasmine": "2.8.7",
+    "@types/jasmine": "2.5.54",
    "@types/jasminewd2": "2.0.3",
-    "@types/lodash": "4.14.108",
-    "@types/node": "8.9.5",
-    "codelyzer": "4.2.1",
-    "jasmine-core": "2.99.1",
-    "jasmine-spec-reporter": "4.2.1",
+    "@types/node": "6.0.90",
+    "codelyzer": "3.2.2",
+    "jasmine-core": "2.6.4",
+    "jasmine-spec-reporter": "4.1.1",
    "karma": "1.7.1",
-    "karma-chrome-launcher": "2.2.0",
-    "karma-coverage-istanbul-reporter": "1.4.2",
-    "karma-jasmine": "1.1.2",
+    "karma-chrome-launcher": "2.1.1",
+    "karma-cli": "1.0.1",
+    "karma-coverage-istanbul-reporter": "1.3.0",
+    "karma-jasmine": "1.1.0",
    "karma-jasmine-html-reporter": "0.2.2",
-    "protractor": "5.3.1",
-    "ts-node": "5.0.1",
-    "tslint": "5.9.1",
-    "typescript": "2.7.2",
-    "webpack-bundle-analyzer": "2.11.1"
+    "protractor": "5.1.2",
+    "ts-node": "3.2.2",
+    "tslint": "5.7.0",
+    "typescript": "2.4.2"
  }
 }
--- a/protractor.conf.js
+++ b/protractor.conf.js
@@ -0,0 +1,28 @@
+// Protractor configuration file, see link for more information
+// https://github.com/angular/protractor/blob/master/lib/config.ts
+
+const { SpecReporter } = require('jasmine-spec-reporter');
+
+exports.config = {
+    allScriptsTimeout: 11000,
+    specs: [
+        './e2e/**/*.e2e-spec.ts'
+    ],
+    capabilities: {
+        'browserName': 'chrome'
+    },
+    directConnect: true,
+    baseUrl: 'http://localhost:4200/',
+    framework: 'jasmine',
+    jasmineNodeOpts: {
+        showColors: true,
+        defaultTimeoutInterval: 30000,
+        print: function() {}
+    },
+    onPrepare() {
+        require('ts-node').register({
+            project: 'e2e/tsconfig.e2e.json'
+        });
+        jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
+    }
+};
--- a/src/@fuse/components/confirm-dialog/confirm-dialog.module.ts
+++ b/src/@fuse/components/confirm-dialog/confirm-dialog.module.ts
@@ -1,20 +0,0 @@
-import { NgModule } from '@angular/core';
-import { MatButtonModule, MatDialogModule } from '@angular/material';
-
-import { FuseConfirmDialogComponent } from '@fuse/components/confirm-dialog/confirm-dialog.component';
-
-@NgModule({
-    declarations: [
-        FuseConfirmDialogComponent
-    ],
-    imports: [
-        MatDialogModule,
-        MatButtonModule
-    ],
-    entryComponents: [
-        FuseConfirmDialogComponent
-    ],
-})
-export class FuseConfirmDialogModule
-{
-}
--- a/src/@fuse/components/countdown/countdown.module.ts
+++ b/src/@fuse/components/countdown/countdown.module.ts
@@ -1,15 +0,0 @@
-import { NgModule } from '@angular/core';
-
-import { FuseCountdownComponent } from '@fuse/components/countdown/countdown.component';
-
-@NgModule({
-    declarations: [
-        FuseCountdownComponent
-    ],
-    exports: [
-        FuseCountdownComponent
-    ],
-})
-export class FuseCountdownModule
-{
-}
--- a/src/@fuse/components/demo/demo-content/demo-content.component.html
+++ b/src/@fuse/components/demo/demo-content/demo-content.component.html
@@ -1,75 +0,0 @@
-<!-- DEMO CONTENT -->
-<div class="demo-content">
-
-    <img src="assets/images/beach.jpg" alt="beach" style="max-width: 640px; width: 100%;">
-
-    <h1>Early Sunrise</h1>
-    <h4 class="secondary-text">Demo Content</h4>
-
-    <p>
-        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse tortor nibh, convallis sed purus nec,
-        auctor venenatis nisl. Suspendisse potenti. Nullam sagittis nulla in diam finibus, sed pharetra velit
-        vestibulum. Suspendisse euismod in urna eu posuere.
-    </p>
-
-    <blockquote>
-        <p>
-            Nunc vel lacinia lorem. Nullam tincidunt sed purus eu placerat. Donec id dictum erat. Etiam enim ex, dapibus
-            et tortor id, posuere pretium est. Maecenas fringilla ipsum vitae neque elementum, at eleifend ante
-            sollicitudin. Donec viverra augue dolor, a venenatis tellus consectetur sit amet.
-        </p>
-        <footer>
-            John Doe
-        </footer>
-    </blockquote>
-
-    <p>
-        Ut ornare sit amet velit vel congue. Ut nec tristique eros. Lorem ipsum dolor sit amet, consectetur adipiscing
-        elit. Vivamus sed lorem quis nibh porta iaculis. Vestibulum ut eleifend ante, at semper mi. Nam imperdiet est
-        nisi, quis hendrerit tellus convallis et. Morbi in luctus neque. Curabitur elementum ut est et gravida. In hac
-        habitasse platea dictumst.
-    </p>
-
-    <p>
-        In et placerat eros, eu tempor turpis. Curabitur ac felis finibus, elementum lectus vitae, venenatis est.
-        Integer mollis nisl a eros scelerisque varius. Etiam venenatis lectus vel erat condimentum tristique vel vel mi.
-        Nulla id euismod mi, et mollis tellus.
-    </p>
-
-    <p>
-        Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Class aptent taciti
-        sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Curabitur vitae sagittis odio.
-        Suspendisse ullamcorper nunc non pellentesque laoreet. Curabitur eu tortor id quam pretium mattis. Proin ut quam
-        velit.
-    </p>
-
-    <p>
-        Quisque sit amet risus enim. Aliquam sit amet interdum justo, at ultricies sapien. Suspendisse et semper urna,
-        in gravida eros. Quisque id nibh iaculis, euismod urna sed, egestas nisi. Donec eros metus, congue a imperdiet
-        feugiat, sagittis nec ipsum. Quisque dapibus mollis felis non tristique.
-    </p>
-
-    <p>
-        Ut auctor, metus sed dapibus tempus, urna diam auctor odio, in malesuada odio risus vitae nisi. Etiam blandit
-        ante urna, vitae placerat massa mollis in. Duis nec urna ac purus semper dictum ut eget justo. Aenean non
-        sagittis augue. Sed venenatis rhoncus enim eget ornare. Donec viverra sed felis at venenatis. Mauris aliquam
-        fringilla nulla, sit amet congue felis dignissim at.
-    </p>
-
-    <p>
-        Quisque accumsan augue tempor ante mollis, sed placerat diam porttitor. Vestibulum dignissim sem vel velit
-        eleifend, non pellentesque quam convallis. Pellentesque est dolor, dignissim ac tortor tristique, hendrerit
-        iaculis metus. Praesent pulvinar quam eu leo consectetur faucibus. Vestibulum purus diam, gravida sagittis
-        feugiat sit amet, tincidunt in ligula. Sed semper vestibulum magna. Lorem ipsum dolor sit amet, consectetur
-        adipiscing elit. Suspendisse tortor nibh, convallis sed purus nec, auctor venenatis nisl. Suspendisse potenti.
-    </p>
-
-    <p>
-        Nullam sagittis nulla in diam finibus, sed pharetra velit vestibulum. Suspendisse euismod in urna eu posuere.
-        Etiam blandit nunc arcu, et consectetur orci blandit a. Aliquam condimentum pharetra quam at ultricies. Nunc vel
-        lacinia lorem. Nullam tincidunt sed purus eu placerat. Donec id dictum erat. Etiam enim ex, dapibus et tortor
-        id, posuere pretium est. Maecenas fringilla ipsum vitae neque elementum, at eleifend ante sollicitudin. Donec
-        viverra augue dolor, a venenatis tellus consectetur sit amet...
-    </p>
-</div>
-<!-- / DEMO CONTENT -->
--- a/src/@fuse/components/highlight/highlight.component.scss
+++ b/src/@fuse/components/highlight/highlight.component.scss
@@ -1,6 +0,0 @@
-:host {
-    display: block;
-    padding: 8px;
-    background: #263238;
-    cursor: text;
-}
--- a/src/@fuse/components/highlight/highlight.component.ts
+++ b/src/@fuse/components/highlight/highlight.component.ts
@@ -1,102 +0,0 @@
-import { Component, ContentChild, ElementRef, Input, OnInit } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
-
-import * as Prism from 'prismjs/prism';
-import './prism-languages';
-
-@Component({
-    selector : 'fuse-highlight',
-    template : ' ',
-    styleUrls: ['./highlight.component.scss']
-})
-export class FuseHighlightComponent implements OnInit
-{
-    @ContentChild('source') source: ElementRef;
-    @Input('lang') lang: string;
-    @Input('path') path: string;
-
-    constructor(
-        private elementRef: ElementRef,
-        private http: HttpClient
-    )
-    {
-    }
-
-    ngOnInit()
-    {
-        // If there is no language defined, return...
-        if ( !this.lang )
-        {
-            return;
-        }
-
-        // If the path is defined...
-        if ( this.path )
-        {
-            // Get the source
-            this.http.get(this.path, {responseType: 'text'}).subscribe((response) => {
-
-                // Highlight it
-                this.highlight(response);
-            });
-        }
-
-        // If the path is not defined and the source element exists...
-        if ( !this.path && this.source )
-        {
-            // Highlight it
-            this.highlight(this.source.nativeElement.value);
-        }
-    }
-
-    highlight(sourceCode)
-    {
-        // Split the source into lines
-        const sourceLines = sourceCode.split('\n');
-
-        // Remove the first and the last line of the source
-        // code if they are blank lines. This way, the html
-        // can be formatted properly while using fuse-highlight
-        // component
-        if ( !sourceLines[0].trim() )
-        {
-            sourceLines.shift();
-        }
-
-        if ( !sourceLines[sourceLines.length - 1].trim() )
-        {
-            sourceLines.pop();
-        }
-
-        // Find the first non-whitespace char index in
-        // the first line of the source code
-        const indexOfFirstChar = sourceLines[0].search(/\S|$/);
-
-        // Generate the trimmed source
-        let source = '';
-
-        // Iterate through all the lines
-        sourceLines.forEach((line, index) => {
-
-            // Trim the beginning white space depending on the index
-            // and concat the source code
-            source = source + line.substr(indexOfFirstChar, line.length);
-
-            // If it's not the last line...
-            if ( index !== sourceLines.length - 1 )
-            {
-                // Add a line break at the end
-                source = source + '\n';
-            }
-        });
-
-        // Generate the highlighted code
-        const highlightedCode = Prism.highlight(source, Prism.languages[this.lang]);
-
-        // Replace the innerHTML of the component with the highlighted code
-        this.elementRef.nativeElement.innerHTML =
-            '<pre><code class="highlight language-' + this.lang + '">' + highlightedCode + '</code></pre>';
-
-    }
-}
-
--- a/src/@fuse/components/highlight/highlight.module.ts
+++ b/src/@fuse/components/highlight/highlight.module.ts
@@ -1,15 +0,0 @@
-import { NgModule } from '@angular/core';
-
-import { FuseHighlightComponent } from '@fuse/components/highlight/highlight.component';
-
-@NgModule({
-    declarations: [
-        FuseHighlightComponent
-    ],
-    exports: [
-        FuseHighlightComponent
-    ],
-})
-export class FuseHighlightModule
-{
-}
--- a/src/@fuse/components/highlight/prism-languages.ts
+++ b/src/@fuse/components/highlight/prism-languages.ts
@@ -1,17 +0,0 @@
-import 'prismjs/prism';
-import 'prismjs/components/prism-c';
-import 'prismjs/components/prism-cpp';
-import 'prismjs/components/prism-csharp';
-import 'prismjs/components/prism-css';
-import 'prismjs/components/prism-diff';
-import 'prismjs/components/prism-markup';
-import 'prismjs/components/prism-markup-templating';
-import 'prismjs/components/prism-java';
-import 'prismjs/components/prism-javascript';
-import 'prismjs/components/prism-json';
-import 'prismjs/components/prism-perl';
-import 'prismjs/components/prism-php';
-import 'prismjs/components/prism-python';
-import 'prismjs/components/prism-sass';
-import 'prismjs/components/prism-scss';
-import 'prismjs/components/prism-typescript';
--- a/src/@fuse/components/index.ts
+++ b/src/@fuse/components/index.ts
@@ -1,11 +0,0 @@
-export * from './confirm-dialog/confirm-dialog.module';
-export * from './countdown/countdown.module';
-export * from './demo/demo.module';
-export * from './highlight/highlight.module';
-export * from './material-color-picker/material-color-picker.module';
-export * from './navigation/navigation.module';
-export * from './search-bar/search-bar.module';
-export * from './shortcuts/shortcuts.module';
-export * from './sidebar/sidebar.module';
-export * from './theme-options/theme-options.module';
-export * from './widget/widget.module';
--- a/src/@fuse/components/material-color-picker/material-color-picker.module.ts
+++ b/src/@fuse/components/material-color-picker/material-color-picker.module.ts
@@ -1,33 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { FlexLayoutModule } from '@angular/flex-layout';
-
-import { MatButtonModule, MatIconModule, MatMenuModule, MatRippleModule } from '@angular/material';
-
-import { FusePipesModule } from '@fuse/pipes/pipes.module';
-
-import { FuseMaterialColorPickerComponent } from '@fuse/components/material-color-picker/material-color-picker.component';
-
-@NgModule({
-    declarations: [
-        FuseMaterialColorPickerComponent
-    ],
-    imports: [
-        CommonModule,
-
-        FlexLayoutModule,
-
-        MatButtonModule,
-        MatIconModule,
-        MatMenuModule,
-        MatRippleModule,
-
-        FusePipesModule
-    ],
-    exports: [
-        FuseMaterialColorPickerComponent
-    ],
-})
-export class FuseMaterialColorPickerModule
-{
-}
--- a/src/@fuse/components/navigation/horizontal/nav-collapse/nav-horizontal-collapse.component.html
+++ b/src/@fuse/components/navigation/horizontal/nav-collapse/nav-horizontal-collapse.component.html
@@ -1,52 +0,0 @@
-<ng-container *ngIf="!item.hidden">
-
-    <!-- normal collapse -->
-    <a class="nav-link" *ngIf="!item.url && !item.function" matRipple>
-        <ng-container *ngTemplateOutlet="itemContent"></ng-container>
-    </a>
-
-    <!-- item.url -->
-    <a class="nav-link" *ngIf="item.url && !item.function"
-       [routerLink]="[item.url]" routerLinkActive="active"
-       [routerLinkActiveOptions]="{exact: item.exactMatch || false}" matRipple>
-        <ng-container *ngTemplateOutlet="itemContent"></ng-container>
-    </a>
-
-    <!-- item.function -->
-    <span class="nav-link" *ngIf="!item.url && item.function" (click)="item.function()" matRipple>
-        <ng-container *ngTemplateOutlet="itemContent"></ng-container>
-    </span>
-
-    <!-- item.url && item.function -->
-    <a class="nav-link" *ngIf="item.url && item.function" (click)="item.function()"
-       [routerLink]="[item.url]" routerLinkActive="active"
-       [routerLinkActiveOptions]="{exact: item.exactMatch || false}" matRipple>
-        <ng-container *ngTemplateOutlet="itemContent"></ng-container>
-    </a>
-
-    <ng-template #itemContent>
-        <mat-icon class="nav-link-icon" *ngIf="item.icon">{{item.icon}}</mat-icon>
-        <span class="nav-link-title" [translate]="item.translate">{{item.title}}</span>
-        <span class="nav-link-badge" *ngIf="item.badge" [translate]="item.badge.translate"
-              [ngStyle]="{'background-color': item.badge.bg,'color': item.badge.fg}">
-            {{item.badge.title}}
-        </span>
-        <mat-icon class="collapse-arrow">keyboard_arrow_right</mat-icon>
-    </ng-template>
-
-    <div class="children" [ngClass]="{'open': isOpen}">
-
-        <div class="{{fuseSettings.colorClasses.navbar}}">
-
-            <ng-container *ngFor="let item of item.children">
-                <fuse-nav-horizontal-item *ngIf="item.type=='item'" [item]="item"></fuse-nav-horizontal-item>
-                <fuse-nav-horizontal-collapse *ngIf="item.type=='collapse'"
-                                              [item]="item"></fuse-nav-horizontal-collapse>
-                <fuse-nav-horizontal-collapse *ngIf="item.type=='group'" [item]="item"></fuse-nav-horizontal-collapse>
-            </ng-container>
-
-        </div>
-
-    </div>
-
-</ng-container>
--- a/src/@fuse/components/navigation/horizontal/nav-item/nav-horizontal-item.component.html
+++ b/src/@fuse/components/navigation/horizontal/nav-item/nav-horizontal-item.component.html
@@ -1,30 +0,0 @@
-<ng-container *ngIf="!item.hidden">
-
-    <!-- item.url -->
-    <a class="nav-link" *ngIf="item.url" [routerLink]="[item.url]" routerLinkActive="active"
-       [routerLinkActiveOptions]="{exact: item.exactMatch || false}" matRipple>
-        <ng-container *ngTemplateOutlet="itemContent"></ng-container>
-    </a>
-
-    <!-- item.function -->
-    <span class="nav-link" *ngIf="item.function" (click)="item.function()" matRipple>
-        <ng-container *ngTemplateOutlet="itemContent"></ng-container>
-    </span>
-
-    <!-- item.url && item.function -->
-    <a class="nav-link" *ngIf="item.url && item.function" (click)="item.function()"
-       [routerLink]="[item.url]" routerLinkActive="active"
-       [routerLinkActiveOptions]="{exact: item.exactMatch || false}" matRipple>
-        <ng-container *ngTemplateOutlet="itemContent"></ng-container>
-    </a>
-
-    <ng-template #itemContent>
-        <mat-icon class="nav-link-icon" *ngIf="item.icon">{{item.icon}}</mat-icon>
-        <span class="nav-link-title" [translate]="item.translate">{{item.title}}</span>
-        <span class="nav-link-badge" *ngIf="item.badge" [translate]="item.badge.translate"
-              [ngStyle]="{'background-color': item.badge.bg,'color': item.badge.fg}">
-            {{item.badge.title}}
-        </span>
-    </ng-template>
-
-</ng-container>
--- a/src/@fuse/components/navigation/navigation.component.scss
+++ b/src/@fuse/components/navigation/navigation.component.scss
@@ -1,12 +0,0 @@
-@import 'src/@fuse/scss/fuse';
-
-fuse-navigation {
-    display: flex;
-    flex: 1 0 auto;
-
-    #main-navigation {
-        margin: 0;
-        padding: 0;
-        width: 100%;
-    }
-}
--- a/src/@fuse/components/navigation/navigation.component.ts
+++ b/src/@fuse/components/navigation/navigation.component.ts
@@ -1,18 +0,0 @@
-import { Component, Input, ViewEncapsulation } from '@angular/core';
-
-@Component({
-    selector     : 'fuse-navigation',
-    templateUrl  : './navigation.component.html',
-    styleUrls    : ['./navigation.component.scss'],
-    encapsulation: ViewEncapsulation.None
-})
-export class FuseNavigationComponent
-{
-    @Input() layout = 'vertical';
-    @Input() navigation: any;
-
-    constructor()
-    {
-
-    }
-}
--- a/src/@fuse/components/navigation/navigation.service.ts
+++ b/src/@fuse/components/navigation/navigation.service.ts
@@ -1,48 +0,0 @@
-import { EventEmitter, Injectable } from '@angular/core';
-import { Subject } from 'rxjs/Subject';
-
-@Injectable()
-export class FuseNavigationService
-{
-    flatNavigation: any[] = [];
-
-    onItemCollapsed: Subject<any> = new Subject;
-    onItemCollapseToggled: Subject<any> = new Subject;
-
-    constructor()
-    {
-    }
-
-    /**
-     * Get flattened navigation array
-     * @param navigation
-     * @returns {any[]}
-     */
-    getFlatNavigation(navigation)
-    {
-        for ( const navItem of navigation )
-        {
-            if ( navItem.type === 'item' )
-            {
-                this.flatNavigation.push({
-                    title: navItem.title,
-                    type : navItem.type,
-                    icon : navItem.icon || false,
-                    url  : navItem.url
-                });
-
-                continue;
-            }
-
-            if ( navItem.type === 'collapse' || navItem.type === 'group' )
-            {
-                if ( navItem.children )
-                {
-                    this.getFlatNavigation(navItem.children);
-                }
-            }
-        }
-
-        return this.flatNavigation;
-    }
-}
--- a/src/@fuse/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.html
+++ b/src/@fuse/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.html
@@ -1,45 +0,0 @@
-<ng-container *ngIf="!item.hidden">
-
-    <!-- normal collapse -->
-    <a class="nav-link" *ngIf="!item.url && !item.function" (click)="toggleOpen($event)" matRipple>
-        <ng-container *ngTemplateOutlet="itemContent"></ng-container>
-    </a>
-
-    <!-- item.url -->
-    <a class="nav-link" *ngIf="item.url && !item.function" (click)="toggleOpen($event)"
-       [routerLink]="[item.url]" routerLinkActive="active"
-       [routerLinkActiveOptions]="{exact: item.exactMatch || false}" matRipple>
-        <ng-container *ngTemplateOutlet="itemContent"></ng-container>
-    </a>
-
-    <!-- item.function -->
-    <span class="nav-link" *ngIf="!item.url && item.function" (click)="toggleOpen($event);item.function()" matRipple>
-        <ng-container *ngTemplateOutlet="itemContent"></ng-container>
-    </span>
-
-    <!-- item.url && item.function -->
-    <a class="nav-link" *ngIf="item.url && item.function" (click)="toggleOpen($event);item.function()"
-       [routerLink]="[item.url]" routerLinkActive="active"
-       [routerLinkActiveOptions]="{exact: item.exactMatch || false}" matRipple>
-        <ng-container *ngTemplateOutlet="itemContent"></ng-container>
-    </a>
-
-    <ng-template #itemContent>
-        <mat-icon class="nav-link-icon" *ngIf="item.icon">{{item.icon}}</mat-icon>
-        <span class="nav-link-title" [translate]="item.translate">{{item.title}}</span>
-        <span class="nav-link-badge" *ngIf="item.badge" [translate]="item.badge.translate"
-              [ngStyle]="{'background-color': item.badge.bg,'color': item.badge.fg}">
-            {{item.badge.title}}
-        </span>
-        <mat-icon class="collapse-arrow">keyboard_arrow_right</mat-icon>
-    </ng-template>
-
-    <div class="children" [@slideInOut]="isOpen">
-        <ng-container *ngFor="let item of item.children">
-            <fuse-nav-vertical-item *ngIf="item.type=='item'" [item]="item"></fuse-nav-vertical-item>
-            <fuse-nav-vertical-collapse *ngIf="item.type=='collapse'" [item]="item"></fuse-nav-vertical-collapse>
-            <fuse-nav-vertical-group *ngIf="item.type=='group'" [item]="item"></fuse-nav-vertical-group>
-        </ng-container>
-    </div>
-
-</ng-container>
--- a/src/@fuse/components/navigation/vertical/nav-group/nav-vertical-group.component.html
+++ b/src/@fuse/components/navigation/vertical/nav-group/nav-vertical-group.component.html
@@ -1,15 +0,0 @@
-<ng-container *ngIf="!item.hidden">
-
-    <div class="group-title">
-        <span class="hint-text" [translate]="item.translate">{{ item.title }}</span>
-    </div>
-
-    <div class="group-items">
-        <ng-container *ngFor="let item of item.children">
-            <fuse-nav-vertical-group *ngIf="item.type=='group'" [item]="item"></fuse-nav-vertical-group>
-            <fuse-nav-vertical-collapse *ngIf="item.type=='collapse'" [item]="item"></fuse-nav-vertical-collapse>
-            <fuse-nav-vertical-item *ngIf="item.type=='item'" [item]="item"></fuse-nav-vertical-item>
-        </ng-container>
-    </div>
-
-</ng-container>
--- a/src/@fuse/components/navigation/vertical/nav-item/nav-vertical-item.component.html
+++ b/src/@fuse/components/navigation/vertical/nav-item/nav-vertical-item.component.html
@@ -1,31 +0,0 @@
-<ng-container *ngIf="!item.hidden">
-
-    <!-- item.url -->
-    <a class="nav-link" *ngIf="item.url && !item.function"
-       [routerLink]="[item.url]" routerLinkActive="active"
-       [routerLinkActiveOptions]="{exact: item.exactMatch || false}" matRipple>
-        <ng-container *ngTemplateOutlet="itemContent"></ng-container>
-    </a>
-
-    <!-- item.function -->
-    <span class="nav-link" *ngIf="!item.url && item.function" (click)="item.function()" matRipple>
-        <ng-container *ngTemplateOutlet="itemContent"></ng-container>
-    </span>
-
-    <!-- item.url && item.function -->
-    <a class="nav-link" *ngIf="item.url && item.function" (click)="item.function()"
-       [routerLink]="[item.url]" routerLinkActive="active"
-       [routerLinkActiveOptions]="{exact: item.exactMatch || false}" matRipple>
-        <ng-container *ngTemplateOutlet="itemContent"></ng-container>
-    </a>
-
-    <ng-template #itemContent>
-        <mat-icon class="nav-link-icon" *ngIf="item.icon">{{item.icon}}</mat-icon>
-        <span class="nav-link-title" [translate]="item.translate">{{item.title}}</span>
-        <span class="nav-link-badge" *ngIf="item.badge" [translate]="item.badge.translate"
-              [ngStyle]="{'background-color': item.badge.bg,'color': item.badge.fg}">
-            {{item.badge.title}}
-        </span>
-    </ng-template>
-
-</ng-container>
--- a/src/@fuse/components/search-bar/search-bar.component.scss
+++ b/src/@fuse/components/search-bar/search-bar.component.scss
@@ -1,91 +0,0 @@
-@import "src/@fuse/scss/fuse";
-
-:host {
-
-    .fuse-search-bar {
-        display: flex;
-        flex: 0 1 auto;
-        min-width: 64px;
-        height: 64px;
-        font-size: 13px;
-
-        @include media-breakpoint-down('sm') {
-            height: 56px;
-        }
-
-        .fuse-search-bar-content {
-            display: flex;
-            flex: 1 1 auto;
-            align-items: center;
-            justify-content: flex-start;
-
-            .fuse-search-bar-expander,
-            .fuse-search-bar-collapser {
-                cursor: pointer;
-                padding: 0 20px;
-                margin: 0;
-                width: 64px !important;
-                height: 64px !important;
-                line-height: 64px !important;
-
-                @include media-breakpoint-down('sm') {
-                    height: 56px !important;
-                    line-height: 56px !important;
-                }
-            }
-
-            .fuse-search-bar-loader {
-                width: 64px !important;
-                height: 64px !important;
-                line-height: 64px !important;
-
-                @include media-breakpoint-down('sm') {
-                    height: 56px !important;
-                    line-height: 56px !important;
-                }
-            }
-
-            .fuse-search-bar-collapser {
-                display: none;
-            }
-
-            #fuse-search-bar-input {
-                display: none;
-                flex: 1 0 auto;
-                min-height: 64px;
-                background-color: transparent;
-                font-size: 16px;
-            }
-        }
-
-        &.expanded {
-            position: absolute;
-            top: 0;
-            right: 0;
-            bottom: 0;
-            left: 0;
-            z-index: 10;
-
-            .fuse-search-bar-content {
-
-                #fuse-search-bar-input {
-                    display: flex;
-                }
-
-                .fuse-search-bar-collapser {
-                    display: flex;
-                }
-            }
-        }
-    }
-
-    body {
-
-        &.fuse-search-bar-expanded {
-
-            #toolbar {
-                z-index: 999 !important;
-            }
-        }
-    }
-}
--- a/src/@fuse/components/shortcuts/shortcuts.module.ts
+++ b/src/@fuse/components/shortcuts/shortcuts.module.ts
@@ -1,38 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { RouterModule } from '@angular/router';
-import { FlexLayoutModule } from '@angular/flex-layout';
-import { MatButtonModule, MatDividerModule, MatFormFieldModule, MatIconModule, MatInputModule, MatListModule, MatMenuModule, MatTooltipModule } from '@angular/material';
-import { CookieService } from 'ngx-cookie-service';
-
-import { FuseShortcutsComponent } from './shortcuts.component';
-
-@NgModule({
-    declarations: [
-        FuseShortcutsComponent
-    ],
-    imports     : [
-        CommonModule,
-        RouterModule,
-
-        FlexLayoutModule,
-
-        MatButtonModule,
-        MatDividerModule,
-        MatFormFieldModule,
-        MatIconModule,
-        MatInputModule,
-        MatMenuModule,
-        MatListModule,
-        MatTooltipModule
-    ],
-    exports     : [
-        FuseShortcutsComponent
-    ],
-    providers   : [
-        CookieService
-    ]
-})
-export class FuseShortcutsModule
-{
-}
--- a/src/@fuse/components/sidebar/sidebar.component.html
+++ b/src/@fuse/components/sidebar/sidebar.component.html
@@ -1 +0,0 @@
-<ng-content></ng-content>
--- a/src/@fuse/components/sidebar/sidebar.component.scss
+++ b/src/@fuse/components/sidebar/sidebar.component.scss
@@ -1,60 +0,0 @@
-fuse-sidebar {
-    display: flex;
-    flex-direction: column;
-    flex: 1 0 auto;
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    overflow-x: hidden;
-    overflow-y: auto;
-    width: 280px;
-    min-width: 280px;
-    max-width: 280px;
-    z-index: 1000;
-    transition-property: transform, width, min-width, max-width;
-    transition-duration: 150ms;
-    transition-timing-function: ease-in-out;
-    box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.35);
-
-    &.left-aligned {
-        left: 0;
-        transform: translateX(-100%);
-    }
-
-    &.right-aligned {
-        right: 0;
-        transform: translateX(100%);
-    }
-
-    &.open {
-        transform: translateX(0);
-    }
-
-    &.locked-open {
-        position: relative !important;
-        transform: translateX(0) !important;
-    }
-
-    &.folded {
-        position: absolute !important;
-        top: 0;
-        bottom: 0;
-
-        &:not(.unfolded) {
-            width: 64px;
-            min-width: 64px;
-            max-width: 64px;
-        }
-    }
-}
-
-.fuse-sidebar-overlay {
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    z-index: 3;
-    background-color: rgba(0, 0, 0, 0.6);
-    opacity: 0;
-}
--- a/src/@fuse/components/sidebar/sidebar.component.ts
+++ b/src/@fuse/components/sidebar/sidebar.component.ts
@@ -1,442 +0,0 @@
-import { Component, ElementRef, HostBinding, HostListener, Input, OnDestroy, OnInit, Renderer2, ViewEncapsulation } from '@angular/core';
-import { animate, AnimationBuilder, AnimationPlayer, style } from '@angular/animations';
-import { ObservableMedia } from '@angular/flex-layout';
-import { Subscription } from 'rxjs/Subscription';
-
-import { FuseSidebarService } from './sidebar.service';
-import { FuseMatchMediaService } from '@fuse/services/match-media.service';
-import { FuseConfigService } from '@fuse/services/config.service';
-
-@Component({
-    selector     : 'fuse-sidebar',
-    templateUrl  : './sidebar.component.html',
-    styleUrls    : ['./sidebar.component.scss'],
-    encapsulation: ViewEncapsulation.None
-})
-export class FuseSidebarComponent implements OnInit, OnDestroy
-{
-    // Name
-    @Input()
-    name: string;
-
-    // Align
-    @Input()
-    align: 'left' | 'right';
-
-    // Open
-    @HostBinding('class.open')
-    opened: boolean;
-
-    // Locked Open
-    @Input()
-    lockedOpen: string;
-
-    // isLockedOpen
-    @HostBinding('class.locked-open')
-    isLockedOpen: boolean;
-
-    // Folded
-    @HostBinding('class.folded')
-    @Input()
-    set folded(value: boolean)
-    {
-        // Only work if the sidebar is not closed
-        if ( !this.opened )
-        {
-            return;
-        }
-
-        // Set the folded
-        this._folded = value;
-
-        // Programmatically add/remove margin to the element
-        // that comes after or before based on the alignment
-        let sibling,
-            styleRule;
-
-        const styleValue = '64px';
-
-        // Get the sibling and set the style rule
-        if ( this.align === 'left' )
-        {
-            sibling = this.elementRef.nativeElement.nextElementSibling;
-            styleRule = 'marginLeft';
-        }
-        else
-        {
-            sibling = this.elementRef.nativeElement.previousElementSibling;
-            styleRule = 'marginRight';
-        }
-
-        // If there is no sibling, return...
-        if ( !sibling )
-        {
-            return;
-        }
-
-        // If folded...
-        if ( value )
-        {
-            // Set the style
-            this.renderer.setStyle(sibling, styleRule, styleValue);
-        }
-        // If unfolded...
-        else
-        {
-            // Remove the style
-            this.renderer.removeStyle(sibling, styleRule);
-        }
-    }
-
-    get folded(): boolean
-    {
-        return this._folded;
-    }
-
-    // Folded unfolded
-    @HostBinding('class.unfolded')
-    unfolded: boolean;
-
-    // Private
-    private _folded: boolean;
-    private _wasActive: boolean;
-    private _backdrop: HTMLElement | null = null;
-    private _player: AnimationPlayer;
-    private _onMediaChangeSubscription: Subscription;
-
-    /**
-     * Constructor
-     *
-     * @param {Renderer2} renderer
-     * @param {ElementRef} elementRef
-     * @param {AnimationBuilder} animationBuilder
-     * @param {ObservableMedia} observableMedia
-     * @param {FuseConfigService} fuseConfigService
-     * @param {FuseSidebarService} fuseSidebarService
-     * @param {FuseMatchMediaService} fuseMatchMediaService
-     */
-    constructor(
-        private renderer: Renderer2,
-        private elementRef: ElementRef,
-        private animationBuilder: AnimationBuilder,
-        private observableMedia: ObservableMedia,
-        private fuseConfigService: FuseConfigService,
-        private fuseSidebarService: FuseSidebarService,
-        private fuseMatchMediaService: FuseMatchMediaService
-    )
-    {
-        // Set the defaults
-        this.opened = false;
-        this.folded = false;
-        this.align = 'left';
-    }
-
-    /**
-     * On init
-     */
-    ngOnInit(): void
-    {
-        // Register the sidebar
-        this.fuseSidebarService.register(this.name, this);
-
-        // Setup alignment
-        this._setupAlignment();
-
-        // Setup lockedOpen
-        this._setupLockedOpen();
-    }
-
-    /**
-     * On destroy
-     */
-    ngOnDestroy(): void
-    {
-        // If the sidebar is folded, unfold it to revert modifications
-        if ( this.folded )
-        {
-            this.unfold();
-        }
-
-        // Unregister the sidebar
-        this.fuseSidebarService.unregister(this.name);
-
-        // Unsubscribe from the media watcher subscription
-        this._onMediaChangeSubscription.unsubscribe();
-    }
-
-    /**
-     * Set the sidebar alignment
-     *
-     * @private
-     */
-    private _setupAlignment(): void
-    {
-        // Add the correct class name to the sidebar
-        // element depending on the align attribute
-        if ( this.align === 'right' )
-        {
-            this.renderer.addClass(this.elementRef.nativeElement, 'right-aligned');
-        }
-        else
-        {
-            this.renderer.addClass(this.elementRef.nativeElement, 'left-aligned');
-        }
-    }
-
-    /**
-     * Setup the lockedOpen handler
-     *
-     * @private
-     */
-    private _setupLockedOpen(): void
-    {
-        // Return if the lockedOpen wasn't set
-        if ( !this.lockedOpen )
-        {
-            return;
-        }
-
-        // Set the wasActive for the first time
-        this._wasActive = false;
-
-        // Act on every media change
-        this._onMediaChangeSubscription =
-
-            this.fuseMatchMediaService.onMediaChange.subscribe(() => {
-
-                // Get the active status
-                const isActive = this.observableMedia.isActive(this.lockedOpen);
-
-                // If the both status are the same, don't act
-                if ( this._wasActive === isActive )
-                {
-                    return;
-                }
-
-                // Activate the lockedOpen
-                if ( isActive )
-                {
-                    // Set the lockedOpen status
-                    this.isLockedOpen = true;
-
-                    // Force the the opened status to true
-                    this.opened = true;
-
-                    // Read the folded setting from the config
-                    // and fold the sidebar if it's true
-                    if ( this.fuseConfigService.config.layout.navigationFolded )
-                    {
-                        this.fold();
-                    }
-
-                    // Hide the backdrop if any exists
-                    this.hideBackdrop();
-                }
-                // De-Activate the lockedOpen
-                else
-                {
-                    // Set the lockedOpen status
-                    this.isLockedOpen = false;
-
-                    // Unfold the sidebar in case if it was folded
-                    this.unfold();
-
-                    // Force the the opened status to close
-                    this.opened = false;
-                }
-
-                // Store the new active status
-                this._wasActive = isActive;
-            });
-    }
-
-    /**
-     * Open the sidebar
-     */
-    open(): void
-    {
-        if ( this.opened || this.isLockedOpen )
-        {
-            return;
-        }
-
-        // Show the backdrop
-        this.showBackdrop();
-
-        // Set the opened status
-        this.opened = true;
-    }
-
-    /**
-     * Close the sidebar
-     */
-    close(): void
-    {
-        if ( !this.opened || this.isLockedOpen )
-        {
-            return;
-        }
-
-        // Hide the backdrop
-        this.hideBackdrop();
-
-        // Set the opened status
-        this.opened = false;
-    }
-
-    /**
-     * Toggle open/close the sidebar
-     */
-    toggleOpen(): void
-    {
-        if ( this.opened )
-        {
-            this.close();
-        }
-        else
-        {
-            this.open();
-        }
-    }
-
-    /**
-     * Mouseenter
-     */
-    @HostListener('mouseenter')
-    onMouseEnter(): void
-    {
-        // Only work if the sidebar is folded
-        if ( !this.folded )
-        {
-            return;
-        }
-
-        // Unfold the sidebar temporarily
-        this.unfolded = true;
-    }
-
-    /**
-     * Mouseleave
-     */
-    @HostListener('mouseleave')
-    onMouseLeave(): void
-    {
-        // Only work if the sidebar is folded
-        if ( !this.folded )
-        {
-            return;
-        }
-
-        // Fold the sidebar back
-        this.unfolded = false;
-    }
-
-    /**
-     * Fold the sidebar permanently
-     */
-    fold(): void
-    {
-        // Only work if the sidebar is not folded
-        if ( this.folded )
-        {
-            return;
-        }
-
-        // Fold
-        this.folded = true;
-    }
-
-    /**
-     * Unfold the sidebar permanently
-     */
-    unfold(): void
-    {
-        // Only work if the sidebar is folded
-        if ( !this.folded )
-        {
-            return;
-        }
-
-        // Unfold
-        this.folded = false;
-    }
-
-    /**
-     * Toggle the sidebar fold/unfold permanently
-     */
-    toggleFold(): void
-    {
-        if ( this.folded )
-        {
-            this.unfold();
-        }
-        else
-        {
-            this.fold();
-        }
-    }
-
-    /**
-     * Show the backdrop
-     */
-    showBackdrop(): void
-    {
-        // Create the backdrop element
-        this._backdrop = this.renderer.createElement('div');
-
-        // Add a class to the backdrop element
-        this._backdrop.classList.add('fuse-sidebar-overlay');
-
-        // Append the backdrop to the parent of the sidebar
-        this.renderer.appendChild(this.elementRef.nativeElement.parentElement, this._backdrop);
-
-        // Create the enter animation and attach it to the player
-        this._player =
-            this.animationBuilder
-                .build([
-                    animate('300ms ease', style({opacity: 1}))
-                ]).create(this._backdrop);
-
-        // Play the animation
-        this._player.play();
-
-        // Add an event listener to the overlay
-        this._backdrop.addEventListener('click', () => {
-                this.close();
-            }
-        );
-    }
-
-    /**
-     * Hide the backdrop
-     */
-    hideBackdrop(): void
-    {
-        if ( !this._backdrop )
-        {
-            return;
-        }
-
-        // Create the leave animation and attach it to the player
-        this._player =
-            this.animationBuilder
-                .build([
-                    animate('300ms ease', style({opacity: 0}))
-                ]).create(this._backdrop);
-
-        // Play the animation
-        this._player.play();
-
-        // Once the animation is done...
-        this._player.onDone(() => {
-
-            // If the backdrop still exists...
-            if ( this._backdrop )
-            {
-                // Remove the backdrop
-                this._backdrop.parentNode.removeChild(this._backdrop);
-                this._backdrop = null;
-            }
-        });
-    }
-}
--- a/src/@fuse/components/sidebar/sidebar.module.ts
+++ b/src/@fuse/components/sidebar/sidebar.module.ts
@@ -1,15 +0,0 @@
-import { NgModule } from '@angular/core';
-
-import { FuseSidebarComponent } from './sidebar.component';
-
-@NgModule({
-    declarations: [
-        FuseSidebarComponent
-    ],
-    exports     : [
-        FuseSidebarComponent
-    ]
-})
-export class FuseSidebarModule
-{
-}
--- a/src/@fuse/components/sidebar/sidebar.service.ts
+++ b/src/@fuse/components/sidebar/sidebar.service.ts
@@ -1,75 +0,0 @@
-import { Injectable } from '@angular/core';
-
-import { FuseSidebarComponent } from './sidebar.component';
-
-@Injectable()
-export class FuseSidebarService
-{
-    // Private
-    private _registry: { [key: string]: FuseSidebarComponent } = {};
-
-    /**
-     * Constructor
-     */
-    constructor()
-    {
-
-    }
-
-    /**
-     * Add the sidebar to the registry
-     *
-     * @param key
-     * @param sidebar
-     */
-    register(key, sidebar): void
-    {
-        // Check if the key already being used
-        if ( this._registry[key] )
-        {
-            console.error(`The sidebar with the key '${key}' already exists. Either unregister it first or use a unique key.`);
-
-            return;
-        }
-
-        // Add to the registry
-        this._registry[key] = sidebar;
-    }
-
-    /**
-     * Remove the sidebar from the registry
-     *
-     * @param key
-     */
-    unregister(key): void
-    {
-        // Check if the sidebar exists
-        if ( !this._registry[key] )
-        {
-            console.warn(`The sidebar with the key '${key}' doesn't exist in the registry.`);
-        }
-
-        // Unregister the sidebar
-        delete this._registry[key];
-    }
-
-    /**
-     * Return the sidebar with the given key
-     *
-     * @param key
-     * @returns {FuseSidebarComponent}
-     */
-    getSidebar(key): FuseSidebarComponent
-    {
-        // Check if the sidebar exists
-        if ( !this._registry[key] )
-        {
-            console.warn(`The sidebar with the key '${key}' doesn't exist in the registry.`);
-
-            return;
-        }
-
-        // Return the sidebar
-        return this._registry[key];
-    }
-}
--- a/src/@fuse/components/theme-options/theme-options.module.ts
+++ b/src/@fuse/components/theme-options/theme-options.module.ts
@@ -1,37 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
-import { FlexLayoutModule } from '@angular/flex-layout';
-import { MatButtonModule, MatDividerModule, MatFormFieldModule, MatIconModule, MatOptionModule, MatRadioModule, MatSelectModule, MatSlideToggleModule } from '@angular/material';
-
-import { FuseMaterialColorPickerModule } from '@fuse/components/material-color-picker/material-color-picker.module';
-import { FuseThemeOptionsComponent } from '@fuse/components/theme-options/theme-options.component';
-
-@NgModule({
-    declarations: [
-        FuseThemeOptionsComponent
-    ],
-    imports     : [
-        CommonModule,
-        FormsModule,
-
-        FlexLayoutModule,
-
-        MatButtonModule,
-        MatDividerModule,
-        MatFormFieldModule,
-        MatIconModule,
-        MatOptionModule,
-        MatRadioModule,
-        MatSelectModule,
-        MatSlideToggleModule,
-
-        FuseMaterialColorPickerModule
-    ],
-    exports     : [
-        FuseThemeOptionsComponent
-    ]
-})
-export class FuseThemeOptionsModule
-{
-}
--- a/src/@fuse/components/widget/widget-toggle.directive.ts
+++ b/src/@fuse/components/widget/widget-toggle.directive.ts
@@ -1,11 +0,0 @@
-import { Directive, ElementRef } from '@angular/core';
-
-@Directive({
-    selector: '[fuseWidgetToggle]'
-})
-export class FuseWidgetToggleDirective
-{
-    constructor(public el: ElementRef)
-    {
-    }
-}
--- a/src/@fuse/directives/directives.ts
+++ b/src/@fuse/directives/directives.ts
@@ -1,24 +0,0 @@
-import { NgModule } from '@angular/core';
-
-import { FuseIfOnDomDirective } from '@fuse/directives/fuse-if-on-dom/fuse-if-on-dom.directive';
-import { FusePerfectScrollbarDirective } from '@fuse/directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive';
-import { FuseMatSidenavHelperDirective, FuseMatSidenavTogglerDirective } from '@fuse/directives/fuse-mat-sidenav/fuse-mat-sidenav.directive';
-
-@NgModule({
-    declarations: [
-        FuseIfOnDomDirective,
-        FuseMatSidenavHelperDirective,
-        FuseMatSidenavTogglerDirective,
-        FusePerfectScrollbarDirective
-    ],
-    imports     : [],
-    exports     : [
-        FuseIfOnDomDirective,
-        FuseMatSidenavHelperDirective,
-        FuseMatSidenavTogglerDirective,
-        FusePerfectScrollbarDirective
-    ]
-})
-export class FuseDirectivesModule
-{
-}
--- a/src/@fuse/fuse.module.ts
+++ b/src/@fuse/fuse.module.ts
@@ -1,47 +0,0 @@
-import { ModuleWithProviders, NgModule, Optional, SkipSelf } from '@angular/core';
-
-import { FUSE_CONFIG, FuseConfigService } from '@fuse/services/config.service';
-import { FuseCopierService } from '@fuse/services/copier.service';
-import { FuseMatchMediaService } from '@fuse/services/match-media.service';
-import { FuseMatSidenavHelperService } from '@fuse/directives/fuse-mat-sidenav/fuse-mat-sidenav.service';
-import { FuseNavigationService } from '@fuse/components/navigation/navigation.service';
-import { FuseSidebarService } from '@fuse/components/sidebar/sidebar.service';
-import { FuseSplashScreenService } from '@fuse/services/splash-screen.service';
-import { FuseTranslationLoaderService } from '@fuse/services/translation-loader.service';
-
-@NgModule({
-    entryComponents: [],
-    providers      : [
-        FuseConfigService,
-        FuseCopierService,
-        FuseMatchMediaService,
-        FuseMatSidenavHelperService,
-        FuseNavigationService,
-        FuseSidebarService,
-        FuseSplashScreenService,
-        FuseTranslationLoaderService
-    ]
-})
-export class FuseModule
-{
-    constructor(@Optional() @SkipSelf() parentModule: FuseModule)
-    {
-        if ( parentModule )
-        {
-            throw new Error('FuseModule is already loaded. Import it in the AppModule only!');
-        }
-    }
-
-    static forRoot(config): ModuleWithProviders
-    {
-        return {
-            ngModule : FuseModule,
-            providers: [
-                {
-                    provide : FUSE_CONFIG,
-                    useValue: config
-                }
-            ]
-        };
-    }
-}
--- a/src/@fuse/scss/fuse.scss
+++ b/src/@fuse/scss/fuse.scss
@@ -1,5 +0,0 @@
-// Material theming
-@import "theming";
-
-// Breakpoint mixins
-@import "mixins/breakpoints";
--- a/src/@fuse/scss/partials/_angular-material-fix.scss
+++ b/src/@fuse/scss/partials/_angular-material-fix.scss
@@ -1,87 +0,0 @@
-// Fix: "Icon button ripple radius is not correct on Edge & Safari"
-.mat-icon-button {
-
-    .mat-button-ripple {
-        border-radius: 50%;
-    }
-}
-
-// Fix: "Inconsistent font sizes across elements"
-.mat-form-field-wrapper {
-    font-size: 16px;
-}
-
-.mat-checkbox {
-    font-size: 16px;
-}
-
-.mat-radio-button {
-    font-size: 16px;
-}
-
-.mat-pseudo-checkbox-checked:after {
-    width: 14px !important;
-    height: 7px !important;
-}
-
-// Fix: "Input underlines has wrong color opacity value"
-.mat-form-field-underline {
-    background-color: rgba(0, 0, 0, 0.12);
-}
-
-// Fix: "Some idiots using table-cell and inline-table in mat-select"
-.mat-form-field {
-
-    &.mat-form-field-type-mat-select {
-
-        .mat-form-field-infix {
-            display: inline-flex;
-            width: auto;
-
-            .mat-select-trigger {
-                display: inline-flex;
-                align-items: center;
-                width: 100%;
-
-                .mat-select-value {
-                    display: flex;
-                    max-width: none;
-                    margin-right: 8px;
-                }
-
-                .mat-select-arrow-wrapper {
-                    display: inline-flex;
-                }
-            }
-        }
-    }
-}
-
-// Fix: Stepper icons are broken due to Fuse's icon helpers
-mat-horizontal-stepper,
-mat-vertical-stepper {
-
-    mat-step-header {
-
-        mat-icon {
-            height: 16px !important;
-            width: 16px !important;
-            min-width: 0 !important;
-            min-height: 0 !important;
-            color: inherit !important;
-        }
-    }
-}
-
-mat-vertical-stepper {
-    padding: 16px 0;
-}
-
-// Fix: Chip remove icon is broken due to Fuse's icon helpers
-mat-chip {
-
-    mat-icon {
-        min-width: 0 !important;
-        min-height: 0 !important;
-    }
-}
--- a/src/@fuse/scss/partials/_cards.scss
+++ b/src/@fuse/scss/partials/_cards.scss
@@ -1,61 +0,0 @@
-.fuse-card {
-    max-width: 320px;
-    min-width: 320px;
-    background: white;
-    border-radius: 2px;
-    @include mat-elevation(2);
-
-    &.variable-width {
-        min-width: 0;
-    }
-
-    &.auto-width {
-        min-width: 0;
-        max-width: none;
-    }
-
-    // Buttons
-    .mat-button {
-        min-width: 0 !important;
-        padding: 0 8px !important;
-    }
-
-    // Button Toggle Group
-    .mat-button-toggle-group,
-    .mat-button-toggle-standalone {
-        box-shadow: none !important;
-    }
-
-    // Tabs
-    .mat-tab-labels {
-        justify-content: center;
-    }
-
-    .mat-tab-label {
-        min-width: 0 !important;
-    }
-
-    // Divider
-    .card-divider {
-        border-top: 1px solid rgba(0, 0, 0, 0.12);
-        margin: 16px;
-
-        &.light {
-            border-top-color: rgba(255, 255, 255, 0.12);
-        }
-
-        &.full-width {
-            margin: 0;
-        }
-    }
-
-    // Expand Area
-    .card-expand-area {
-        overflow: hidden;
-
-        .card-expanded-content {
-            padding: 8px 16px 16px 16px;
-            line-height: 1.75;
-        }
-    }
-}
--- a/src/@fuse/scss/partials/plugins/_prism.scss
+++ b/src/@fuse/scss/partials/plugins/_prism.scss
@@ -1,269 +0,0 @@
-// Edit the sixteen color-value variables, and create your own syntax highlighter colorscheme
-
-$base00: #263238;
-$base01: #2C393F;
-$base02: #62727A;
-$base03: #707880;
-$base04: #C9CCD3;
-$base05: #CDD3DE;
-$base06: #D5DBE5;
-$base07: #FFFFFF;
-$base08: #EC5F67;
-$base09: #EA9560;
-$base0A: #FFCC00;
-$base0B: #8BD649;
-$base0C: #80CBC4;
-$base0D: #89DDFF;
-$base0E: #82AAFF;
-$base0F: #EC5F67;
-
-$red: $base08;
-$orange: $base09;
-$yellow: $base0A;
-$green: $base0B;
-$cyan: $base0C;
-$blue: $base0D;
-$violet: $base0E;
-$magenta: $base0F;
-
-$code-font-family: Consolas, Menlo, Monaco, "Andale Mono WT", "Andale Mono", "Lucida Console", "Lucida Sans Typewriter", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Liberation Mono", "Nimbus Mono L", "Courier New", Courier, monospace;
-$code-font-size: 14px;
-$code-line-height: 1.6;
-$code-background: $base00;
-$code-color: $base05;
-$code-color-fade: $base05;
-// $code-text-shadow: none; 
-$code-color-comment: $base02;
-$code-color-keyword: $base0B;
-$code-color-value: $base0C;
-$code-color-attr-name: $base09;
-$code-color-string: $base0C;
-$code-color-name: $base0A;
-$code-color-number: $base09;
-$code-color-variable: $base0D;
-$code-color-selector: $base0E;
-$code-color-property: $base0A;
-$code-color-important: $base08;
-$code-color-tag: $base0D;
-$code-color-atrule: $base0C;
-
-// @import "../partials/prism"; 
-/**
- * Prism base code highlighter theme using Sass 
- *
- * @author @MoOx
- * https://github.com/MoOx/sass-prism-theme-base/blob/master/_prism.scss
- * slightly adapted by me, Bram de Haan
- */
-
-// prism selector
-$code-selector: "code[class*=\"language-\"], pre[class*=\"language-\"]";
-$code-selector-block: "pre[class*=\"language-\"]";
-$code-selector-inline: ":not(pre) > code[class*=\"language-\"]";
-
-// generic stuff
-$code-font-family: Menlo, Monaco, "Courier New", monospace !default;
-$code-font-size: 14px !default;
-$code-line-height: 1.6 !default;
-
-$code-tab-size: 4 !default;
-$code-hyphens: none !default;
-
-$code-block-padding: 12px !default;
-$code-inline-padding: 2px 6px !default;
-$code-border-radius: 0 !default;
-
-$code-border: none !default;
-$code-background: #2A2A2A !default;
-$code-color: #FFF !default;
-$code-color-fade: #BEBEC5 !default;
-// $code-text-shadow: 0 1px 0 #000 !default;
-$code-box-shadow: none !default;
-$code-color-property: #B58900 !default;
-$code-color-important: #CB4B16 !default;
-$code-color-tag: #268BD2 !default;
-$code-color-atrule: #2AA198 !default;
-$code-color-attr-name: #B65611 !default;
-
-// $code-linenums-padding:		7px !default;
-// $code-linenums-width: 			40px !default;
-// $code-linenums-background:		#444 !default;
-// $code-linenums-border-color:	#555 !default;
-// $code-linenums-border-width:	1px !default;
-
-@if $code-selector != null {
-    #{$code-selector} {
-        -moz-tab-size: $code-tab-size;
-        -o-tab-size: $code-tab-size;
-        tab-size: $code-tab-size;
-
-        -webkit-hyphens: $code-hyphens;
-        -moz-hyphens: $code-hyphens;
-        -ms-hyphens: $code-hyphens;
-        hyphens: $code-hyphens;
-
-        // whitespace management
-        white-space: pre; // fallback
-        white-space: pre-wrap;
-        word-break: break-all;
-        word-wrap: break-word;
-
-        font-family: $code-font-family;
-        font-size: $code-font-size;
-        line-height: $code-line-height;
-
-        color: $code-color;
-        // text-shadow: $code-text-shadow;
-        background: $code-background;
-    }
-}
-
-%code-background {
-    border-radius: $code-border-radius;
-    border: $code-border;
-    box-shadow: $code-box-shadow;
-}
-
-@if $code-selector-block != null {
-    #{$code-selector-block} {
-        @extend %code-background;
-        padding: $code-block-padding;
-    }
-}
-
-@if $code-selector-inline != null {
-    #{$code-selector-inline} {
-        @extend %code-background;
-        padding: $code-inline-padding;
-    }
-}
-
-// pre[class*="language-"],
-// :not(pre) > code[class*="language-"] {
-// 	background: $code-background;
-// }
-
-// prism tokens
-// 
-$code-color-comment: null !default;
-$code-color-keyword: null !default;
-$code-color-value: null !default;
-$code-color-string: null !default;
-$code-color-name: null !default;
-$code-color-number: null !default;
-$code-color-variable: null !default;
-$code-color-selector: null !default;
-$code-color-punctuation: $code-color-fade !default;
-
-#{$code-selector} {
-    .namespace {
-        opacity: .7;
-    }
-
-    .token {
-        &.comment,
-        &.prolog,
-        &.doctype,
-        &.cdata {
-            color: $code-color-comment;
-        }
-
-        &.null,
-        &.operator,
-        &.boolean,
-        &.number {
-            color: $code-color-number;
-        }
-
-        &.string {
-            color: $code-color-string;
-        }
-        &.attr-name {
-            color: $code-color-attr-name;
-        }
-
-        &.entity,
-        &.url,
-        .language-css &.string,
-        .style &.string {
-            color: $code-color-string;
-        }
-
-        &.selector {
-            color: $code-color-selector;
-        }
-
-        &.attr-value,
-        &.keyword,
-        &.control,
-        &.directive,
-        &.unit {
-            color: $code-color-keyword;
-        }
-        &.important {
-            color: $code-color-important;
-        }
-        &.atrule {
-            color: $code-color-atrule;
-        }
-
-        &.regex,
-        &.statement {
-            color: $code-color-value;
-        }
-
-        &.placeholder,
-        &.variable {
-            color: $code-color-variable;
-        }
-
-        &.property,
-        &.tag {
-            // font-style: italic;
-        }
-
-        &.property {
-            color: $code-color-property;
-        }
-        &.tag {
-            color: $code-color-tag;
-        }
-
-        &.important,
-        &.statement {
-            font-weight: bold;
-        }
-
-        // todo ?
-        // &.mixin
-        // &.gradient
-        // &.abslength
-        // &.easing
-        // &.time
-        // &.angle
-        // &.fontfamily
-
-        // ruby/vim https://github.com/LeaVerou/prism/pull/18
-        // &.inst-var
-        // &.builtin
-        // &.const
-        // &.symbol
-        //
-        // php https://github.com/LeaVerou/prism/pull/20
-        // &.deliminator
-        // &.function
-
-        &.punctuation {
-            color: $code-color-punctuation;
-        }
-
-        &.entity {
-            cursor: help;
-        }
-
-        // for dev :)
-        &.debug {
-            color: red
-        }
-    }
-}
--- a/src/@fuse/services/config.service.ts
+++ b/src/@fuse/services/config.service.ts
@@ -1,92 +0,0 @@
-import { Inject, Injectable, InjectionToken } from '@angular/core';
-import { NavigationEnd, NavigationStart, Router } from '@angular/router';
-import { BehaviorSubject } from 'rxjs/BehaviorSubject';
-import { Platform } from '@angular/cdk/platform';
-import * as _ from 'lodash';
-
-// Create the injection token for the custom config
-export const FUSE_CONFIG = new InjectionToken('fuseCustomConfig');
-
-@Injectable()
-export class FuseConfigService
-{
-    config: any;
-    defaultConfig: any;
-    isSetConfigRan = false;
-
-    onConfigChanged: BehaviorSubject<any>;
-
-    /**
-     * Constructor
-     *
-     * @param router
-     * @param platform
-     * @param config
-     */
-    constructor(
-        private router: Router,
-        public platform: Platform,
-        @Inject(FUSE_CONFIG) config
-    )
-    {
-        // Set the default config from the user provided one (forRoot)
-        this.defaultConfig = config;
-
-        /**
-         * Disable Custom Scrollbars if Browser is Mobile
-         */
-        if ( this.platform.ANDROID || this.platform.IOS )
-        {
-            this.defaultConfig.customScrollbars = false;
-        }
-
-        // Set the config from the default config
-        this.config = _.cloneDeep(this.defaultConfig);
-
-        // Reload the default settings for the
-        // layout on every navigation start
-        router.events.subscribe(
-            (event) => {
-
-                if ( event instanceof NavigationStart )
-                {
-                    this.isSetConfigRan = false;
-                }
-
-                if ( event instanceof NavigationEnd )
-                {
-                    if ( this.isSetConfigRan )
-                    {
-                        return;
-                    }
-
-                    this.setConfig({
-                            layout: this.defaultConfig.layout
-                        }
-                    );
-                }
-            }
-        );
-
-        // Create the behavior subject
-        this.onConfigChanged = new BehaviorSubject(this.config);
-    }
-
-    /**
-     * Set the new config from given object
-     *
-     * @param config
-     */
-    setConfig(config): void
-    {
-        // Set the SetConfigRan true
-        this.isSetConfigRan = true;
-
-        // Merge the config
-        this.config = _.merge({}, this.config, config);
-
-        // Trigger the event
-        this.onConfigChanged.next(this.config);
-    }
-}
-
--- a/src/@fuse/shared.module.ts
+++ b/src/@fuse/shared.module.ts
@@ -1,34 +0,0 @@
-import { NgModule } from '@angular/core';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { CommonModule } from '@angular/common';
-
-import { FlexLayoutModule } from '@angular/flex-layout';
-
-import { FuseDirectivesModule } from '@fuse/directives/directives';
-import { FusePipesModule } from '@fuse/pipes/pipes.module';
-
-@NgModule({
-    imports  : [
-        CommonModule,
-        FormsModule,
-        ReactiveFormsModule,
-
-        FlexLayoutModule,
-
-        FuseDirectivesModule,
-        FusePipesModule
-    ],
-    exports  : [
-        CommonModule,
-        FormsModule,
-        ReactiveFormsModule,
-
-        FlexLayoutModule,
-
-        FuseDirectivesModule,
-        FusePipesModule
-    ]
-})
-export class FuseSharedModule
-{
-}
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -1,13 +1,7 @@
 import { Component } from '@angular/core';
+import { FuseSplashScreenService } from './core/services/splash-screen.service';
 import { TranslateService } from '@ngx-translate/core';

-import { FuseSplashScreenService } from '@fuse/services/splash-screen.service';
-import { FuseTranslationLoaderService } from '@fuse/services/translation-loader.service';
-import { FuseNavigationService } from '@fuse/components/navigation/navigation.service';
-
-import { locale as navigationEnglish } from './navigation/i18n/en';
-import { locale as navigationTurkish } from './navigation/i18n/tr';
-
@Component({
    selector   : 'fuse-root',
    templateUrl: './app.component.html',
@@ -16,10 +10,8 @@ import { locale as navigationTurkish } from './navigation/i18n/tr';
 export class AppComponent
 {
    constructor(
-        private translate: TranslateService,
-        private fuseNavigationService: FuseNavigationService,
        private fuseSplashScreen: FuseSplashScreenService,
-        private fuseTranslationLoader: FuseTranslationLoaderService
+        private translate: TranslateService
    )
    {
        // Add languages
@@ -28,9 +20,6 @@ export class AppComponent
        // Set the default language
        this.translate.setDefaultLang('en');

-        // Set the navigation translations
-        this.fuseTranslationLoader.loadTranslations(navigationEnglish, navigationTurkish);
-
        // Use a language
        this.translate.use('en');
    }
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -1,50 +1,23 @@
 import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
+import { HttpModule } from '@angular/http';
 import { HttpClientModule } from '@angular/common/http';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterModule, Routes } from '@angular/router';
-import { InMemoryWebApiModule } from 'angular-in-memory-web-api';
-import { TranslateModule } from '@ngx-translate/core';
 import 'hammerjs';
-
-import { FuseModule } from '@fuse/fuse.module';
-import { FuseSharedModule } from '@fuse/shared.module';
-
-import { fuseConfig } from './fuse-config';
-
+import { SharedModule } from './core/modules/shared.module';
 import { AppComponent } from './app.component';
-import { FuseFakeDbService } from './fuse-fake-db/fuse-fake-db.service';
 import { FuseMainModule } from './main/main.module';
-import { AppStoreModule } from './store/store.module';
+import { FuseSplashScreenService } from './core/services/splash-screen.service';
+import { FuseConfigService } from './core/services/config.service';
+import { FuseNavigationService } from './core/components/navigation/navigation.service';
+import { FuseSampleModule } from './main/content/sample/sample.module';
+import { TranslateModule } from '@ngx-translate/core';

 const appRoutes: Routes = [
-    {
-        path        : 'apps',
-        loadChildren: './main/content/apps/apps.module#FuseAppsModule'
-    },
-    {
-        path        : 'pages',
-        loadChildren: './main/content/pages/pages.module#FusePagesModule'
-    },
-    {
-        path        : 'ui',
-        loadChildren: './main/content/ui/ui.module#FuseUIModule'
-    },
-    {
-        path        : 'services',
-        loadChildren: './main/content/services/services.module#FuseServicesModule'
-    },
-    {
-        path        : 'components',
-        loadChildren: './main/content/components/components.module#FuseComponentsModule'
-    },
-    {
-        path        : 'components-third-party',
-        loadChildren: './main/content/components-third-party/components-third-party.module#FuseComponentsThirdPartyModule'
-    },
    {
        path      : '**',
-        redirectTo: 'apps/dashboards/analytics'
+        redirectTo: 'sample'
    }
 ];

@@ -54,22 +27,19 @@ const appRoutes: Routes = [
    ],
    imports     : [
        BrowserModule,
-        BrowserAnimationsModule,
+        HttpModule,
        HttpClientModule,
+        BrowserAnimationsModule,
        RouterModule.forRoot(appRoutes),
-
+        SharedModule,
        TranslateModule.forRoot(),
-        InMemoryWebApiModule.forRoot(FuseFakeDbService, {
-            delay             : 0,
-            passThruUnknownUrl: true
-        }),
-
-        // Fuse Main and Shared modules
-        FuseModule.forRoot(fuseConfig),
-        FuseSharedModule,
-
-        AppStoreModule,
-        FuseMainModule
+        FuseMainModule,
+        FuseSampleModule
+    ],
+    providers   : [
+        FuseSplashScreenService,
+        FuseConfigService,
+        FuseNavigationService
    ],
    bootstrap   : [
        AppComponent
--- a/src/@fuse/animations/index.ts
+++ b/src/@fuse/animations/index.ts
@@ -76,53 +76,6 @@ export const fuseAnimations = [
        transition('0 => 1', animate('300ms ease-in'))
    ]),

-    trigger('slideIn', [
-        transition('void => left', [
-                style({
-                    transform: 'translateX(100%)'
-                }),
-                animate('300ms ease-in',
-                    style({
-                        transform: 'translateX(0)'
-                    })
-                )
-            ]
-        ),
-        transition('left => void', [
-                style({
-                    transform: 'translateX(0)'
-                }),
-                animate('300ms ease-in',
-                    style({
-                        transform: 'translateX(-100%)'
-                    })
-                )
-            ]
-        ),
-        transition('void => right', [
-                style({
-                    transform: 'translateX(-100%)'
-                }),
-                animate('300ms ease-in',
-                    style({
-                        transform: 'translateX(0)'
-                    })
-                )
-            ]
-        ),
-        transition('right => void', [
-                style({
-                    transform: 'translateX(0)'
-                }),
-                animate('300ms ease-in',
-                    style({
-                        transform: 'translateX(100%)'
-                    })
-                )
-            ]
-        ),
-    ]),
-
    trigger('slideInLeft', [
        state('void', style({
            transform: 'translateX(-100%)',
--- a/src/app/core/components/confirm-dialog/confirm-dialog.component.html
+++ b/src/app/core/components/confirm-dialog/confirm-dialog.component.html
--- a/src/app/core/components/confirm-dialog/confirm-dialog.component.scss
+++ b/src/app/core/components/confirm-dialog/confirm-dialog.component.scss
--- a/src/app/core/components/confirm-dialog/confirm-dialog.component.ts
+++ b/src/app/core/components/confirm-dialog/confirm-dialog.component.ts
@@ -1,4 +1,4 @@
-import { Component } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { MatDialogRef } from '@angular/material';

@Component({
@@ -6,7 +6,7 @@ import { MatDialogRef } from '@angular/material';
    templateUrl: './confirm-dialog.component.html',
    styleUrls  : ['./confirm-dialog.component.scss']
 })
-export class FuseConfirmDialogComponent
+export class FuseConfirmDialogComponent implements OnInit
 {
    public confirmMessage: string;

@@ -14,4 +14,8 @@ export class FuseConfirmDialogComponent
    {
    }

+    ngOnInit()
+    {
+    }
+
 }
--- a/src/app/core/components/copier/copier.service.ts
+++ b/src/app/core/components/copier/copier.service.ts
@@ -9,7 +9,7 @@
 import { Injectable } from '@angular/core';

@Injectable()
-export class FuseCopierService
+export class CopierService
 {

    private textarea: HTMLTextAreaElement;
--- a/src/app/core/components/countdown/countdown.component.html
+++ b/src/app/core/components/countdown/countdown.component.html
--- a/src/app/core/components/countdown/countdown.component.scss
+++ b/src/app/core/components/countdown/countdown.component.scss
--- a/src/app/core/components/countdown/countdown.component.ts
+++ b/src/app/core/components/countdown/countdown.component.ts
@@ -1,9 +1,8 @@
 import { Component, Input, OnInit } from '@angular/core';
+import * as moment from 'moment';
 import { Observable } from 'rxjs/Observable';
 import 'rxjs/add/observable/interval';

-import * as moment from 'moment';
-
@Component({
    selector   : 'fuse-countdown',
    templateUrl: './countdown.component.html',
--- a/src/app/core/components/demo/demo-content/demo-content.component.html
+++ b/src/app/core/components/demo/demo-content/demo-content.component.html
@@ -0,0 +1,75 @@
+<!-- DEMO CONTENT -->
+<div class="demo-content">
+
+    <img src="assets/images/beach.jpg" alt="beach" style="max-width: 640px; width: 100%;">
+
+    <h1>Early Sunrise</h1>
+    <h4 class="secondary-text">Demo Content</h4>
+
+    <p>
+        One morning, when Gregor Samsa woke from troubled dreams, he found himself transformed in his bed into a
+        horrible vermin. He lay on his armour-like back, and if he lifted his head a little he could see his
+        brown belly, slightly domed and divided by arches into stiff sections.
+    </p>
+
+    <blockquote>
+        <p>
+            The bedding was hardly able to cover it and seemed ready to slide off any moment. His many legs,
+            pitifully thin compared with the size of the rest of him, waved about helplessly as he looked. "What's
+            happened to me? " he thought. It wasn't a dream.
+        </p>
+        <footer>
+            John Doe
+        </footer>
+    </blockquote>
+
+    <p>
+        His room, a proper human room although a little too small, lay peacefully between its four familiar
+        walls. A collection of textile samples lay spread out on the table - Samsa was a travelling salesman -
+        and above it there hung a picture that he had recently cut out of an illustrated magazine and housed in
+        a nice, gilded frame.
+    </p>
+
+    <p>
+        It showed a lady fitted out with a fur hat and fur boa who sat upright, raising a heavy fur muff that
+        covered the whole of her lower arm towards the viewer. Gregor then turned to look out the window at the
+        dull weather. Drops of rain could be heard hitting the pane, which made him feel quite sad.
+    </p>
+
+    <p>
+        "How about if I sleep a little bit longer and forget all this nonsense", he thought, but that was
+        something he was unable to do because he was used to sleeping on his right, and in his present state
+        couldn't get into that position. However hard he threw himself onto his right, he always rolled back to
+        where he was.
+    </p>
+
+    <p>
+        He must have tried it a hundred times, shut his eyes so that he wouldn't have to look at the floundering
+        legs, and only stopped when he began to feel a mild, dull pain there that he had never felt before. "Oh,
+        God", he thought, "what a strenuous career it is that I've chosen!
+    </p>
+
+    <p>
+        Travelling day in and day out. Doing business like this takes much more effort than doing your own
+        business at home, and on top of that there's the curse of travelling, worries about making train
+        connections, bad and irregular food, contact with different people all the time so that you can never
+        get to know anyone or become friendly with them.
+    </p>
+
+    <p>
+        "He felt a slight itch up on his belly; pushed himself slowly up on his back towards the headboard so
+        that he could lift his head better; found where the itch was, and saw that it was covered with lots of
+        little white spots which he didn't know what to make of; and when he tried to feel the place with one of
+        his legs he drew it quickly back because as soon as he touched it he was overcome by a cold shudder. He
+        slid back into his former position.
+    </p>
+
+    <p>
+        "Getting up early all the time", he thought, "it makes you stupid. You've got to get enough sleep. Other
+        travelling salesmen live a life of luxury. For instance, whenever I go back to the guest house during
+        the morning to copy out the contract, these gentlemen are always still sitting there eating their
+        breakfasts. I ought to just try that with my boss; I'd get kicked out on the spot. But who knows, maybe
+        that would be the best thing for me...
+    </p>
+</div>
+<!-- / DEMO CONTENT -->
--- a/src/app/core/components/demo/demo-content/demo-content.component.scss
+++ b/src/app/core/components/demo/demo-content/demo-content.component.scss
--- a/src/app/core/components/demo/demo-content/demo-content.component.ts
+++ b/src/app/core/components/demo/demo-content/demo-content.component.ts
--- a/src/app/core/components/demo/demo-sidenav/demo-sidenav.component.html
+++ b/src/app/core/components/demo/demo-sidenav/demo-sidenav.component.html
--- a/src/app/core/components/demo/demo-sidenav/demo-sidenav.component.scss
+++ b/src/app/core/components/demo/demo-sidenav/demo-sidenav.component.scss
--- a/src/app/core/components/demo/demo-sidenav/demo-sidenav.component.ts
+++ b/src/app/core/components/demo/demo-sidenav/demo-sidenav.component.ts
--- a/src/app/core/components/demo/demo.module.ts
+++ b/src/app/core/components/demo/demo.module.ts
@@ -1,8 +1,6 @@
 import { NgModule } from '@angular/core';
+import { SharedModule } from '../../modules/shared.module';
 import { RouterModule } from '@angular/router';
-
-import { MatDividerModule, MatListModule } from '@angular/material';
-
 import { FuseDemoContentComponent } from './demo-content/demo-content.component';
 import { FuseDemoSidenavComponent } from './demo-sidenav/demo-sidenav.component';

@@ -12,10 +10,8 @@ import { FuseDemoSidenavComponent } from './demo-sidenav/demo-sidenav.component'
        FuseDemoSidenavComponent
    ],
    imports     : [
-        RouterModule,
-
-        MatDividerModule,
-        MatListModule
+        SharedModule,
+        RouterModule
    ],
    exports     : [
        FuseDemoContentComponent,
--- a/src/app/main/content/services/config/config.component.scss
+++ b/src/app/main/content/services/config/config.component.scss
--- a/src/app/core/components/hljs/hljs.component.ts
+++ b/src/app/core/components/hljs/hljs.component.ts
@@ -0,0 +1,58 @@
+import { Component, ContentChild, ElementRef, Input, OnInit } from '@angular/core';
+import * as hljs from 'highlight.js';
+
+@Component({
+    selector : 'fuse-hljs',
+    template : ' ',
+    styleUrls: ['./hljs.component.scss']
+})
+export class FuseHljsComponent implements OnInit
+{
+    hljs: any;
+
+    @ContentChild('source') source: ElementRef;
+    @Input('lang') lang: string;
+
+    constructor(
+        private elementRef: ElementRef
+    )
+    {
+        this.hljs = hljs;
+    }
+
+    ngOnInit()
+    {
+        const originalSource = this.source.nativeElement.value;
+
+        if ( !originalSource || !this.lang )
+        {
+            return;
+        }
+
+        // Split the source into lines
+        const sourceLines = originalSource.split('\n');
+
+        // Find the first non-whitespace char index in
+        // the first line of the source code
+        const indexOfFirstChar = sourceLines[0].search(/\S|$/);
+
+        // Generate the trimmed source
+        let source = '';
+
+        // Iterate through all the lines and trim the
+        // beginning white space depending on the index
+        sourceLines.forEach((line, index) => {
+
+            source = source + line.substr(indexOfFirstChar, line.length);
+
+            if ( index !== sourceLines.length - 1 )
+            {
+                source = source + '\n';
+            }
+        });
+
+        this.elementRef.nativeElement.innerHTML =
+            `<pre><code class="highlight">` + this.hljs.highlight(this.lang, source).value + `</code></pre>`;
+    }
+}
+
--- 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
@@ -9,8 +9,10 @@

 <mat-menu #colorMenu="matMenu" class="fuse-material-color-picker-menu">

-    <header [ngClass]="selectedColor?.class || 'mat-accent-bg'" class="mat-elevation-z4"
-            fxLayout="row" fxLayoutAlign="space-between center">
+    <header [ngClass]="selectedColor?.class || 'mat-accent-bg'"
+            class="mat-elevation-z4"
+            fxLayout="row"
+            fxLayoutAlign="space-between center">

        <button mat-icon-button
                [style.visibility]="view==='hues'?'visible':'hidden'"
@@ -28,7 +30,7 @@

        <button mat-icon-button
                class="remove-color-button"
-                (click)="$event.stopPropagation();removeColor()"
+                (click)="removeColor()"
                aria-label="Remove Color">
            <mat-icon class="s-20">delete</mat-icon>
        </button>
@@ -37,9 +39,13 @@

    <div [ngSwitch]="view" class="views">

-        <div class="view" *ngSwitchCase="'palettes'">
+        <div class="view"
+             *ngSwitchCase="'palettes'"
+             [@slideInLeft]>

-            <div fxLayout="row wrap" fxLayoutAlign="start start" class="colors" fusePerfectScrollbar>
+            <div fxLayout="row" fxLayoutWrap
+                 fxLayoutAlign="start start"
+                 class="colors" fusePerfectScrollbar>
                <div class="color"
                     [ngClass]="'mat-'+color.key+'-bg'"
                     *ngFor="let color of (colors | keys)"
@@ -52,12 +58,18 @@
            </div>
        </div>

-        <div class="view" *ngSwitchCase="'hues'" >
-            <div fxLayout="row wrap" fxLayoutAlign="start start" class="colors" fusePerfectScrollbar>
-                <div class="color" *ngFor="let hue of hues"
+        <div class="view"
+             *ngSwitchCase="'hues'"
+             [@slideInRight]>
+            <div fxLayout="row" fxLayoutWrap
+                 fxLayoutAlign="start start"
+                 class="colors" fusePerfectScrollbar>
+                <div class="color"
+                     *ngFor="let hue of hues"
                     [fxHide]="selectedPalette === 'white' && hue !== '500'|| selectedPalette === 'black' && hue !== '500'"
                     [ngClass]="'mat-'+selectedPalette+'-'+hue+'-bg'"
-                     (click)="selectHue(hue)" fxLayout="row" fxLayoutAlign="start end" mat-ink-ripple>
+                     (click)="selectHue(hue)"
+                     fxLayout="row" fxLayoutAlign="start end" mat-ink-ripple>
                    <span class="label">
                        {{hue}}
                    </span>
--- a/src/app/core/components/material-color-picker/material-color-picker.component.scss
+++ b/src/app/core/components/material-color-picker/material-color-picker.component.scss
--- a/src/app/core/components/material-color-picker/material-color-picker.component.ts
+++ b/src/app/core/components/material-color-picker/material-color-picker.component.ts
@@ -1,7 +1,6 @@
-import { Component, EventEmitter, Input, OnChanges, Output, ViewEncapsulation } from '@angular/core';
-
-import { fuseAnimations } from '@fuse/animations';
-import { MatColors } from '@fuse/mat-colors';
+import { Component, EventEmitter, Input, OnChanges, OnInit, Output, ViewEncapsulation } from '@angular/core';
+import { MatColors } from '../../matColors';
+import { fuseAnimations } from '../../animations';

@Component({
    selector     : 'fuse-material-color-picker',
@@ -10,7 +9,7 @@ import { MatColors } from '@fuse/mat-colors';
    animations   : fuseAnimations,
    encapsulation: ViewEncapsulation.None
 })
-export class FuseMaterialColorPickerComponent implements OnChanges
+export class FuseMaterialColorPickerComponent implements OnInit, OnChanges
 {
    colors: any;
    selectedColor: any;
@@ -92,21 +91,11 @@ export class FuseMaterialColorPickerComponent implements OnChanges
        this.hues = ['50', '100', '200', '300', '400', '500', '600', '700', '800', '900', 'A100', 'A200', 'A400', 'A700'];
    }

-    ngOnChanges(changes: any)
+    ngOnInit()
    {
-        if ( changes.selectedBg && changes.selectedBg.currentValue === '' ||
-            changes.selectedClass && changes.selectedClass.currentValue === '' ||
-            changes.selectedPalette && changes.selectedPalette.currentValue === '' )
-        {
-            this.removeColor();
-            return;
-        }
-        if ( changes.selectedPalette || changes.selectedHue || changes.selectedClass || changes.selectedBg )
-        {
-            this.updateSelectedColor();
-        }
+
    }
-    
+
    selectPalette(palette)
    {
        this.selectedPalette = palette;
@@ -125,7 +114,6 @@ export class FuseMaterialColorPickerComponent implements OnChanges
        this.selectedPalette = '';
        this.selectedHue = '';
        this.updateSelectedColor();
-        this.view = 'palettes';
    }

    updateSelectedColor()
@@ -184,4 +172,19 @@ export class FuseMaterialColorPickerComponent implements OnChanges
            this.view = 'hues';
        }
    }
+
+    ngOnChanges(changes: any)
+    {
+        if ( changes.selectedBg && changes.selectedBg.currentValue === '' ||
+            changes.selectedClass && changes.selectedClass.currentValue === '' ||
+            changes.selectedPalette && changes.selectedPalette.currentValue === '' )
+        {
+            this.removeColor();
+            return;
+        }
+        if ( changes.selectedPalette || changes.selectedHue || changes.selectedClass || changes.selectedBg )
+        {
+            this.updateSelectedColor();
+        }
+    }
 }
--- a/src/app/core/components/navigation/horizontal/nav-collapse/nav-horizontal-collapse.component.html
+++ b/src/app/core/components/navigation/horizontal/nav-collapse/nav-horizontal-collapse.component.html
@@ -0,0 +1,19 @@
+<a class="nav-link" matRipple>
+    <mat-icon class="nav-link-icon" *ngIf="item.icon">{{item.icon}}</mat-icon>
+    <span class="nav-link-title">{{item.title}}</span>
+    <mat-icon class="collapse-arrow">keyboard_arrow_right</mat-icon>
+</a>
+
+<div class="children" [ngClass]="{'open': isOpen}">
+
+    <div class="{{fuseSettings.colorClasses.navbar}}">
+
+        <ng-container *ngFor="let item of item.children">
+            <fuse-nav-horizontal-item *ngIf="item.type=='item'" [item]="item"></fuse-nav-horizontal-item>
+            <fuse-nav-horizontal-collapse *ngIf="item.type=='collapse'" [item]="item"></fuse-nav-horizontal-collapse>
+            <fuse-nav-horizontal-collapse *ngIf="item.type=='group'" [item]="item"></fuse-nav-horizontal-collapse>
+        </ng-container>
+
+    </div>
+
+</div>
--- a/src/app/core/components/navigation/horizontal/nav-collapse/nav-horizontal-collapse.component.scss
+++ b/src/app/core/components/navigation/horizontal/nav-collapse/nav-horizontal-collapse.component.scss
--- a/src/app/core/components/navigation/horizontal/nav-collapse/nav-horizontal-collapse.component.ts
+++ b/src/app/core/components/navigation/horizontal/nav-collapse/nav-horizontal-collapse.component.ts
@@ -1,5 +1,5 @@
 import { Component, HostBinding, HostListener, Input, OnDestroy } from '@angular/core';
-import { fuseAnimations } from '../../../../animations/index';
+import { fuseAnimations } from '../../../../animations';
 import { FuseConfigService } from '../../../../services/config.service';
 import { Subscription } from 'rxjs/Subscription';

@@ -11,7 +11,7 @@ import { Subscription } from 'rxjs/Subscription';
 })
 export class FuseNavHorizontalCollapseComponent implements OnDestroy
 {
-    onConfigChanged: Subscription;
+    onSettingsChanged: Subscription;
    fuseSettings: any;
    isOpen = false;

@@ -34,8 +34,8 @@ export class FuseNavHorizontalCollapseComponent implements OnDestroy
        private fuseConfig: FuseConfigService
    )
    {
-        this.onConfigChanged =
-            this.fuseConfig.onConfigChanged
+        this.onSettingsChanged =
+            this.fuseConfig.onSettingsChanged
                .subscribe(
                    (newSettings) => {
                        this.fuseSettings = newSettings;
@@ -45,6 +45,6 @@ export class FuseNavHorizontalCollapseComponent implements OnDestroy

    ngOnDestroy()
    {
-        this.onConfigChanged.unsubscribe();
+        this.onSettingsChanged.unsubscribe();
    }
 }
--- a/src/app/core/components/navigation/horizontal/nav-item/nav-horizontal-item.component.html
+++ b/src/app/core/components/navigation/horizontal/nav-item/nav-horizontal-item.component.html
@@ -0,0 +1,18 @@
+<a class="nav-link" *ngIf="item.url" [routerLink]="[item.url]" routerLinkActive="active"
+   [routerLinkActiveOptions]="{exact: item.exactMatch || false}" matRipple>
+    <mat-icon class="nav-link-icon" *ngIf="item.icon">{{item.icon}}</mat-icon>
+    <span class="nav-link-title">{{item.title}}</span>
+    <span class="nav-link-badge" *ngIf="item.badge"
+          [ngStyle]="{'background-color': item.badge.bg,'color': item.badge.fg}">
+        {{item.badge.title}}
+    </span>
+</a>
+
+<span class="nav-link" *ngIf="item.function" (click)="item.function()" matRipple>
+    <mat-icon class="nav-link-icon" *ngIf="item.icon">{{item.icon}}</mat-icon>
+    <span class="nav-link-title">{{item.title}}</span>
+    <span class="nav-link-badge" *ngIf="item.badge"
+          [ngStyle]="{'background-color': item.badge.bg,'color': item.badge.fg}">
+        {{item.badge.title}}
+    </span>
+</span>
--- a/src/app/core/components/navigation/horizontal/nav-item/nav-horizontal-item.component.scss
+++ b/src/app/core/components/navigation/horizontal/nav-item/nav-horizontal-item.component.scss
--- a/src/app/core/components/navigation/horizontal/nav-item/nav-horizontal-item.component.ts
+++ b/src/app/core/components/navigation/horizontal/nav-item/nav-horizontal-item.component.ts
--- a/src/app/core/components/navigation/navigation.component.html
+++ b/src/app/core/components/navigation/navigation.component.html
@@ -4,7 +4,7 @@
    <!-- Vertical Navigation Layout -->
    <ng-container *ngIf="layout === 'vertical'">

-        <ng-container *ngFor="let item of navigation">
+        <ng-container *ngFor="let item of navigationModel">

            <fuse-nav-vertical-group *ngIf="item.type=='group'" [item]="item"></fuse-nav-vertical-group>
            <fuse-nav-vertical-collapse *ngIf="item.type=='collapse'" [item]="item"></fuse-nav-vertical-collapse>
@@ -18,7 +18,7 @@
    <!-- Horizontal Navigation Layout -->
    <ng-container *ngIf="layout === 'horizontal'">

-        <ng-container *ngFor="let item of navigation">
+        <ng-container *ngFor="let item of navigationModel">

            <fuse-nav-horizontal-collapse *ngIf="item.type=='group'" [item]="item"></fuse-nav-horizontal-collapse>
            <fuse-nav-horizontal-collapse *ngIf="item.type=='collapse'" [item]="item"></fuse-nav-horizontal-collapse>
--- a/src/app/core/components/navigation/navigation.component.scss
+++ b/src/app/core/components/navigation/navigation.component.scss
@@ -0,0 +1,6 @@
+@import 'src/app/core/scss/fuse';
+
+#main-navigation {
+    margin: 0;
+    padding: 0;
+}
--- a/src/app/core/components/navigation/navigation.component.ts
+++ b/src/app/core/components/navigation/navigation.component.ts
@@ -0,0 +1,32 @@
+import { Component, Input, OnDestroy, ViewEncapsulation } from '@angular/core';
+import { FuseNavigationService } from './navigation.service';
+import { Subscription } from 'rxjs/Subscription';
+
+@Component({
+    selector     : 'fuse-navigation',
+    templateUrl  : './navigation.component.html',
+    styleUrls    : ['./navigation.component.scss'],
+    encapsulation: ViewEncapsulation.None
+})
+export class FuseNavigationComponent implements OnDestroy
+{
+    navigationModel: any[];
+    navigationModelChangeSubscription: Subscription;
+
+    @Input('layout') layout = 'vertical';
+
+    constructor(private fuseNavigationService: FuseNavigationService)
+    {
+        this.navigationModelChangeSubscription =
+            this.fuseNavigationService.onNavigationModelChange
+                .subscribe((navigationModel) => {
+                    this.navigationModel = navigationModel;
+                });
+    }
+
+    ngOnDestroy()
+    {
+        this.navigationModelChangeSubscription.unsubscribe();
+    }
+
+}
--- a/src/app/core/components/navigation/navigation.module.ts
+++ b/src/app/core/components/navigation/navigation.module.ts
@@ -1,10 +1,6 @@
 import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
+import { SharedModule } from '../../modules/shared.module';
 import { RouterModule } from '@angular/router';
-import { MatIconModule, MatRippleModule } from '@angular/material';
-
-import { TranslateModule } from '@ngx-translate/core';
-
 import { FuseNavigationComponent } from './navigation.component';
 import { FuseNavVerticalItemComponent } from './vertical/nav-item/nav-vertical-item.component';
 import { FuseNavVerticalCollapseComponent } from './vertical/nav-collapse/nav-vertical-collapse.component';
@@ -14,13 +10,8 @@ import { FuseNavHorizontalCollapseComponent } from './horizontal/nav-collapse/na

@NgModule({
    imports     : [
-        CommonModule,
-        RouterModule,
-
-        MatIconModule,
-        MatRippleModule,
-
-        TranslateModule.forChild()
+        SharedModule,
+        RouterModule
    ],
    exports     : [
        FuseNavigationComponent
--- a/src/app/core/components/navigation/navigation.service.ts
+++ b/src/app/core/components/navigation/navigation.service.ts
@@ -0,0 +1,190 @@
+import { EventEmitter, Injectable } from '@angular/core';
+import { NavigationModel } from '../../../navigation.model';
+import { BehaviorSubject } from 'rxjs/BehaviorSubject';
+
+@Injectable()
+export class FuseNavigationService
+{
+    onNavCollapseToggle = new EventEmitter<any>();
+    onNavCollapseToggled = new EventEmitter<any>();
+    onNavigationModelChange: BehaviorSubject<any> = new BehaviorSubject({});
+    navigationModel: NavigationModel;
+    flatNavigation: any[] = [];
+
+    constructor()
+    {
+        this.navigationModel = new NavigationModel();
+        this.onNavigationModelChange.next(this.navigationModel.model);
+    }
+
+    /**
+     * Get navigation model
+     *
+     * @returns {any[]}
+     */
+    getNavigationModel()
+    {
+        return this.navigationModel.model;
+    }
+
+    /**
+     * Set the navigation model
+     *
+     * @param model
+     */
+    setNavigationModel(model)
+    {
+        this.navigationModel = model;
+        this.onNavigationModelChange.next(this.navigationModel.model);
+    }
+
+    /**
+     * Add new navigation item
+     * to the given location
+     */
+    addNavigationItem(location, item)
+    {
+        // Parse the location
+        const locationArr = location.split('.');
+
+        if ( locationArr.length === 0 )
+        {
+            return;
+        }
+
+        // Find the navigation item
+        const navItem = this.findNavigationItemById(locationArr);
+
+        // Act according to the item type
+        switch ( navItem.type )
+        {
+            case 'item':
+
+                // Create a children array
+                navItem.children = [];
+
+                // Push the item
+                navItem.children.push(item);
+
+                // Change the item type to collapsable
+                navItem.type = 'collapse';
+
+                break;
+
+            case 'collapse':
+
+                // Push the item
+                navItem.children.push(item);
+
+                break;
+
+            case 'group':
+
+                // Push the item
+                navItem.children.push(item);
+
+                break;
+
+            default:
+                break;
+        }
+    }
+
+    /**
+     * Get navigation item from
+     * given location
+     *
+     * @param location
+     */
+    getNavigationItem(location)
+    {
+        // Parse the location
+        const locationArr = location.split('.');
+
+        if ( locationArr.length === 0 )
+        {
+            return;
+        }
+
+        // Find and return the navigation item
+        return this.findNavigationItemById(locationArr);
+    }
+
+    /**
+     * Find navigation item by location
+     *
+     * @param location
+     * @param navigation
+     */
+    findNavigationItemById(location, navigation?)
+    {
+        if ( !navigation )
+        {
+            navigation = this.navigationModel.model;
+        }
+
+        // Iterate through the given navigation
+        for ( const navItem of navigation )
+        {
+            // If the nav item id equals the first location...
+            if ( navItem.id === location[0] )
+            {
+                // If there is more location to look at...
+                if ( location.length > 1 )
+                {
+                    // Remove the first item of the location
+                    location.splice(0, 1);
+
+                    // Go nested...
+                    return this.findNavigationItemById(location, navItem.children);
+                }
+
+                // Otherwise just return the nav item
+                else
+                {
+                    return navItem;
+                }
+            }
+        }
+    }
+
+    /**
+     * Get flattened navigation array
+     * @param navigationItems
+     * @returns {any[]}
+     */
+    getFlatNavigation(navigationItems?)
+    {
+        if ( !navigationItems )
+        {
+            navigationItems = this.navigationModel.model;
+        }
+
+        for ( const navItem of navigationItems )
+        {
+            if ( navItem.type === 'subheader' )
+            {
+                continue;
+            }
+
+            if ( navItem.type === 'item' )
+            {
+                this.flatNavigation.push({
+                    title: navItem.title,
+                    type : navItem.type,
+                    icon : navItem.icon || false,
+                    url  : navItem.url
+                });
+
+                continue;
+            }
+
+            if ( navItem.type === 'collapse' || navItem.type === 'group' )
+            {
+                this.getFlatNavigation(navItem.children);
+            }
+        }
+
+        return this.flatNavigation;
+    }
+}
--- a/src/app/core/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.html
+++ b/src/app/core/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.html
@@ -0,0 +1,12 @@
+<a class="nav-link" matRipple (click)="toggleOpen($event)">
+    <mat-icon class="nav-link-icon" *ngIf="item.icon">{{item.icon}}</mat-icon>
+    <span class="nav-link-title">{{item.title}}</span>
+    <mat-icon class="collapse-arrow">keyboard_arrow_right</mat-icon>
+</a>
+<div class="children" [@slideInOut]="isOpen">
+    <ng-container *ngFor="let item of item.children">
+        <fuse-nav-vertical-item *ngIf="item.type=='item'" [item]="item"></fuse-nav-vertical-item>
+        <fuse-nav-vertical-collapse *ngIf="item.type=='collapse'" [item]="item"></fuse-nav-vertical-collapse>
+        <fuse-nav-vertical-group *ngIf="item.type=='group'" [item]="item"></fuse-nav-vertical-group>
+    </ng-container>
+</div>
--- a/src/app/core/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.scss
+++ b/src/app/core/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.scss
@@ -1,7 +1,6 @@
 :host {

-    .folded:not(.unfolded) & {
-
+    .folded:not(.folded-open) & {
        .nav-link {

            > span {
@@ -9,17 +8,9 @@
                transition: opacity 200ms ease;
            }
        }
-
-        &.open {
-
-            .children {
-                display: none !important;
-            }
-        }
    }

    .nav-link {
-
        .collapse-arrow {
            transition: transform .3s ease-in-out, opacity .25s ease-in-out .1s;
            transform: rotate(0);
--- a/src/app/core/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.ts
+++ b/src/app/core/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.ts
@@ -1,7 +1,7 @@
 import { Component, HostBinding, Input, OnInit } from '@angular/core';
 import { FuseNavigationService } from '../../navigation.service';
 import { NavigationEnd, Router } from '@angular/router';
-import { fuseAnimations } from '../../../../animations/index';
+import { fuseAnimations } from '../../../../animations';

@Component({
    selector   : 'fuse-nav-vertical-collapse',
@@ -40,7 +40,7 @@ export class FuseNavVerticalCollapseComponent implements OnInit
        );

        // Listen for collapsing of any navigation item
-        this.navigationService.onItemCollapsed
+        this.navigationService.onNavCollapseToggled
            .subscribe(
                (clickedItem) => {
                    if ( clickedItem && clickedItem.children )
@@ -69,20 +69,6 @@ export class FuseNavVerticalCollapseComponent implements OnInit
            );
    }

-    ngOnInit()
-    {
-        // Check if the url can be found in
-        // one of the children of this item
-        if ( this.isUrlInChildren(this.item, this.router.url) )
-        {
-            this.expand();
-        }
-        else
-        {
-            this.collapse();
-        }
-    }
-
    /**
     * Toggle collapse
     *
@@ -95,8 +81,8 @@ export class FuseNavVerticalCollapseComponent implements OnInit
        this.isOpen = !this.isOpen;

        // Navigation collapse toggled...
-        this.navigationService.onItemCollapsed.next(this.item);
-        this.navigationService.onItemCollapseToggled.next();
+        this.navigationService.onNavCollapseToggled.emit(this.item);
+        this.navigationService.onNavCollapseToggle.emit();
    }

    /**
@@ -110,7 +96,7 @@ export class FuseNavVerticalCollapseComponent implements OnInit
        }

        this.isOpen = true;
-        this.navigationService.onItemCollapseToggled.next();
+        this.navigationService.onNavCollapseToggle.emit();
    }

    /**
@@ -122,9 +108,8 @@ export class FuseNavVerticalCollapseComponent implements OnInit
        {
            return;
        }
-
        this.isOpen = false;
-        this.navigationService.onItemCollapseToggled.next();
+        this.navigationService.onNavCollapseToggle.emit();
    }

    /**
@@ -190,4 +175,8 @@ export class FuseNavVerticalCollapseComponent implements OnInit
        return false;
    }

+    ngOnInit()
+    {
+    }
+
 }
--- a/src/app/core/components/navigation/vertical/nav-group/nav-vertical-group.component.html
+++ b/src/app/core/components/navigation/vertical/nav-group/nav-vertical-group.component.html
@@ -0,0 +1,10 @@
+<div class="group-title">
+    <span class="hint-text">{{ item.title }}</span>
+</div>
+<div class="group-items">
+    <ng-container *ngFor="let item of item.children">
+        <fuse-nav-vertical-group *ngIf="item.type=='group'" [item]="item"></fuse-nav-vertical-group>
+        <fuse-nav-vertical-collapse *ngIf="item.type=='collapse'" [item]="item"></fuse-nav-vertical-collapse>
+        <fuse-nav-vertical-item *ngIf="item.type=='item'" [item]="item"></fuse-nav-vertical-item>
+    </ng-container>
+</div>
--- a/src/app/core/components/navigation/vertical/nav-group/nav-vertical-group.component.scss
+++ b/src/app/core/components/navigation/vertical/nav-group/nav-vertical-group.component.scss
@@ -1,6 +1,6 @@
 :host {

-    .folded:not(.unfolded) & {
+    .folded:not(.folded-open) & {

        > .group-title {
            align-items: center;
--- a/src/app/core/components/navigation/vertical/nav-group/nav-vertical-group.component.ts
+++ b/src/app/core/components/navigation/vertical/nav-group/nav-vertical-group.component.ts
@@ -1,11 +1,11 @@
-import { Component, HostBinding, Input } from '@angular/core';
+import { Component, HostBinding, Input, OnInit } from '@angular/core';

@Component({
    selector   : 'fuse-nav-vertical-group',
    templateUrl: './nav-vertical-group.component.html',
    styleUrls  : ['./nav-vertical-group.component.scss']
 })
-export class FuseNavVerticalGroupComponent
+export class FuseNavVerticalGroupComponent implements OnInit
 {
    @HostBinding('class') classes = 'nav-group nav-item';
    @Input() item: any;
@@ -14,4 +14,8 @@ export class FuseNavVerticalGroupComponent
    {
    }

+    ngOnInit()
+    {
+    }
+
 }
--- a/src/app/core/components/navigation/vertical/nav-item/nav-vertical-item.component.html
+++ b/src/app/core/components/navigation/vertical/nav-item/nav-vertical-item.component.html
@@ -0,0 +1,18 @@
+<a class="nav-link" *ngIf="item.url" [routerLink]="[item.url]" routerLinkActive="active"
+   [routerLinkActiveOptions]="{exact: item.exactMatch || false}" matRipple>
+    <mat-icon class="nav-link-icon" *ngIf="item.icon">{{item.icon}}</mat-icon>
+    <span class="nav-link-title">{{item.title}}</span>
+    <span class="nav-link-badge" *ngIf="item.badge"
+          [ngStyle]="{'background-color': item.badge.bg,'color': item.badge.fg}">
+        {{item.badge.title}}
+    </span>
+</a>
+
+<span class="nav-link" *ngIf="item.function" (click)="item.function()" matRipple>
+    <mat-icon class="nav-link-icon" *ngIf="item.icon">{{item.icon}}</mat-icon>
+    <span class="nav-link-title">{{item.title}}</span>
+    <span class="nav-link-badge" *ngIf="item.badge"
+          [ngStyle]="{'background-color': item.badge.bg,'color': item.badge.fg}">
+        {{item.badge.title}}
+    </span>
+</span>
--- a/src/app/core/components/navigation/vertical/nav-item/nav-vertical-item.component.scss
+++ b/src/app/core/components/navigation/vertical/nav-item/nav-vertical-item.component.scss
@@ -1,6 +1,6 @@
 :host {

-    .folded:not(.unfolded) & {
+    .folded:not(.folded-open) & {

        .nav-link {

--- a/src/app/core/components/navigation/vertical/nav-item/nav-vertical-item.component.ts
+++ b/src/app/core/components/navigation/vertical/nav-item/nav-vertical-item.component.ts
@@ -1,11 +1,11 @@
-import { Component, HostBinding, Input } from '@angular/core';
+import { Component, HostBinding, Input, OnInit } from '@angular/core';

@Component({
    selector   : 'fuse-nav-vertical-item',
    templateUrl: './nav-vertical-item.component.html',
    styleUrls  : ['./nav-vertical-item.component.scss']
 })
-export class FuseNavVerticalItemComponent
+export class FuseNavVerticalItemComponent implements OnInit
 {
    @HostBinding('class') classes = 'nav-item';
    @Input() item: any;
@@ -13,4 +13,8 @@ export class FuseNavVerticalItemComponent
    constructor()
    {
    }
+
+    ngOnInit()
+    {
+    }
 }
--- a/src/app/core/components/search-bar/search-bar.component.html
+++ b/src/app/core/components/search-bar/search-bar.component.html
@@ -1,7 +1,5 @@
-<div class="fuse-search-bar" [ngClass]="{'expanded':!collapsed}">
-
-    <div class="fuse-search-bar-content" [ngClass]="toolbarColor">
-
+<div class="fuse-search-bar" [ngClass]="{'expanded':!collapsed}" fxFlex="0 1 auto">
+    <div [ngClass]="toolbarColor" fxLayout="row" fxLayoutAlign="start center" fxFlex>
        <label for="fuse-search-bar-input">
            <button mat-icon-button class="fuse-search-bar-expander" aria-label="Expand Search Bar" (click)="expand()"
                    *ngIf="collapsed">
@@ -12,14 +10,12 @@
            </span>-->
        </label>

-        <input id="fuse-search-bar-input" class="ml-24" type="text" placeholder="Search" (input)="search($event)"
-               fxFlex>
+        <input id="fuse-search-bar-input" class="ml-24" type="text" placeholder="Search" (input)="search($event)" fxFlex>

-        <button mat-icon-button class="fuse-search-bar-collapser" (click)="collapse()"
+        <button mat-icon-button class="fuse-search-bar-collapser mat-icon-button" (click)="collapse()"
                aria-label="Collapse Search Bar">
            <mat-icon class="s-24">close</mat-icon>
        </button>

    </div>
-
 </div>
--- a/src/app/core/components/search-bar/search-bar.component.scss
+++ b/src/app/core/components/search-bar/search-bar.component.scss
@@ -0,0 +1,77 @@
+@import "src/app/core/scss/fuse";
+
+:host {
+
+    .fuse-search-bar {
+        min-width: 64px;
+        height: 64px;
+        font-size: 13px;
+
+        @include media-breakpoint-down('sm') {
+            height: 56px;
+        }
+
+        .fuse-search-bar-expander,
+        .fuse-search-bar-collapser {
+            cursor: pointer;
+            padding: 0 20px;
+            margin: 0;
+            width: 64px !important;
+            height: 64px !important;
+            line-height: 64px !important;
+
+            @include media-breakpoint-down('sm') {
+                height: 56px !important;
+                line-height: 56px !important;
+            }
+        }
+
+        .fuse-search-bar-loader {
+            width: 64px !important;
+            height: 64px !important;
+            line-height: 64px !important;
+            @include media-breakpoint-down('sm') {
+                height: 56px !important;
+                line-height: 56px !important;
+            }
+        }
+
+        .fuse-search-bar-collapser {
+            display: none;
+        }
+
+        #fuse-search-bar-input {
+            display: none;
+            min-height: 64px;
+            background-color: transparent;
+            font-size: 16px;
+        }
+
+        &.expanded {
+            position: absolute;
+            top: 0;
+            right: 0;
+            bottom: 0;
+            left: 0;
+            z-index: 10;
+
+            #fuse-search-bar-input {
+                display: block;
+            }
+
+            .fuse-search-bar-collapser {
+                display: block;
+            }
+        }
+    }
+
+    body {
+
+        &.fuse-search-bar-expanded {
+
+            #toolbar {
+                z-index: 999 !important;
+            }
+        }
+    }
+}
--- a/src/app/core/components/search-bar/search-bar.component.ts
+++ b/src/app/core/components/search-bar/search-bar.component.ts
@@ -1,27 +1,26 @@
-import { Component, EventEmitter, Output } from '@angular/core';
+import { Component, EventEmitter, OnInit, Output } from '@angular/core';
+import { FuseConfigService } from '../../services/config.service';
 import { Subscription } from 'rxjs/Subscription';

-import { FuseConfigService } from '@fuse/services/config.service';
-
@Component({
    selector   : 'fuse-search-bar',
    templateUrl: './search-bar.component.html',
    styleUrls  : ['./search-bar.component.scss']
 })
-export class FuseSearchBarComponent
+export class FuseSearchBarComponent implements OnInit
 {
    collapsed: boolean;
    toolbarColor: string;
    @Output() onInput: EventEmitter<any> = new EventEmitter();
-    onConfigChanged: Subscription;
+    onSettingsChanged: Subscription;

    constructor(
        private fuseConfig: FuseConfigService
    )
    {
        this.collapsed = true;
-        this.onConfigChanged =
-            this.fuseConfig.onConfigChanged
+        this.onSettingsChanged =
+            this.fuseConfig.onSettingsChanged
                .subscribe(
                    (newSettings) => {
                        this.toolbarColor = newSettings.colorClasses.toolbar;
@@ -29,6 +28,11 @@ export class FuseSearchBarComponent
                );
    }

+    ngOnInit()
+    {
+
+    }
+
    collapse()
    {
        this.collapsed = true;
--- a/src/app/core/components/search-bar/search-bar.module.ts
+++ b/src/app/core/components/search-bar/search-bar.module.ts
@@ -1,9 +1,7 @@
 import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
 import { RouterModule } from '@angular/router';

-import { MatButtonModule, MatIconModule } from '@angular/material';
-
+import { SharedModule } from '../../modules/shared.module';
 import { FuseSearchBarComponent } from './search-bar.component';

@NgModule({
@@ -11,11 +9,8 @@ import { FuseSearchBarComponent } from './search-bar.component';
        FuseSearchBarComponent
    ],
    imports     : [
-        CommonModule,
-        RouterModule,
-
-        MatButtonModule,
-        MatIconModule
+        SharedModule,
+        RouterModule
    ],
    exports     : [
        FuseSearchBarComponent
--- a/src/app/core/components/shortcuts/shortcuts.component.html
+++ b/src/app/core/components/shortcuts/shortcuts.component.html
@@ -17,7 +17,7 @@
                     *ngFor="let shortcutItem of shortcutItems">

                    <a mat-icon-button matTooltip="{{shortcutItem.title}}" [routerLink]="shortcutItem.url">
-                        <mat-icon class="secondary-text" *ngIf="shortcutItem.icon">{{shortcutItem.icon}}</mat-icon>
+                        <mat-icon *ngIf="shortcutItem.icon">{{shortcutItem.icon}}</mat-icon>
                        <span *ngIf="!shortcutItem.icon" class="h2 secondary-text text-bold">
                            {{shortcutItem.title.substr(0, 1).toUpperCase()}}
                        </span>
@@ -42,70 +42,46 @@

        <mat-menu #addMenu="matMenu" class="w-240">

-            <mat-form-field class="px-16 w-100-p" (click)="$event.stopPropagation()" floatLabel="never">
+            <mat-form-field class="px-16 w-100-p" (click)="$event.stopPropagation()" floatPlaceholder="never">
                <input #searchInput matInput placeholder="Search for an app or a page" (input)="search($event)">
            </mat-form-field>

            <mat-divider></mat-divider>
-
            <mat-nav-list *ngIf="!searching" style="max-height: 312px; overflow: auto" fusePerfectScrollbar>

                <mat-list-item *ngFor="let shortcutItem of shortcutItems"
                               (click)="toggleShortcut($event, shortcutItem)">
-
                    <div class="w-100-p" fxLayout="row" fxLayoutAlign="start center">
-
-                        <mat-icon mat-list-icon class="mr-8 secondary-text" *ngIf="shortcutItem.icon">
-                            {{shortcutItem.icon}}
-                        </mat-icon>
-
+                        <mat-icon mat-list-icon class="mr-8" *ngIf="shortcutItem.icon">{{shortcutItem.icon}}</mat-icon>
                        <span class="h2 w-32 h-32 p-4 mr-8 secondary-text text-bold" fxLayout="row"
                              fxLayoutAlign="center center" *ngIf="!shortcutItem.icon">
                            {{shortcutItem.title.substr(0, 1).toUpperCase()}}
                        </span>
-
                        <p matLine fxFlex>{{shortcutItem.title}}</p>
-
-                        <mat-icon class="ml-8 amber-fg">star</mat-icon>
-
+                        <mat-icon class="ml-8">star</mat-icon>
                    </div>
-
                </mat-list-item>
-
                <mat-list-item *ngIf="shortcutItems.length === 0">
                    <p>
                        <small>No shortcuts yet!</small>
                    </p>
                </mat-list-item>
-
            </mat-nav-list>

            <mat-nav-list *ngIf="searching" style="max-height: 312px; overflow: auto" fusePerfectScrollbar>
-
                <mat-list-item *ngFor="let navigationItem of filteredNavigationItems"
                               (click)="toggleShortcut($event, navigationItem)">
-
                    <div class="w-100-p" fxLayout="row" fxLayoutAlign="start center">
-
-                        <mat-icon mat-list-icon class="mr-8 secondary-text" *ngIf="navigationItem.icon">
-                            {{navigationItem.icon}}
-                        </mat-icon>
-
+                        <mat-icon mat-list-icon class="mr-8" *ngIf="navigationItem.icon">{{navigationItem.icon}}</mat-icon>
                        <span class="h2 w-32 h-32 p-4 mr-8 secondary-text text-bold" fxLayout="row"
                              fxLayoutAlign="center center" *ngIf="!navigationItem.icon">
                            {{navigationItem.title.substr(0, 1).toUpperCase()}}
                        </span>
-
                        <p matLine fxFlex>{{navigationItem.title}}</p>
-
-                        <mat-icon class="ml-8 amber-fg" *ngIf="isInShortcuts(navigationItem)">star</mat-icon>
-
+                        <mat-icon class="ml-8" *ngIf="isInShortcuts(navigationItem)">star</mat-icon>
                    </div>
-
                </mat-list-item>
-
            </mat-nav-list>
-
        </mat-menu>

    </div>
--- a/src/app/core/components/shortcuts/shortcuts.component.scss
+++ b/src/app/core/components/shortcuts/shortcuts.component.scss
@@ -1,4 +1,4 @@
-@import 'src/@fuse/scss/fuse';
+@import 'src/app/core/scss/fuse';

 :host {

--- a/src/app/core/components/shortcuts/shortcuts.component.ts
+++ b/src/app/core/components/shortcuts/shortcuts.component.ts
@@ -1,12 +1,11 @@
-import { Component, ElementRef, Input, OnDestroy, OnInit, Renderer2, ViewChild } from '@angular/core';
+import { Component, ElementRef, OnDestroy, OnInit, Renderer2, ViewChild } from '@angular/core';
+import { FuseNavigationService } from '../navigation/navigation.service';
 import { Subscription } from 'rxjs/Subscription';
 import { ObservableMedia } from '@angular/flex-layout';
+import { FuseMatchMedia } from '../../services/match-media.service';
+import { FuseConfigService } from '../../services/config.service';
 import { CookieService } from 'ngx-cookie-service';

-import { FuseMatchMediaService } from '@fuse/services/match-media.service';
-import { FuseNavigationService } from '@fuse/components/navigation/navigation.service';
-import { FuseConfigService } from '@fuse/services/config.service';
-
@Component({
    selector   : 'fuse-shortcuts',
    templateUrl: './shortcuts.component.html',
@@ -21,9 +20,7 @@ export class FuseShortcutsComponent implements OnInit, OnDestroy
    mobileShortcutsPanelActive = false;
    toolbarColor: string;
    matchMediaSubscription: Subscription;
-    onConfigChanged: Subscription;
-
-    @Input() navigation: any;
+    onSettingsChanged: Subscription;

    @ViewChild('searchInput') searchInputField;
    @ViewChild('shortcuts') shortcutsEl: ElementRef;
@@ -31,14 +28,16 @@ export class FuseShortcutsComponent implements OnInit, OnDestroy
    constructor(
        private renderer: Renderer2,
        private observableMedia: ObservableMedia,
-        private fuseMatchMedia: FuseMatchMediaService,
+        private fuseMatchMedia: FuseMatchMedia,
        private fuseNavigationService: FuseNavigationService,
        private fuseConfig: FuseConfigService,
        private cookieService: CookieService
    )
    {
-        this.onConfigChanged =
-            this.fuseConfig.onConfigChanged
+        this.filteredNavigationItems = this.navigationItems = this.fuseNavigationService.getFlatNavigation();
+
+        this.onSettingsChanged =
+            this.fuseConfig.onSettingsChanged
                .subscribe(
                    (newSettings) => {
                        this.toolbarColor = newSettings.colorClasses.toolbar;
@@ -48,9 +47,6 @@ export class FuseShortcutsComponent implements OnInit, OnDestroy

    ngOnInit()
    {
-        // Get the navigation items and flatten them
-        this.filteredNavigationItems = this.navigationItems = this.fuseNavigationService.getFlatNavigation(this.navigation);
-
        const cookieExists = this.cookieService.check('FUSE2.shortcuts');

        if ( cookieExists )
--- a/src/app/core/components/shortcuts/shortcuts.module.ts
+++ b/src/app/core/components/shortcuts/shortcuts.module.ts
@@ -0,0 +1,21 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+import { FuseShortcutsComponent } from './shortcuts.component';
+import { SharedModule } from '../../modules/shared.module';
+
+@NgModule({
+    declarations: [
+        FuseShortcutsComponent
+    ],
+    imports     : [
+        SharedModule,
+        RouterModule
+    ],
+    exports     : [
+        FuseShortcutsComponent
+    ]
+})
+export class FuseShortcutsModule
+{
+}
--- a/src/app/core/components/theme-options/theme-options.component.html
+++ b/src/app/core/components/theme-options/theme-options.component.html
@@ -13,8 +13,8 @@
    <div class="theme-options-panel-inner" fxLayout="column" fxLayoutAlign="start start">

        <h3>Navigation:</h3>
-        <mat-radio-group [(ngModel)]="config.layout.navigation" (ngModelChange)="onSettingsChange()"
-                         fxLayout="column" fxLayout.gt-xs="row wrap" fxLayoutAlign="start start">
+        <mat-radio-group [(ngModel)]="fuseSettings.layout.navigation" (ngModelChange)="onSettingsChange()"
+                         fxLayout="column" fxLayout.gt-xs="row" fxLayoutAlign="start start" fxLayoutWrap>
            <mat-radio-button class="mr-8 mb-8" value="top">Top</mat-radio-button>
            <mat-radio-button class="mr-8 mb-8" value="left">Left</mat-radio-button>
            <mat-radio-button class="mr-8 mb-8" value="right">Right</mat-radio-button>
@@ -22,30 +22,30 @@
        </mat-radio-group>

        <h3>Navigation Fold (for vertical navigation):</h3>
-        <mat-slide-toggle [(ngModel)]="config.layout.navigationFolded"
+        <mat-slide-toggle [(ngModel)]="fuseSettings.layout.navigationFolded"
                          (change)="onSettingsChange()">
            Folded
        </mat-slide-toggle>

        <h3 class="mt-24">Toolbar:</h3>
-        <mat-radio-group [(ngModel)]="config.layout.toolbar" (ngModelChange)="onSettingsChange()"
-                         fxLayout="column" fxLayout.gt-xs="row wrap" fxLayoutAlign="start start">
+        <mat-radio-group [(ngModel)]="fuseSettings.layout.toolbar" (ngModelChange)="onSettingsChange()"
+                         fxLayout="column" fxLayout.gt-xs="row" fxLayoutAlign="start start" fxLayoutWrap>
            <mat-radio-button class="mr-8 mb-8" value="below">Below</mat-radio-button>
            <mat-radio-button class="mr-8 mb-8" value="above">Above</mat-radio-button>
            <mat-radio-button class="mr-8 mb-8" value="none">None</mat-radio-button>
        </mat-radio-group>

        <h3 class="mt-24">Footer:</h3>
-        <mat-radio-group [(ngModel)]="config.layout.footer" (ngModelChange)="onSettingsChange()"
-                         fxLayout="column" fxLayout.gt-xs="row  wrap" fxLayoutAlign="start start">
+        <mat-radio-group [(ngModel)]="fuseSettings.layout.footer" (ngModelChange)="onSettingsChange()"
+                         fxLayout="column" fxLayout.gt-xs="row" fxLayoutAlign="start start" fxLayoutWrap>
            <mat-radio-button class="mr-8 mb-8" value="below">Below</mat-radio-button>
            <mat-radio-button class="mr-8 mb-8" value="above">Above</mat-radio-button>
            <mat-radio-button class="mr-8 mb-8" value="none">None</mat-radio-button>
        </mat-radio-group>

        <h3 class="mt-24">Layout Mode:</h3>
-        <mat-radio-group [(ngModel)]="config.layout.mode" (ngModelChange)="onSettingsChange()"
-                         fxLayout="column" fxLayout.gt-xs="row  wrap" fxLayoutAlign="start start">
+        <mat-radio-group [(ngModel)]="fuseSettings.layout.mode" (ngModelChange)="onSettingsChange()"
+                         fxLayout="column" fxLayout.gt-xs="row" fxLayoutAlign="start start" fxLayoutWrap>
            <mat-radio-button class="mr-8 mb-8" value="boxed">Boxed</mat-radio-button>
            <mat-radio-button class="mr-8 mb-8" value="fullwidth">Fullwidth</mat-radio-button>
        </mat-radio-group>
@@ -57,19 +57,19 @@

            <div fxFlex fxLayout="row" fxLayoutAlign="space-between center">
                <h4 class="mr-8">Toolbar Color</h4>
-                <fuse-material-color-picker [(selectedClass)]="config.colorClasses.toolbar"
+                <fuse-material-color-picker [(selectedClass)]="fuseSettings.colorClasses.toolbar"
                                            (onValueChange)="onSettingsChange()"></fuse-material-color-picker>
            </div>

            <div fxFlex fxLayout="row" fxLayoutAlign="space-between center">
                <h4 class="mr-8">Navigation Bar Color</h4>
-                <fuse-material-color-picker [(selectedClass)]="config.colorClasses.navbar"
+                <fuse-material-color-picker [(selectedClass)]="fuseSettings.colorClasses.navbar"
                                            (onValueChange)="onSettingsChange()"></fuse-material-color-picker>
            </div>

            <div fxFlex fxLayout="row" fxLayoutAlign="space-between center">
                <h4 class="mr-8">Footer Color</h4>
-                <fuse-material-color-picker [(selectedClass)]="config.colorClasses.footer"
+                <fuse-material-color-picker [(selectedClass)]="fuseSettings.colorClasses.footer"
                                            (onValueChange)="onSettingsChange()"></fuse-material-color-picker>
            </div>

@@ -79,7 +79,7 @@

        <h3>Router Animation:</h3>
        <mat-form-field class="w-100-p">
-            <mat-select class="p-0" [(ngModel)]="config.routerAnimation">
+            <mat-select class="p-0" [(ngModel)]="fuseSettings.routerAnimation">
                <mat-option value="none">
                    None
                </mat-option>
--- a/src/app/core/components/theme-options/theme-options.component.scss
+++ b/src/app/core/components/theme-options/theme-options.component.scss
@@ -1,4 +1,4 @@
-@import "src/@fuse/scss/fuse";
+@import "src/app/core/scss/fuse";

@keyframes rotating {
    from {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Sercan Yemen	4659da7390	Added missing variables that prevents skeleton from building as it is	2017-11-13 12:30:11 +03:00
Sercan Yemen	2a5d15694c	Merge branch 'master' into skeleton	2017-11-13 11:09:27 +03:00
Sercan Yemen	8e6024c3ee	Fixes #44 : Removed angular material elements assets	2017-11-08 15:11:20 +03:00
Sercan Yemen	f4c47daadc	Merge branch 'master' into skeleton	2017-11-08 15:10:51 +03:00
Sercan Yemen	381bc6c0fe	Merge branch 'master' into skeleton	2017-11-04 16:50:03 +03:00
Sercan Yemen	b5a139f81d	Merge branch 'master' into skeleton	2017-11-04 16:32:29 +03:00
Sercan Yemen	914477da41	Merge branch 'master' into skeleton	2017-11-04 16:25:09 +03:00
Sercan Yemen	410802808e	Merge branch 'master' into skeleton	2017-11-04 16:20:46 +03:00
Sercan Yemen	56dbc58d5e	Merge branch 'master' into skeleton + Added translation example to the sample page	2017-10-27 12:01:09 +03:00
Sercan Yemen	d7c6b2d617	Merge branch 'master' into skeleton	2017-10-27 11:49:31 +03:00
Sercan Yemen	80627bdde9	removed fake-db thingy	2017-10-16 10:50:57 +03:00
Sercan Yemen	6595975f2b	Merge branch 'master' into skeleton	2017-10-16 10:45:27 +03:00
Sercan Yemen	dcb8032758	Merge branch 'master' into skeleton	2017-10-16 10:10:06 +03:00
Sercan Yemen	fb214da5fe	Merge branch 'master' into skeleton	2017-10-14 18:53:08 +03:00
Sercan Yemen	e20687034f	Merge branch 'master' into skeleton	2017-10-14 18:53:00 +03:00
Sercan Yemen	f9bda99deb	Merge branch 'master' into skeleton	2017-10-02 10:15:00 +03:00
Sercan Yemen	1d81e37a0f	removed markdown module imports	2017-09-28 13:00:44 +03:00
Sercan Yemen	83f0ed5ec1	Merge branch 'master' into skeleton	2017-09-28 12:52:59 +03:00
Sercan Yemen	e486413872	remove unnecessary stuff from skeleton	2017-09-28 12:51:15 +03:00
Sercan Yemen	576e167ef1	Merge branch 'master' into skeleton	2017-09-28 12:49:18 +03:00
Sercan Yemen	cf9e9fc209	Merge branch 'master' into skeleton	2017-09-22 16:45:47 +03:00
Sercan Yemen	ff0f2933d9	Merge branch 'master' into skeleton	2017-09-22 16:45:23 +03:00
Sercan Yemen	62467c8ddf	Merge branch 'master' into skeleton	2017-09-12 16:06:21 +03:00
Sercan Yemen	024ab15b25	Merge branch 'master' into skeleton	2017-09-11 16:34:07 +03:00
Sercan Yemen	915ad52863	Merge branch 'master' into skeleton	2017-09-11 16:21:05 +03:00
Sercan Yemen	97bfaa9979	Merge branch 'master' into skeleton	2017-09-11 13:06:42 +03:00
Sercan Yemen	6ae3e154c3	Merge branch 'master' into skeleton	2017-09-11 12:59:36 +03:00
Sercan Yemen	49b6ff7292	navigation model for horizontal nav	2017-09-11 12:58:24 +03:00
Sercan Yemen	903688ab43	Merge branch 'master' into skeleton	2017-09-11 12:57:59 +03:00
Sercan Yemen	19f822cbab	removed unnecessary md2 from skeleton	2017-09-01 09:05:56 +03:00
Sercan Yemen	1d21a14d0e	Merge branch 'master' into skeleton	2017-08-30 20:52:23 +03:00
Sercan Yemen	4bf2ba73ad	merge 'master' into skeleton	2017-08-30 20:08:12 +03:00
Sercan Yemen	6a3972fff8	Merge branch 'master' into skeleton	2017-08-30 14:43:10 +03:00
Sercan Yemen	dca16238eb	Merge branch 'master' into skeleton	2017-08-30 14:41:30 +03:00
Sercan Yemen	2b91119d00	Merge branch 'master' into skeleton	2017-08-30 11:50:56 +03:00
Sercan Yemen	ff4899e8d2	Merge branch 'master' into skeleton # Conflicts: # src/app/app.module.ts # src/app/main/content/apps/calendar/calendar.component.html # src/app/main/content/apps/contacts/contact-list/contact-list.component.html # src/app/main/content/apps/contacts/contacts.component.html # src/app/main/content/apps/contacts/contacts.component.scss # src/app/main/content/apps/contacts/contacts.module.ts # src/app/main/content/apps/contacts/contacts.service.ts # src/app/main/content/apps/contacts/selected-bar/selected-bar.component.html # src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.html # src/app/navigation.model.ts	2017-08-24 11:18:24 +03:00
Sercan Yemen	e818c53f1d	navbar fixes	2017-08-22 16:05:32 +03:00
Sercan Yemen	ca96fffadf	removed fuse fake db	2017-08-22 15:58:35 +03:00
Sercan Yemen	d7003711ee	skeleton branch	2017-08-22 15:55:48 +03:00
				`@@ -1 +0,0 @@`
				`https://themeforest.net/licenses/terms/regular`