Updated Angular & Angular Material

+ Increased the Fuse version
Mail-Ngrx app throws errors for certain rxjs operators
2025-12-22 18:17:07 +00:00 · 2018-01-11 12:57:38 +03:00 · 2018-01-11 12:31:06 +03:00 · 2018-01-09 11:30:11 +03:00 · 2018-01-08 16:39:44 +03:00 · 2018-01-08 16:02:45 +03:00
91 changed files with 3104 additions and 1328 deletions
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "fuse2",
-  "version": "1.3.1",
+  "version": "1.3.3",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@@ -52,31 +52,31 @@
      }
    },
    "@angular/animations": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-5.1.2.tgz",
-      "integrity": "sha512-so2i0He4Fh5YuvujC68k2/Hzyy56/vZAUmLTXHE+9f4RatjqV68LISseFXqcS8bhVuT7AD2ZEbHnM7nWhgDaTg==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-5.2.0.tgz",
+      "integrity": "sha512-JLR42YHiJppO4ruAkFxgbzghUDtHkXHkKPM8udd2qyt16T7e1OX7EEOrrmldUu59CC56tZnJ/32p4SrYmxyBSA==",
      "requires": {
        "tslib": "1.8.0"
      }
    },
    "@angular/cdk": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-5.0.2.tgz",
-      "integrity": "sha512-02OuEFBZ7USE5/hq5O7NfBF4RTDfcgOpGmKCdznUejPZ7t74xMYa1N/rC0RvtlXChTabTkVNl4OCXHl1ACTFPw==",
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-5.0.4.tgz",
+      "integrity": "sha512-6IKDOhDrfKdywTZNTWZbM1O8Q3cTi7uIOAyFC9sXitg0JUy2SHms0UY9FdW32BABIsZp692ofMCMdMPjHDjwwA==",
      "requires": {
        "tslib": "1.8.0"
      }
    },
    "@angular/cli": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-1.6.2.tgz",
-      "integrity": "sha512-Qc6AD37ASJjhbYkDgWQOniEl+XDLWDydqPOZ0kPQhbrJk49PoM1HNZfCD1FmIZFTT/eFEVsaexc/rKw0KckvSA==",
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-1.6.3.tgz",
+      "integrity": "sha512-At0/Q8CsldsvekOmAnYF8g7BAf0aHJImPLstxzPeWdg7EZbQxwCH0I+ZSZFHL43f8md6n9JmSeUWrlwANs+bHw==",
      "dev": true,
      "requires": {
        "@angular-devkit/build-optimizer": "0.0.36",
        "@angular-devkit/schematics": "0.0.42",
        "@ngtools/json-schema": "1.1.0",
-        "@ngtools/webpack": "1.9.2",
+        "@ngtools/webpack": "1.9.3",
        "@schematics/angular": "0.1.11",
        "autoprefixer": "6.7.7",
        "chalk": "2.2.2",
@@ -84,7 +84,7 @@
        "common-tags": "1.6.0",
        "copy-webpack-plugin": "4.3.1",
        "core-object": "3.1.5",
-        "css-loader": "0.28.7",
+        "css-loader": "0.28.8",
        "cssnano": "3.10.0",
        "denodeify": "1.2.1",
        "ember-cli-string-utils": "1.1.0",
@@ -109,7 +109,7 @@
        "opn": "5.1.0",
        "portfinder": "1.0.13",
        "postcss-custom-properties": "6.2.0",
-        "postcss-loader": "2.0.9",
+        "postcss-loader": "2.0.10",
        "postcss-url": "7.3.0",
        "raw-loader": "0.5.1",
        "resolve": "1.5.0",
@@ -122,7 +122,7 @@
        "style-loader": "0.13.2",
        "stylus": "0.54.5",
        "stylus-loader": "3.0.1",
-        "uglifyjs-webpack-plugin": "1.1.5",
+        "uglifyjs-webpack-plugin": "1.1.6",
        "url-loader": "0.6.2",
        "webpack": "3.10.0",
        "webpack-dev-middleware": "1.12.2",
@@ -130,41 +130,41 @@
        "webpack-merge": "4.1.1",
        "webpack-sources": "1.1.0",
        "webpack-subresource-integrity": "1.0.3",
-        "zone.js": "0.8.18"
+        "zone.js": "0.8.20"
      }
    },
    "@angular/common": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-5.1.2.tgz",
-      "integrity": "sha512-MqgMwsHXxxx8vmQrUFwhNcAg29eqClJdnMJ81DlD7XvEexyXxxoFrxnNea+aB3BUC1AzU0fEy24ngygmhjRmfw==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-5.2.0.tgz",
+      "integrity": "sha512-yMFn2isC7/XOs56/2Kzzbb1AASHiwipAPOVFtKe7TdZQClO8fJXwCnk326rzr615+CG0eSBNQWeiFGyWN2riBA==",
      "requires": {
        "tslib": "1.8.0"
      }
    },
    "@angular/compiler": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-5.1.2.tgz",
-      "integrity": "sha512-asTrlMWRe24EzejBwBFVSfq3ZbYI9Xr9NbNtkHK4DRHutDA1wn5PQE5lHuUTNW2B/dmm9pm+5JTVtcbue0nEug==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-5.2.0.tgz",
+      "integrity": "sha512-RfYa4ESgjGX0T0ob/Xz00IF7nd2xZkoyRy6oKgL82q42uzB3xZUDMrFNgeGxAUs3H22IkL46/5SSPOMOTMZ0NA==",
      "requires": {
        "tslib": "1.8.0"
      }
    },
    "@angular/compiler-cli": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-5.1.2.tgz",
-      "integrity": "sha512-dtSVF8RnxYCDSCDbWNv3xg379xAN/1s6odpF5lFyemUi/p2U9mkeXtHo5Y74PX/kdoVnXrTY8bCNnQPm3sHVZA==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-5.2.0.tgz",
+      "integrity": "sha512-+Kef4NjuHwLj2hRPdVo4yAtPmv+kn0Nu/ShmKfaEK4mt9aaQMFxKNt6beUuDK5iUPMB5nuTCZ4bqEFpqd+EtxQ==",
      "dev": true,
      "requires": {
        "chokidar": "1.7.0",
        "minimist": "1.2.0",
        "reflect-metadata": "0.1.10",
-        "tsickle": "0.25.6"
+        "tsickle": "0.26.0"
      }
    },
    "@angular/core": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/@angular/core/-/core-5.1.2.tgz",
-      "integrity": "sha512-nHQWvhdxg7RbhRcfV5EhWURUZBqtcBFajXTBYA2rVHPhm0lGqEUi38VW0ddO8MpPGz0pK2PNpgR3GwXp/egaNw==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-5.2.0.tgz",
+      "integrity": "sha512-s2ne45DguNUubhC1YgybGECC4Tyx3G4EZCntUiRMDWWkmKXSK+6dgHMesyDo8R5Oat8VfN4Anf8l3JHS1He8kg==",
      "requires": {
        "tslib": "1.8.0"
      }
@@ -178,63 +178,63 @@
      }
    },
    "@angular/forms": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-5.1.2.tgz",
-      "integrity": "sha512-IQRZ2KF4303ga9nTzjU223steFLcaRrFyakM/+x8Hu1otzLeIoFiyDaFPBHtUvoRN14JlKusIi9m407mM2oNJQ==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-5.2.0.tgz",
+      "integrity": "sha512-g1/SF9lY0ZwzJ0w4NXbFsTGGEuUdgtaZny8DmkaqtmA7idby3FW398X0tv25KQfVYKtL+p9Jp1Y8EI0CvrIsvw==",
      "requires": {
        "tslib": "1.8.0"
      }
    },
    "@angular/http": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/@angular/http/-/http-5.1.2.tgz",
-      "integrity": "sha512-LvOgVPCxOii2TH8r8UrXQJjqrbgrt/HTNOtqqT1/CmemsnbGcBiYAnt5yiZ2aYQuop4RZLhQ/UpuSMLur9XPtg==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@angular/http/-/http-5.2.0.tgz",
+      "integrity": "sha512-V5Cl24dP3rCXTTQvDc0TIKoWqBRAa0DWAQbtr7iuDAt5a1vPGdKz5K1sEiiV6ziwX6gzjiwHjUvL+B+WbIUrQA==",
      "requires": {
        "tslib": "1.8.0"
      }
    },
    "@angular/language-service": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-5.1.2.tgz",
-      "integrity": "sha512-oFov/UQyvW3CJESJvC1nI0xSsWOc4Mx5N0Tbah9g2cryShT5PoFGDUE8+Pu5Yjl3uu+iNMnQ4F+J2DDRmyJTWQ==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-5.2.0.tgz",
+      "integrity": "sha512-Yj/y5XrBBXbtwnZ6HJOBl/0XS/JBvVlHb1UWw5MIrsc81k7/eFiRAIKzmGpAba+Sw0G0dO22ABZ4yJjAMsML6A==",
      "dev": true
    },
    "@angular/material": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/@angular/material/-/material-5.0.2.tgz",
-      "integrity": "sha512-mcEj1uukmMMILEHGmhxhqH2+rXjO/aXElbMJtfDoo7aCZvJ3soiyXemAWliyDwS1bfz1FhZGGebXkblY73XaIA==",
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/@angular/material/-/material-5.0.4.tgz",
+      "integrity": "sha512-xrGYPHOlNXpPkventLAvZyTjfCo2A8ZfdyJEHNR4LhFWIjw3ilwb1ihNv4dy/qG56g8L4AwQ2cONxQ0YyZfcWg==",
      "requires": {
        "tslib": "1.8.0"
      }
    },
    "@angular/material-moment-adapter": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-5.0.2.tgz",
-      "integrity": "sha512-80XoCmOv/nNP3I4gYJB9eSXkuh6gw0clKM6KKWADvJLm5zyQ/jJWlVjzVgwFm7CSf76/VKBQYX8hiOzfghQk+g==",
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-5.0.4.tgz",
+      "integrity": "sha512-fMnEH5sFm3C31VA/Mts5Qbw+oWRF9O2Wwmobpa1cSZNFOkxpP5I2pGT7oEZH2FJam1UqDJUpwv/jI5exYKJF0g==",
      "requires": {
        "tslib": "1.8.0"
      }
    },
    "@angular/platform-browser": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-5.1.2.tgz",
-      "integrity": "sha512-L78ijQ81tEh6nnOq2BqCDtbhqLbARs/2A9QZvEhMTTFu5MOQH0yk0VrjNv58Lch9yOj04EH/Qi7Wep2vFqb57g==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-5.2.0.tgz",
+      "integrity": "sha512-c6cR15MfopPwGZ097HdRuAi9+R9BhA3bRRFpP2HmrSSB/BW4ZNovUYwB2QUMSYbd9s0lYTtnavqGm6DKcyF2QA==",
      "requires": {
        "tslib": "1.8.0"
      }
    },
    "@angular/platform-browser-dynamic": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-5.1.2.tgz",
-      "integrity": "sha512-LMMgG1RRngIMvU19+NFRUe2+2gKgzMpwddBVDondi71EqcfumD6NN343lNcHv5/5oWuJdaAx94A29qpAjyVt5Q==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-5.2.0.tgz",
+      "integrity": "sha512-xG1eNoi8sm4Jcly2y98r5mqYVe3XV8sUJCtOhvGBYtvt4dKEQ5tOns6fWQ0nUbl6Vv3Y0xgGUS1JCtfut3DuaQ==",
      "requires": {
        "tslib": "1.8.0"
      }
    },
    "@angular/router": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/@angular/router/-/router-5.1.2.tgz",
-      "integrity": "sha512-gNP2vPTQLlpiRE6tRdZY9CHYs+XhYsiR6wAfUInMvJAocA6a2mQs4qPILJjus8WbcASDzU51C+sgHF++4gz+Qg==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-5.2.0.tgz",
+      "integrity": "sha512-VXDXtp2A1GQEUEhXg0ZzqHdTUERLgDSo3/Mmpzt+dgLMKlXDSCykcm4gINwE5VQLGD1zQvDFCCRv3seGRNfrqA==",
      "requires": {
        "tslib": "1.8.0"
      }
@@ -272,9 +272,9 @@
      "dev": true
    },
    "@ngtools/webpack": {
-      "version": "1.9.2",
-      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-1.9.2.tgz",
-      "integrity": "sha512-jM5XMwHt94qxIe9kJS3Bmz8EfZgsC2H7fVcTSEd/dgyL5C89uZJfj5ueO9yEERpnXufvALBMfUxfODTcPX01iw==",
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-1.9.3.tgz",
+      "integrity": "sha512-LOOc8eXkieY0Uh0lis8SqRvDhsDwb1CK31Fn55i0kfdzjeyGARidIYNGskO//bPMvLoWJYYpCl+jnDodtLpiLg==",
      "dev": true,
      "requires": {
        "chalk": "2.2.2",
@@ -283,7 +283,8 @@
        "magic-string": "0.22.4",
        "semver": "5.4.1",
        "source-map": "0.5.7",
-        "tree-kill": "1.2.0"
+        "tree-kill": "1.2.0",
+        "webpack-sources": "1.1.0"
      }
    },
    "@ngx-translate/core": {
@@ -353,11 +354,16 @@
      }
    },
    "@types/node": {
-      "version": "6.0.95",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.95.tgz",
-      "integrity": "sha512-d1Twx1NM49dQ7jbNZfaHTQWuYL9cFVrGxYpbc3BvMf4626lOJOZnp2aJQNB9vP/WX3UOe1TrTUMABrGRu6FZhg==",
+      "version": "6.0.96",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.96.tgz",
+      "integrity": "sha512-fsOOY6tMQ3jCB2wD51XFDmmpgm4wVKkJECdcVRqapbJEa7awJDcr+SaH8toz+4r4KW8YQ3M7ybXMoSDo1QGewA==",
      "dev": true
    },
+    "@types/prismjs": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@types/prismjs/-/prismjs-1.9.0.tgz",
+      "integrity": "sha512-zeh+xd2pcCvWm1XtWLR4v5pzZMybKeq6X8Q4cIZMMx8GmyKDUfJaOtw+JaONHUQt5ncKFXezl8QGIDQsSF5YfA=="
+    },
    "@types/q": {
      "version": "0.0.32",
      "resolved": "https://registry.npmjs.org/@types/q/-/q-0.0.32.tgz",
@@ -481,13 +487,13 @@
      "dev": true
    },
    "angular-calendar": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/angular-calendar/-/angular-calendar-0.23.0.tgz",
-      "integrity": "sha512-/FrZx80RXI55gabVWnHFl1uX0jPbZ9PEjeR4QbkVkNGQaejucKwkOtPcUJ1+oHRB0fjJdm3ZN9sb4D/Kya2SjQ==",
+      "version": "0.23.2",
+      "resolved": "https://registry.npmjs.org/angular-calendar/-/angular-calendar-0.23.2.tgz",
+      "integrity": "sha512-Ai6dDg0UfW1h0PcioIwgBwvKNcUwrA5e91P3lDDhVdIPe6E1SAcCAYT+zgxjMnCKFkhA5CozSxCwAJJgumBGIw==",
      "requires": {
        "angular-draggable-droppable": "2.0.0",
        "angular-resizable-element": "2.0.0",
-        "calendar-utils": "0.0.60",
+        "calendar-utils": "0.1.0",
        "date-fns": "1.29.0",
        "positioning": "1.3.1"
      }
@@ -507,15 +513,6 @@
      "resolved": "https://registry.npmjs.org/angular-resizable-element/-/angular-resizable-element-2.0.0.tgz",
      "integrity": "sha512-Jsa818fxtAtBA3Fp1u4mWV9tcpakM+bNYFFbB/AjKig2BtzZkeyLx3vjcBCfwPmXkK10kX2QKR8RDALk1w209A=="
    },
-    "angular2-markdown": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/angular2-markdown/-/angular2-markdown-1.6.0.tgz",
-      "integrity": "sha1-hja/narXD8NWMxJnB/+zPmhPurE=",
-      "requires": {
-        "marked": "0.3.9",
-        "prismjs": "1.9.0"
-      }
-    },
    "ansi-html": {
      "version": "0.0.7",
      "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
@@ -724,6 +721,12 @@
      "dev": true,
      "optional": true
    },
+    "async-limiter": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
+      "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==",
+      "dev": true
+    },
    "asynckit": {
      "version": "0.4.0",
      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
@@ -742,7 +745,7 @@
      "dev": true,
      "requires": {
        "browserslist": "1.7.7",
-        "caniuse-db": "1.0.30000784",
+        "caniuse-db": "1.0.30000789",
        "normalize-range": "0.1.2",
        "num2fraction": "1.2.2",
        "postcss": "5.2.18",
@@ -1152,7 +1155,7 @@
      "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
      "dev": true,
      "requires": {
-        "caniuse-db": "1.0.30000784",
+        "caniuse-db": "1.0.30000789",
        "electron-to-chromium": "1.3.30"
      }
    },
@@ -1198,9 +1201,9 @@
      "dev": true
    },
    "cacache": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.1.tgz",
-      "integrity": "sha512-dRHYcs9LvG9cHgdPzjiI+/eS7e1xRhULrcyOx04RZQsszNJXU2SL9CyG60yLnge282Qq5nwTv+ieK2fH+WPZmA==",
+      "version": "10.0.2",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.2.tgz",
+      "integrity": "sha512-dljb7dk1jqO5ogE+dRpoR9tpHYv5xz9vPSNunh1+0wRuNdYxmzp9WmsyokgW/DUF1FDRVA/TMsmxt027R8djbQ==",
      "dev": true,
      "requires": {
        "bluebird": "3.5.1",
@@ -1219,9 +1222,9 @@
      }
    },
    "calendar-utils": {
-      "version": "0.0.60",
-      "resolved": "https://registry.npmjs.org/calendar-utils/-/calendar-utils-0.0.60.tgz",
-      "integrity": "sha512-45lyGf+9XZdq+gWUzeu0PwrbkH2lkxxAa2XdaVG1Jr8ENLLwajkThvJVMf1LruRHz6gF/MJcnWSgCCTJpNVGRQ=="
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/calendar-utils/-/calendar-utils-0.1.0.tgz",
+      "integrity": "sha512-vWAp4m2I2PV9nrizBoACsXQ2GJiQVlc9EDOEPpzG6vRrTkQ4NCttUhglnQioMMXF8NYM+kJyjZGF1mRk/SSESQ=="
    },
    "callsite": {
      "version": "1.0.0",
@@ -1262,15 +1265,15 @@
      "dev": true,
      "requires": {
        "browserslist": "1.7.7",
-        "caniuse-db": "1.0.30000784",
+        "caniuse-db": "1.0.30000789",
        "lodash.memoize": "4.1.2",
        "lodash.uniq": "4.5.0"
      }
    },
    "caniuse-db": {
-      "version": "1.0.30000784",
-      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000784.tgz",
-      "integrity": "sha1-G+lQEtlInHcZB0+BruV9vf/mNhs=",
+      "version": "1.0.30000789",
+      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000789.tgz",
+      "integrity": "sha1-XPP+x1SABBqxYsoGQTFTFB4jQyU=",
      "dev": true
    },
    "caseless": {
@@ -1753,14 +1756,14 @@
      "integrity": "sha512-xlcFiW/U7KrpS6dFuWq3r8Wb7koJx7QVc7LDFCosqkikaVSxkaYOnwDLwilbjrszZ0LYZXThDAJKcQCSrvdShQ==",
      "dev": true,
      "requires": {
-        "cacache": "10.0.1",
+        "cacache": "10.0.2",
        "find-cache-dir": "1.0.0",
        "globby": "7.1.1",
        "is-glob": "4.0.0",
        "loader-utils": "0.2.17",
        "lodash": "4.17.4",
        "minimatch": "3.0.4",
-        "p-limit": "1.1.0",
+        "p-limit": "1.2.0",
        "pify": "3.0.0",
        "serialize-javascript": "1.4.0"
      },
@@ -1910,9 +1913,9 @@
      "dev": true
    },
    "css-loader": {
-      "version": "0.28.7",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.7.tgz",
-      "integrity": "sha512-GxMpax8a/VgcfRrVy0gXD6yLd5ePYbXX/5zGgTVYp4wXtJklS8Z2VaUArJgc//f6/Dzil7BaJObdSv8eKKCPgg==",
+      "version": "0.28.8",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.8.tgz",
+      "integrity": "sha512-4jGj7Ag6WUZ5lQyE4te9sJLn0lgkz6HI3WDE4aw98AkW1IAKXPP4blTpPeorlLDpNsYvojo0SYgRJOdz2KbuAw==",
      "dev": true,
      "requires": {
        "babel-code-frame": "6.26.0",
@@ -2031,12 +2034,6 @@
        "source-map": "0.5.7"
      }
    },
-    "cuint": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/cuint/-/cuint-0.2.2.tgz",
-      "integrity": "sha1-QICG1AlVDCYxFVYZ6fp7ytw7mRs=",
-      "dev": true
-    },
    "currently-unhandled": {
      "version": "0.4.1",
      "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
@@ -2067,9 +2064,9 @@
      }
    },
    "d3": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/d3/-/d3-4.12.0.tgz",
-      "integrity": "sha512-ibAzFJrj1uuX+wIy29baTx9JebA5i670UKlp+H3c9pg0w8PKl8jpj4zf64MmLPVBXm2vA1i29obnWuM/rmyfWA==",
+      "version": "4.12.2",
+      "resolved": "https://registry.npmjs.org/d3/-/d3-4.12.2.tgz",
+      "integrity": "sha512-aKAlpgTmpuGeEpezB+GvPpX1x+gCMs/PHpuse6sCpkgw4Un3ZeqUobIc87eIy9adcl+wxPAnEyKyO5oulH3MOw==",
      "requires": {
        "d3-array": "1.2.1",
        "d3-axis": "1.0.8",
@@ -2083,7 +2080,7 @@
        "d3-ease": "1.0.3",
        "d3-force": "1.1.0",
        "d3-format": "1.2.1",
-        "d3-geo": "1.9.0",
+        "d3-geo": "1.9.1",
        "d3-hierarchy": "1.1.5",
        "d3-interpolate": "1.1.6",
        "d3-path": "1.0.5",
@@ -2190,9 +2187,9 @@
      "integrity": "sha512-U4zRVLDXW61bmqoo+OJ/V687e1T5nVd3TAKAJKgtpZ/P1JsMgyod0y9br+mlQOryTAACdiXI3wCjuERHFNp91w=="
    },
    "d3-geo": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-1.9.0.tgz",
-      "integrity": "sha512-94YbAT+q5E/p+XEd4VKiNkQNicrrON3l6eoW70sC8aHjUGoBDJ/Ht8Z/hvhGJJTi2zhYBvUd34Mfqv4TG7we9A==",
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-1.9.1.tgz",
+      "integrity": "sha512-l9wL/cEQkyZQYXw3xbmLsH3eQ5ij+icNfo4r0GrLa5rOCZR/e/3am45IQ0FvQ5uMsv+77zBRunLc9ufTWSQYFA==",
      "requires": {
        "d3-array": "1.2.1"
      }
@@ -2649,6 +2646,12 @@
        "crossvent": "1.5.4"
      }
    },
+    "duplexer": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
+      "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
+      "dev": true
+    },
    "duplexify": {
      "version": "3.5.1",
      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz",
@@ -3325,6 +3328,12 @@
        "minimatch": "3.0.4"
      }
    },
+    "filesize": {
+      "version": "3.5.11",
+      "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.5.11.tgz",
+      "integrity": "sha512-ZH7loueKBoDb7yG9esn1U+fgq7BzlzW6NRi5/rMdxIZ05dj7GFD/Xc5rq2CDt5Yq86CyfSYVyx4242QQNZbx1g==",
+      "dev": true
+    },
    "fill-range": {
      "version": "2.2.3",
      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz",
@@ -4620,6 +4629,15 @@
      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
      "dev": true
    },
+    "gzip-size": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-3.0.0.tgz",
+      "integrity": "sha1-VGGI6b3DN/Zzdy+BZgRks4nc5SA=",
+      "dev": true,
+      "requires": {
+        "duplexer": "0.1.1"
+      }
+    },
    "hammerjs": {
      "version": "2.0.8",
      "resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz",
@@ -4831,11 +4849,6 @@
      "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=",
      "dev": true
    },
-    "highlight.js": {
-      "version": "9.12.0",
-      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.12.0.tgz",
-      "integrity": "sha1-5tnb5Xy+/mB1HwKvM2GVhwyQwB4="
-    },
    "hmac-drbg": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
@@ -4905,7 +4918,7 @@
        "ncname": "1.0.0",
        "param-case": "2.1.1",
        "relateurl": "0.2.7",
-        "uglify-js": "3.3.4"
+        "uglify-js": "3.3.5"
      }
    },
    "html-webpack-plugin": {
@@ -5093,7 +5106,7 @@
      "integrity": "sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=",
      "dev": true,
      "requires": {
-        "postcss": "6.0.15"
+        "postcss": "6.0.16"
      },
      "dependencies": {
        "chalk": {
@@ -5119,9 +5132,9 @@
          }
        },
        "postcss": {
-          "version": "6.0.15",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.15.tgz",
-          "integrity": "sha512-v/SpyMzLbtkmh45zUdaqLAaqXqzPdSrw8p4cQVO0/w6YiYfpj4k+Wkzhn68qk9br+H+0qfddhdPEVnbmBPfXVQ==",
+          "version": "6.0.16",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.16.tgz",
+          "integrity": "sha512-m758RWPmSjFH/2MyyG3UOW1fgYbR9rtdzz5UNJnlm7OLtu4B2h9C6gi+bE4qFKghsBRFfZT8NzoQBs6JhLotoA==",
          "dev": true,
          "requires": {
            "chalk": "2.3.0",
@@ -5912,9 +5925,9 @@
      }
    },
    "karma-coverage-istanbul-reporter": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-1.3.1.tgz",
-      "integrity": "sha512-Kk9uWpm7N+gJJEeP+g/oKoKc8bWrp/lvQ9eB7XyXAWp42V1kbXQOwGxhMOAOoQukjacB29U0Q4nHsYOImuP24Q==",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-1.3.3.tgz",
+      "integrity": "sha512-MFkB6bh11J8nKygUdqyHb9sMz17XoBRYR4tiNxnSpi/UtDk0wk8eRGa0jRSJaILgCl4xyq1TL6Jidww1OWly/Q==",
      "dev": true,
      "requires": {
        "istanbul-api": "1.2.1",
@@ -6242,11 +6255,6 @@
      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
      "dev": true
    },
-    "marked": {
-      "version": "0.3.9",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.9.tgz",
-      "integrity": "sha512-nW5u0dxpXxHfkHzzrveY45gCbi+R4PaO4WRZYqZNl+vB0hVGeqlFn0aOg1c8AKL63TrNFn9Bm2UP4AdiZ9TPLw=="
-    },
    "math-expression-evaluator": {
      "version": "1.2.17",
      "resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz",
@@ -6562,9 +6570,9 @@
      "integrity": "sha512-9pSkVg5UhXiqyclERCSRHqQiPMHl6fHnmZQwQ2tSNfeGSKX2Ykt55cLbQWo6++XgJORTUyI6z+k7fD1KGPZAmA=="
    },
    "ngx-cookie-service": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/ngx-cookie-service/-/ngx-cookie-service-1.0.9.tgz",
-      "integrity": "sha512-n4kTAZQr4EnnQLBaRPMjSmf98N/aLlYWknmbRunonJj9aMhpT1Nki6PfjBuRPl5DxT/9NMAVrQyvk66k/pJ0uQ=="
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/ngx-cookie-service/-/ngx-cookie-service-1.0.10.tgz",
+      "integrity": "sha512-TAXpQsIONAupTqkUDcH44hFQsLTvsXpxM80eKgxvy3vhBFfT1uIdR7BRhM7VpUW5J7BN9qCbGNgLN5lsnVu7pw=="
    },
    "no-case": {
      "version": "2.3.2",
@@ -6949,6 +6957,12 @@
        "wrappy": "1.0.2"
      }
    },
+    "opener": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/opener/-/opener-1.4.3.tgz",
+      "integrity": "sha1-XG2ixdflgx6P+jlklQ+NZnSskLg=",
+      "dev": true
+    },
    "opn": {
      "version": "5.1.0",
      "resolved": "https://registry.npmjs.org/opn/-/opn-5.1.0.tgz",
@@ -7047,10 +7061,13 @@
      "dev": true
    },
    "p-limit": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.1.0.tgz",
-      "integrity": "sha1-sH/y2aXYi+yAYDWJWiurZqJ5iLw=",
-      "dev": true
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.2.0.tgz",
+      "integrity": "sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng==",
+      "dev": true,
+      "requires": {
+        "p-try": "1.0.0"
+      }
    },
    "p-locate": {
      "version": "2.0.0",
@@ -7058,7 +7075,7 @@
      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
      "dev": true,
      "requires": {
-        "p-limit": "1.1.0"
+        "p-limit": "1.2.0"
      }
    },
    "p-map": {
@@ -7067,6 +7084,12 @@
      "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==",
      "dev": true
    },
+    "p-try": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+      "dev": true
+    },
    "pako": {
      "version": "1.0.6",
      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz",
@@ -7415,7 +7438,7 @@
      "dev": true,
      "requires": {
        "balanced-match": "1.0.0",
-        "postcss": "6.0.15"
+        "postcss": "6.0.16"
      },
      "dependencies": {
        "chalk": {
@@ -7441,9 +7464,9 @@
          }
        },
        "postcss": {
-          "version": "6.0.15",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.15.tgz",
-          "integrity": "sha512-v/SpyMzLbtkmh45zUdaqLAaqXqzPdSrw8p4cQVO0/w6YiYfpj4k+Wkzhn68qk9br+H+0qfddhdPEVnbmBPfXVQ==",
+          "version": "6.0.16",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.16.tgz",
+          "integrity": "sha512-m758RWPmSjFH/2MyyG3UOW1fgYbR9rtdzz5UNJnlm7OLtu4B2h9C6gi+bE4qFKghsBRFfZT8NzoQBs6JhLotoA==",
          "dev": true,
          "requires": {
            "chalk": "2.3.0",
@@ -7557,13 +7580,13 @@
      }
    },
    "postcss-loader": {
-      "version": "2.0.9",
-      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-2.0.9.tgz",
-      "integrity": "sha512-sgoXPtmgVT3aBAhU47Kig8oPF+mbXl8Unjvtz1Qj1q2D2EvSVJW2mKJNzxv5y/LvA9xWwuvdysvhc7Zn80UWWw==",
+      "version": "2.0.10",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-2.0.10.tgz",
+      "integrity": "sha512-xQaDcEgJ/2JqFY18zpFkik8vyYs7oS5ZRbrjvDqkP97k2wYWfPT4+qA0m4o3pTSCsz0u26PNqs8ZO9FRUWAqrA==",
      "dev": true,
      "requires": {
        "loader-utils": "1.1.0",
-        "postcss": "6.0.15",
+        "postcss": "6.0.16",
        "postcss-load-config": "1.2.0",
        "schema-utils": "0.3.0"
      },
@@ -7591,9 +7614,9 @@
          }
        },
        "postcss": {
-          "version": "6.0.15",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.15.tgz",
-          "integrity": "sha512-v/SpyMzLbtkmh45zUdaqLAaqXqzPdSrw8p4cQVO0/w6YiYfpj4k+Wkzhn68qk9br+H+0qfddhdPEVnbmBPfXVQ==",
+          "version": "6.0.16",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.16.tgz",
+          "integrity": "sha512-m758RWPmSjFH/2MyyG3UOW1fgYbR9rtdzz5UNJnlm7OLtu4B2h9C6gi+bE4qFKghsBRFfZT8NzoQBs6JhLotoA==",
          "dev": true,
          "requires": {
            "chalk": "2.3.0",
@@ -7708,7 +7731,7 @@
      "integrity": "sha1-thTJcgvmgW6u41+zpfqh26agXds=",
      "dev": true,
      "requires": {
-        "postcss": "6.0.15"
+        "postcss": "6.0.16"
      },
      "dependencies": {
        "chalk": {
@@ -7734,9 +7757,9 @@
          }
        },
        "postcss": {
-          "version": "6.0.15",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.15.tgz",
-          "integrity": "sha512-v/SpyMzLbtkmh45zUdaqLAaqXqzPdSrw8p4cQVO0/w6YiYfpj4k+Wkzhn68qk9br+H+0qfddhdPEVnbmBPfXVQ==",
+          "version": "6.0.16",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.16.tgz",
+          "integrity": "sha512-m758RWPmSjFH/2MyyG3UOW1fgYbR9rtdzz5UNJnlm7OLtu4B2h9C6gi+bE4qFKghsBRFfZT8NzoQBs6JhLotoA==",
          "dev": true,
          "requires": {
            "chalk": "2.3.0",
@@ -7768,7 +7791,7 @@
      "dev": true,
      "requires": {
        "css-selector-tokenizer": "0.7.0",
-        "postcss": "6.0.15"
+        "postcss": "6.0.16"
      },
      "dependencies": {
        "chalk": {
@@ -7794,9 +7817,9 @@
          }
        },
        "postcss": {
-          "version": "6.0.15",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.15.tgz",
-          "integrity": "sha512-v/SpyMzLbtkmh45zUdaqLAaqXqzPdSrw8p4cQVO0/w6YiYfpj4k+Wkzhn68qk9br+H+0qfddhdPEVnbmBPfXVQ==",
+          "version": "6.0.16",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.16.tgz",
+          "integrity": "sha512-m758RWPmSjFH/2MyyG3UOW1fgYbR9rtdzz5UNJnlm7OLtu4B2h9C6gi+bE4qFKghsBRFfZT8NzoQBs6JhLotoA==",
          "dev": true,
          "requires": {
            "chalk": "2.3.0",
@@ -7828,7 +7851,7 @@
      "dev": true,
      "requires": {
        "css-selector-tokenizer": "0.7.0",
-        "postcss": "6.0.15"
+        "postcss": "6.0.16"
      },
      "dependencies": {
        "chalk": {
@@ -7854,9 +7877,9 @@
          }
        },
        "postcss": {
-          "version": "6.0.15",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.15.tgz",
-          "integrity": "sha512-v/SpyMzLbtkmh45zUdaqLAaqXqzPdSrw8p4cQVO0/w6YiYfpj4k+Wkzhn68qk9br+H+0qfddhdPEVnbmBPfXVQ==",
+          "version": "6.0.16",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.16.tgz",
+          "integrity": "sha512-m758RWPmSjFH/2MyyG3UOW1fgYbR9rtdzz5UNJnlm7OLtu4B2h9C6gi+bE4qFKghsBRFfZT8NzoQBs6JhLotoA==",
          "dev": true,
          "requires": {
            "chalk": "2.3.0",
@@ -7888,7 +7911,7 @@
      "dev": true,
      "requires": {
        "icss-replace-symbols": "1.1.0",
-        "postcss": "6.0.15"
+        "postcss": "6.0.16"
      },
      "dependencies": {
        "chalk": {
@@ -7914,9 +7937,9 @@
          }
        },
        "postcss": {
-          "version": "6.0.15",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.15.tgz",
-          "integrity": "sha512-v/SpyMzLbtkmh45zUdaqLAaqXqzPdSrw8p4cQVO0/w6YiYfpj4k+Wkzhn68qk9br+H+0qfddhdPEVnbmBPfXVQ==",
+          "version": "6.0.16",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.16.tgz",
+          "integrity": "sha512-m758RWPmSjFH/2MyyG3UOW1fgYbR9rtdzz5UNJnlm7OLtu4B2h9C6gi+bE4qFKghsBRFfZT8NzoQBs6JhLotoA==",
          "dev": true,
          "requires": {
            "chalk": "2.3.0",
@@ -8045,7 +8068,7 @@
        "mime": "1.6.0",
        "minimatch": "3.0.4",
        "mkdirp": "0.5.1",
-        "postcss": "6.0.15",
+        "postcss": "6.0.16",
        "xxhashjs": "0.2.1"
      },
      "dependencies": {
@@ -8072,9 +8095,9 @@
          }
        },
        "postcss": {
-          "version": "6.0.15",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.15.tgz",
-          "integrity": "sha512-v/SpyMzLbtkmh45zUdaqLAaqXqzPdSrw8p4cQVO0/w6YiYfpj4k+Wkzhn68qk9br+H+0qfddhdPEVnbmBPfXVQ==",
+          "version": "6.0.16",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.16.tgz",
+          "integrity": "sha512-m758RWPmSjFH/2MyyG3UOW1fgYbR9rtdzz5UNJnlm7OLtu4B2h9C6gi+bE4qFKghsBRFfZT8NzoQBs6JhLotoA==",
          "dev": true,
          "requires": {
            "chalk": "2.3.0",
@@ -8180,7 +8203,7 @@
      "integrity": "sha1-myIXQXCaTGLVzVPGqt1UpxE36V8=",
      "dev": true,
      "requires": {
-        "@types/node": "6.0.95",
+        "@types/node": "6.0.96",
        "@types/q": "0.0.32",
        "@types/selenium-webdriver": "2.53.43",
        "blocking-proxy": "0.0.5",
@@ -9887,9 +9910,9 @@
      }
    },
    "tsickle": {
-      "version": "0.25.6",
-      "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.25.6.tgz",
-      "integrity": "sha1-tZXbFrI2chgk7u2ouyYjZbR+8zQ=",
+      "version": "0.26.0",
+      "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.26.0.tgz",
+      "integrity": "sha512-eWJ2CUfttGK0LqF9iJ/Avnxbj4M+fCyJ50Zag3wm73Fut1hsasPRHKxKdrMWVj4BMHnQNx7TO+DdNmLmJTSuNw==",
      "dev": true,
      "requires": {
        "minimist": "1.2.0",
@@ -9975,9 +9998,9 @@
      "dev": true
    },
    "uglify-js": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.4.tgz",
-      "integrity": "sha512-hfIwuAQI5dlXP30UtdmWoYF9k+ypVqBXIdmd6ZKBiaNHHvA8ty7ZloMe3+7S5AEKVkxHbjByl4DfRHQ7QpZquw==",
+      "version": "3.3.5",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.5.tgz",
+      "integrity": "sha512-ZebM2kgBL/UI9rKeAbsS2J0UPPv7SBy5hJNZml/YxB1zC6JK8IztcPs+cxilE4pu0li6vadVSFqiO7xFTKuSrg==",
      "dev": true,
      "requires": {
        "commander": "2.12.1",
@@ -10000,21 +10023,31 @@
      "optional": true
    },
    "uglifyjs-webpack-plugin": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.1.5.tgz",
-      "integrity": "sha512-YBGc9G7dv12Vjx8vUQs54DZgAXVf04LlG6dNNiEbTZjL3PbUqiY4uPB9Kv+fUJaqRskEGva/lS7sh08yJr7jnA==",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.1.6.tgz",
+      "integrity": "sha512-VUja+7rYbznEvUaeb8IxOCTUrq4BCb1ml0vffa+mfwKtrAwlqnU0ENF14DtYltV1cxd/HSuK51CCA/D/8kMQVw==",
      "dev": true,
      "requires": {
-        "cacache": "10.0.1",
+        "cacache": "10.0.2",
        "find-cache-dir": "1.0.0",
-        "schema-utils": "0.3.0",
+        "schema-utils": "0.4.3",
        "serialize-javascript": "1.4.0",
        "source-map": "0.6.1",
-        "uglify-es": "3.2.2",
+        "uglify-es": "3.3.5",
        "webpack-sources": "1.1.0",
        "worker-farm": "1.5.2"
      },
      "dependencies": {
+        "schema-utils": {
+          "version": "0.4.3",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.3.tgz",
+          "integrity": "sha512-sgv/iF/T4/SewJkaVpldKC4WjSkz0JsOh2eKtxCPpCO1oR05+7MOF+H476HVRbLArkgA7j5TRJJ4p2jdFkUGQQ==",
+          "dev": true,
+          "requires": {
+            "ajv": "5.5.2",
+            "ajv-keywords": "2.1.1"
+          }
+        },
        "source-map": {
          "version": "0.6.1",
          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -10022,9 +10055,9 @@
          "dev": true
        },
        "uglify-es": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.2.2.tgz",
-          "integrity": "sha512-l+s5VLzFwGJfS+fbqaGf/Dfwo1MF13jLOF2ekL0PytzqEqQ6cVppvHf4jquqFok+35USMpKjqkYxy6pQyUcuug==",
+          "version": "3.3.5",
+          "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.5.tgz",
+          "integrity": "sha512-7IvaFuYtfbcXm0fGb13mmRYVQdzQDXETAtvYHbCDPt2V88Y8l2HaULOyW6ueoYA0JhGIcLK7dtHkDcBWySqnBw==",
          "dev": true,
          "requires": {
            "commander": "2.12.1",
@@ -10604,6 +10637,69 @@
        }
      }
    },
+    "webpack-bundle-analyzer": {
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.9.2.tgz",
+      "integrity": "sha1-Y+2G63HMTNqG9o5oWoRTC6ASZEk=",
+      "dev": true,
+      "requires": {
+        "acorn": "5.3.0",
+        "chalk": "1.1.3",
+        "commander": "2.12.1",
+        "ejs": "2.5.7",
+        "express": "4.16.2",
+        "filesize": "3.5.11",
+        "gzip-size": "3.0.0",
+        "lodash": "4.17.4",
+        "mkdirp": "0.5.1",
+        "opener": "1.4.3",
+        "ws": "4.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
+        },
+        "ultron": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
+          "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==",
+          "dev": true
+        },
+        "ws": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-4.0.0.tgz",
+          "integrity": "sha512-QYslsH44bH8O7/W2815u5DpnCpXWpEK44FmaHffNwgJI4JMaSZONgPBTOfrxJ29mXKbXak+LsJ2uAkDTYq2ptQ==",
+          "dev": true,
+          "requires": {
+            "async-limiter": "1.0.0",
+            "safe-buffer": "5.1.1",
+            "ultron": "1.1.1"
+          }
+        }
+      }
+    },
    "webpack-core": {
      "version": "0.6.9",
      "resolved": "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.9.tgz",
@@ -10914,6 +11010,14 @@
      "dev": true,
      "requires": {
        "cuint": "0.2.2"
+      },
+      "dependencies": {
+        "cuint": {
+          "version": "0.2.2",
+          "resolved": "https://registry.npmjs.org/cuint/-/cuint-0.2.2.tgz",
+          "integrity": "sha1-QICG1AlVDCYxFVYZ6fp7ytw7mRs=",
+          "dev": true
+        }
      }
    },
    "y18n": {
@@ -10991,9 +11095,9 @@
      "dev": true
    },
    "zone.js": {
-      "version": "0.8.18",
-      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.18.tgz",
-      "integrity": "sha512-knKOBQM0oea3/x9pdyDuDi7RhxDlJhOIkeixXSiTKWLgs4LpK37iBc+1HaHwzlciHUKT172CymJFKo8Xgh+44Q=="
+      "version": "0.8.20",
+      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.20.tgz",
+      "integrity": "sha512-FXlA37ErSXCMy5RNBcGFgCI/Zivqzr0D19GuvDxhcYIJc7xkFp6c29DKyODJu0Zo+EMyur/WPPgcBh1EHjB9jA=="
    }
  }
 }
--- a/package.json
+++ b/package.json
@@ -1,80 +1,84 @@
 {
  "name": "fuse2",
-  "version": "1.3.1",
+  "version": "1.3.3",
  "license": "https://themeforest.net/licenses/terms/regular",
  "scripts": {
    "ng": "ng",
-    "start": "ng serve",
+    "start": "ng serve --open",
    "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"
+    "e2e": "ng e2e",
+    "bundle-report": "webpack-bundle-analyzer dist/stats.json"
  },
  "private": true,
  "dependencies": {
    "@agm/core": "1.0.0-beta.2",
-    "@angular/animations": "5.1.2",
-    "@angular/cdk": "5.0.2",
-    "@angular/common": "5.1.2",
-    "@angular/compiler": "5.1.2",
-    "@angular/core": "5.1.2",
+    "@angular/animations": "5.2.0",
+    "@angular/cdk": "5.0.4",
+    "@angular/common": "5.2.0",
+    "@angular/compiler": "5.2.0",
+    "@angular/core": "5.2.0",
    "@angular/flex-layout": "2.0.0-beta.12",
-    "@angular/forms": "5.1.2",
-    "@angular/http": "5.1.2",
-    "@angular/material": "5.0.2",
-    "@angular/material-moment-adapter": "5.0.2",
-    "@angular/platform-browser": "5.1.2",
-    "@angular/platform-browser-dynamic": "5.1.2",
-    "@angular/router": "5.1.2",
-    "@ngx-translate/core": "9.0.2",
-    "@swimlane/ngx-charts": "7.0.1",
-    "@swimlane/ngx-datatable": "11.1.7",
-    "@swimlane/ngx-dnd": "3.1.0",
-    "angular-calendar": "0.23.0",
-    "angular-in-memory-web-api": "0.5.2",
-    "angular2-markdown": "1.6.0",
-    "classlist.js": "1.1.20150312",
-    "core-js": "2.5.3",
-    "d3": "4.12.0",
-    "hammerjs": "2.0.8",
-    "highlight.js": "9.12.0",
-    "intl": "1.2.5",
-    "moment": "2.20.1",
+    "@angular/forms": "5.2.0",
+    "@angular/http": "5.2.0",
+    "@angular/material": "5.0.4",
+    "@angular/material-moment-adapter": "5.0.4",
+    "@angular/platform-browser": "5.2.0",
+    "@angular/platform-browser-dynamic": "5.2.0",
+    "@angular/router": "5.2.0",
    "@ngrx/effects": "4.1.1",
    "@ngrx/router-store": "4.1.1",
    "@ngrx/store": "4.1.1",
    "@ngrx/store-devtools": "4.1.1",
+    "@ngx-translate/core": "9.0.2",
+    "@swimlane/ngx-charts": "7.0.1",
+    "@swimlane/ngx-datatable": "11.1.7",
+    "@swimlane/ngx-dnd": "3.1.0",
+    "@types/prismjs": "1.9.0",
+    "angular-calendar": "0.23.2",
+    "angular-in-memory-web-api": "0.5.2",
+    "classlist.js": "1.1.20150312",
+    "core-js": "2.5.3",
+    "d3": "4.12.2",
+    "hammerjs": "2.0.8",
+    "intl": "1.2.5",
+    "moment": "2.20.1",
    "ngrx-store-freeze": "0.2.0",
    "ngx-color-picker": "5.3.0",
-    "ngx-cookie-service": "1.0.9",
+    "ngx-cookie-service": "1.0.10",
    "perfect-scrollbar": "1.3.0",
+    "prismjs": "1.9.0",
    "rxjs": "5.5.6",
    "web-animations-js": "2.3.1",
-    "zone.js": "0.8.18"
+    "zone.js": "0.8.20"
  },
  "devDependencies": {
-    "@angular/cli": "1.6.2",
-    "@angular/compiler-cli": "5.1.2",
-    "@angular/language-service": "5.1.2",
+    "@angular/cli": "1.6.3",
+    "@angular/compiler-cli": "5.2.0",
+    "@angular/language-service": "5.2.0",
    "@angularclass/hmr": "2.1.3",
    "@types/jasmine": "2.5.54",
    "@types/jasminewd2": "2.0.3",
-    "@types/node": "6.0.95",
+    "@types/node": "6.0.96",
    "codelyzer": "4.0.2",
    "jasmine-core": "2.6.4",
    "jasmine-spec-reporter": "4.1.1",
    "karma": "1.7.1",
    "karma-chrome-launcher": "2.1.1",
    "karma-cli": "1.0.1",
-    "karma-coverage-istanbul-reporter": "1.3.1",
+    "karma-coverage-istanbul-reporter": "1.3.3",
    "karma-jasmine": "1.1.1",
    "karma-jasmine-html-reporter": "0.2.2",
    "protractor": "5.1.2",
    "ts-node": "3.2.2",
    "tslint": "5.7.0",
-    "typescript": "2.4.2"
+    "typescript": "2.4.2",
+    "webpack-bundle-analyzer": "2.9.2"
  }
 }
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -7,62 +7,38 @@ import { InMemoryWebApiModule } from 'angular-in-memory-web-api';
 import 'hammerjs';
 import { SharedModule } from './core/modules/shared.module';
 import { AppComponent } from './app.component';
-import { ProjectModule } from './main/content/apps/dashboards/project/project.module';
 import { FuseFakeDbService } from './fuse-fake-db/fuse-fake-db.service';
 import { FuseMainModule } from './main/main.module';
-import { PagesModule } from './main/content/pages/pages.module';
-import { UIModule } from './main/content/ui/ui.module';
-import { ComponentsModule } from './main/content/components/components.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 { ComponentsThirdPartyModule } from './main/content/components-third-party/components-third-party.module';
-import { ServicesModule } from './main/content/services/services.module';
-import { FuseAngularMaterialModule } from './main/content/components/angular-material/angular-material.module';
-import { MarkdownModule } from 'angular2-markdown';
 import { TranslateModule } from '@ngx-translate/core';
 import { AppStoreModule } from './store/store.module';

 const appRoutes: Routes = [
    {
-        path        : 'apps/mail',
-        loadChildren: './main/content/apps/mail/mail.module#FuseMailModule'
+        path        : 'apps',
+        loadChildren: './main/content/apps/apps.module#FuseAppsModule'
    },
    {
-        path        : 'apps/mail-ngrx',
-        loadChildren: './main/content/apps/mail-ngrx/mail.module#FuseMailNgrxModule'
+        path        : 'pages',
+        loadChildren: './main/content/pages/pages.module#FusePagesModule'
    },
    {
-        path        : 'apps/chat',
-        loadChildren: './main/content/apps/chat/chat.module#FuseChatModule'
+        path        : 'ui',
+        loadChildren: './main/content/ui/ui.module#FuseUIModule'
    },
    {
-        path        : 'apps/calendar',
-        loadChildren: './main/content/apps/calendar/calendar.module#FuseCalendarModule'
+        path        : 'services',
+        loadChildren: './main/content/services/services.module#FuseServicesModule'
    },
    {
-        path        : 'apps/e-commerce',
-        loadChildren: './main/content/apps/e-commerce/e-commerce.module#FuseEcommerceModule'
+        path        : 'components',
+        loadChildren: './main/content/components/components.module#FuseComponentsModule'
    },
    {
-        path        : 'apps/academy',
-        loadChildren: './main/content/apps/academy/academy.module#FuseAcademyModule'
-    },
-    {
-        path        : 'apps/todo',
-        loadChildren: './main/content/apps/todo/todo.module#FuseTodoModule'
-    },
-    {
-        path        : 'apps/file-manager',
-        loadChildren: './main/content/apps/file-manager/file-manager.module#FuseFileManagerModule'
-    },
-    {
-        path        : 'apps/contacts',
-        loadChildren: './main/content/apps/contacts/contacts.module#FuseContactsModule'
-    },
-    {
-        path        : 'apps/scrumboard',
-        loadChildren: './main/content/apps/scrumboard/scrumboard.module#FuseScrumboardModule'
+        path        : 'components-third-party',
+        loadChildren: './main/content/components-third-party/components-third-party.module#FuseComponentsThirdPartyModule'
    },
    {
        path      : '**',
@@ -80,21 +56,13 @@ const appRoutes: Routes = [
        BrowserAnimationsModule,
        RouterModule.forRoot(appRoutes),
        SharedModule,
-        MarkdownModule.forRoot(),
        TranslateModule.forRoot(),
        InMemoryWebApiModule.forRoot(FuseFakeDbService, {
            delay             : 0,
            passThruUnknownUrl: true
        }),
        AppStoreModule,
-        FuseMainModule,
-        ProjectModule,
-        PagesModule,
-        UIModule,
-        ServicesModule,
-        ComponentsModule,
-        FuseAngularMaterialModule,
-        ComponentsThirdPartyModule
+        FuseMainModule
    ],
    providers   : [
        FuseSplashScreenService,
--- a/src/app/core/components/highlight/highlight.component.scss
+++ b/src/app/core/components/highlight/highlight.component.scss
@@ -0,0 +1,6 @@
+:host {
+    display: block;
+    padding: 8px;
+    background: #263238;
+    cursor: text;
+}
--- a/src/app/core/components/highlight/highlight.component.ts
+++ b/src/app/core/components/highlight/highlight.component.ts
@@ -0,0 +1,102 @@
+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/app/core/components/highlight/prism-languages.ts
+++ b/src/app/core/components/highlight/prism-languages.ts
@@ -0,0 +1,16 @@
+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-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/app/core/components/hljs/hljs.component.scss
+++ b/src/app/core/components/hljs/hljs.component.scss
@@ -1,3 +0,0 @@
-:host {
-
-}
--- a/src/app/core/components/hljs/hljs.component.ts
+++ b/src/app/core/components/hljs/hljs.component.ts
@@ -1,58 +0,0 @@
-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/directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive.ts
+++ b/src/app/core/directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive.ts
@@ -1,8 +1,8 @@
-import { AfterViewInit, Directive, ElementRef, OnDestroy, OnInit } from '@angular/core';
-import PerfectScrollbar from 'perfect-scrollbar';
+import { AfterViewInit, Directive, ElementRef, HostListener, OnDestroy } from '@angular/core';
 import { FuseConfigService } from '../../services/config.service';
 import { Subscription } from 'rxjs/Subscription';
 import { Platform } from '@angular/cdk/platform';
+import PerfectScrollbar from 'perfect-scrollbar';

@Directive({
    selector: '[fusePerfectScrollbar]'
@@ -13,7 +13,7 @@ export class FusePerfectScrollbarDirective implements AfterViewInit, OnDestroy
    isDisableCustomScrollbars = false;
    isMobile = false;
    isInitialized = true;
-    ps;
+    ps: PerfectScrollbar;

    constructor(
        public element: ElementRef,
@@ -62,6 +62,21 @@ export class FusePerfectScrollbarDirective implements AfterViewInit, OnDestroy
        this.ps.destroy();
    }

+    @HostListener('document:click', ['$event'])
+    documentClick(event: Event): void
+    {
+        if ( !this.isInitialized || !this.ps )
+        {
+            return;
+        }
+
+        // Update the scrollbar on document click..
+        // This isn't the most elegant solution but there is no other way
+        // of knowing when the contents of the scrollable container changes.
+        // Therefore, we update scrollbars on every document click.
+        this.ps.update();
+    }
+
    update()
    {
        if ( !this.isInitialized )
--- a/src/app/core/modules/shared.module.ts
+++ b/src/app/core/modules/shared.module.ts
@@ -15,13 +15,12 @@ import { FuseConfirmDialogComponent } from '../components/confirm-dialog/confirm
 import { FuseCountdownComponent } from '../components/countdown/countdown.component';
 import { FuseMatchMedia } from '../services/match-media.service';
 import { FuseNavbarVerticalService } from '../../main/navbar/vertical/navbar-vertical.service';
-import { FuseHljsComponent } from '../components/hljs/hljs.component';
+import { FuseHighlightComponent } from '../components/highlight/highlight.component';
 import { FusePerfectScrollbarDirective } from '../directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive';
 import { FuseIfOnDomDirective } from '../directives/fuse-if-on-dom/fuse-if-on-dom.directive';
 import { FuseMaterialColorPickerComponent } from '../components/material-color-picker/material-color-picker.component';
 import { FuseTranslationLoaderService } from '../services/translation-loader.service';
 import { CookieService } from 'ngx-cookie-service';
-import { MarkdownModule } from 'angular2-markdown';
 import { TranslateModule } from '@ngx-translate/core';

@NgModule({
@@ -30,7 +29,7 @@ import { TranslateModule } from '@ngx-translate/core';
        FuseMatSidenavTogglerDirective,
        FuseConfirmDialogComponent,
        FuseCountdownComponent,
-        FuseHljsComponent,
+        FuseHighlightComponent,
        FuseIfOnDomDirective,
        FusePerfectScrollbarDirective,
        FuseMaterialColorPickerComponent
@@ -44,8 +43,7 @@ import { TranslateModule } from '@ngx-translate/core';
        ReactiveFormsModule,
        ColorPickerModule,
        NgxDnDModule,
-        NgxDatatableModule,
-        MarkdownModule
+        NgxDatatableModule
    ],
    exports        : [
        FlexLayoutModule,
@@ -56,7 +54,7 @@ import { TranslateModule } from '@ngx-translate/core';
        FuseMatSidenavTogglerDirective,
        FusePipesModule,
        FuseCountdownComponent,
-        FuseHljsComponent,
+        FuseHighlightComponent,
        FusePerfectScrollbarDirective,
        ReactiveFormsModule,
        ColorPickerModule,
@@ -64,7 +62,6 @@ import { TranslateModule } from '@ngx-translate/core';
        NgxDatatableModule,
        FuseIfOnDomDirective,
        FuseMaterialColorPickerComponent,
-        MarkdownModule,
        TranslateModule
    ],
    entryComponents: [
--- a/src/app/core/scss/partials/_angular-material-fix.scss
+++ b/src/app/core/scss/partials/_angular-material-fix.scss
@@ -20,8 +20,8 @@
 }

 .mat-pseudo-checkbox-checked:after {
-    width: 14px;
-    height: 7px;
+    width: 14px !important;
+    height: 7px !important;
 }

 // Fix: "Input underlines has wrong color opacity value"
--- a/src/app/core/scss/partials/_cards.scss
+++ b/src/app/core/scss/partials/_cards.scss
@@ -9,145 +9,47 @@
        min-width: 0;
    }

-    .card-rich-media {
-        position: relative;
+    // Buttons
+    .mat-button {
+        min-width: 0 !important;
+        padding: 0 8px !important;
+    }

-        .card-title {
-            position: absolute;
-            right: 16px;
-            bottom: 16px;
-            left: 16px;
-            font-size: 20px;
-            color: white;
-        }
-    }
-
-    .card-media-header {
-        display: flex;
-        padding: 16px;
-        align-items: center;
-
-        &.medium {
-            align-items: flex-start;
-
-            .card-rich-media {
-                width: 120px;
-                height: 120px;
-            }
-        }
-
-        &.large {
-            align-items: flex-start;
-
-            .card-rich-media {
-                width: 160px;
-                height: 160px;
-            }
-        }
-
-        .card-primary-title {
-            padding: 0 16px 0 0;
-            flex: 1;
-        }
-
-        .card-rich-media {
-            width: 80px;
-            height: 80px;
-        }
-
-        + div {
-            padding-top: 0;
-        }
-    }
-
-    .card-avatar-header {
-        display: flex;
-        padding: 16px;
-        align-items: center;
-
-        .card-avatar {
-            width: 40px;
-            height: 40px;
-            border-radius: 100%;
-            margin-right: 16px;
-        }
-
-        .card-avatar-title {
-
-            .card-title {
-                font-size: 14px;
-                font-weight: bold;
-            }
-
-            .card-subtitle {
-                font-size: 13px;
-                font-weight: bold;
-            }
-        }
-    }
-
-    .card-primary-title {
-        padding: 16px;
-
-        .card-title {
-            font-size: 24px;
-        }
-
-        .card-subtitle {
-            font-size: 14px;
-        }
-
-        + div {
-            padding-top: 0;
-        }
-    }
-
-    .card-supporting-text {
-        padding: 16px;
-        font-size: 14px;
-        line-height: 1.75;
-
-        + div {
-            padding-top: 0;
-        }
-    }
-
-    .card-actions {
-        display: flex;
-        padding: 8px;
-
-        &.icon-buttons {
-            padding: 0 8px;
-        }
-
-        &.align-center {
-            justify-content: center;
-        }
-
-        &.align-right {
-            justify-content: flex-end;
-        }
-
-        .mat-button {
-            min-width: 0 !important;
-            padding: 0 8px !important;
-        }
-
-        .card-expander {
-            margin-left: auto;
-        }
-
-        + div {
-            padding-top: 0;
+    // 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-supporting-text {
+        .card-expanded-content {
            padding: 8px 16px 16px 16px;
-            font-size: 14px;
            line-height: 1.75;
        }
    }
--- a/src/app/core/scss/partials/_helpers.scss
+++ b/src/app/core/scss/partials/_helpers.scss
@@ -1,9 +1,59 @@
+// ######################
+// POSITION HELPERS
+// ######################
+@each $breakpoint in map-keys($grid-breakpoints) {
+
+    @include media-breakpoint-up($breakpoint) {
+
+        $infix: breakpoint-infix($breakpoint, $grid-breakpoints);
+
+        .position#{$infix}-relative {
+            position: relative;
+        }
+
+        .position#{$infix}-absolute {
+            position: absolute;
+        }
+
+        .position#{$infix}-static {
+            position: static;
+        }
+    }
+}
+
+// ####################################
+// ABSOLUTE POSITION ALIGNMENT HELPERS
+// ####################################
+@each $breakpoint in map-keys($grid-breakpoints) {
+
+    @include media-breakpoint-up($breakpoint) {
+
+        $infix: breakpoint-infix($breakpoint, $grid-breakpoints);
+
+        .align#{$infix}-top {
+            top: 0;
+        }
+
+        .align#{$infix}-right {
+            right: 0;
+        }
+
+        .align#{$infix}-bottom {
+            bottom: 0;
+        }
+
+        .align#{$infix}-left {
+            left: 0;
+        }
+    }
+}
+
 // ######################
 // SIZE HELPERS
 // ######################
@each $prop, $abbrev in (height: h, width: w) {

-    @for $index from 0 through 128 {
+    @for $index from 0 through 180 {
        $size: $index * 4;
        $length: #{$size}px;

@@ -28,7 +78,6 @@
 // ######################
 // SPACING HELPERS
 // ######################
-
@each $breakpoint in map-keys($grid-breakpoints) {

    @include media-breakpoint-up($breakpoint) {
@@ -83,47 +132,45 @@
            }

            @if ($abbrev == m) {
-                @for $index from 0 through 64 {
-                    $size: $index * 4;
-                    $length: #{$size}px;

-                    // Some special margin utils for flex alignments
-                    .m#{$infix}-auto {
-                        margin: auto !important;
-                    }
+                // Some special margin utils for flex alignments
+                .m#{$infix}-auto {
+                    margin: auto !important;
+                }

-                    .mt#{$infix}-auto {
-                        margin-top: auto !important;
-                    }
+                .mt#{$infix}-auto {
+                    margin-top: auto !important;
+                }

-                    .mr#{$infix}-auto {
-                        margin-right: auto !important;
-                    }
+                .mr#{$infix}-auto {
+                    margin-right: auto !important;
+                }

-                    .mb#{$infix}-auto {
-                        margin-bottom: auto !important;
-                    }
+                .mb#{$infix}-auto {
+                    margin-bottom: auto !important;
+                }

-                    .ml#{$infix}-auto {
-                        margin-left: auto !important;
-                    }
+                .ml#{$infix}-auto {
+                    margin-left: auto !important;
+                }

-                    .mx#{$infix}-auto {
-                        margin-right: auto !important;
-                        margin-left: auto !important;
-                    }
+                .mx#{$infix}-auto {
+                    margin-right: auto !important;
+                    margin-left: auto !important;
+                }

-                    .my#{$infix}-auto {
-                        margin-top: auto !important;
-                        margin-bottom: auto !important;
-                    }
+                .my#{$infix}-auto {
+                    margin-top: auto !important;
+                    margin-bottom: auto !important;
                }
            }
        }
    }
 }

-// Border helpers
+// ######################
+// BORDER HELPERS
+// ######################
 $border-style: 1px solid rgba(0, 0, 0, 0.12);

 .border,
@@ -162,3 +209,10 @@ $border-style: 1px solid rgba(0, 0, 0, 0.12);
    border-top: $border-style;
    border-bottom: $border-style;
 }
+
+// ######################
+// BORDER RADIUS HELPERS
+// ######################
+.border-radius-100 {
+    border-radius: 100%;
+}
--- a/src/app/core/scss/partials/_material.scss
+++ b/src/app/core/scss/partials/_material.scss
@@ -411,7 +411,6 @@ table {
                    color: rgba(0, 0, 0, 0.54);
                    border-bottom: 1px solid rgba(0, 0, 0, 0.12);
                    white-space: nowrap;
-                    min-width: 120px;

                    &:first-child {
                        padding-left: 24px;
--- a/src/app/core/scss/partials/_typography.scss
+++ b/src/app/core/scss/partials/_typography.scss
@@ -229,6 +229,22 @@ strong {
    }
 }

+.line-height-1 {
+    line-height: 1;
+}
+
+.line-height-1\.25 {
+    line-height: 1.25;
+}
+
+.line-height-1\.50 {
+    line-height: 1.5;
+}
+
+.line-height-1\.75 {
+    line-height: 1.75;
+}
+
 // Boxed text
 .text-boxed {
    border-radius: 2px;
--- a/src/app/core/scss/partials/plugins/_highlight.scss
+++ b/src/app/core/scss/partials/plugins/_highlight.scss
@@ -1,124 +0,0 @@
-/*
-
-github.com style (c) Vasily Polovnyov <vast@whiteants.net>
-
-*/
-
-hljs,
-[hljs] {
-    display: block;
-    overflow-x: auto;
-    //    padding: 0.5em;
-    color: #333;
-    background: #F8F8F8;
-    -webkit-text-size-adjust: none;
-}
-
-.hljs-comment,
-.diff .hljs-header {
-    color: #998;
-    font-style: italic;
-}
-
-.hljs-keyword,
-.css .rule .hljs-keyword,
-.hljs-winutils,
-.nginx .hljs-title,
-.hljs-subst,
-.hljs-request,
-.hljs-status {
-    color: #333;
-    font-weight: bold;
-}
-
-.hljs-number,
-.hljs-hexcolor,
-.ruby .hljs-constant {
-    color: #008080;
-}
-
-.hljs-string,
-.hljs-tag .hljs-value,
-.hljs-doctag,
-.tex .hljs-formula {
-    color: #D14;
-}
-
-.hljs-title,
-.hljs-id,
-.scss .hljs-preprocessor {
-    color: #900;
-    font-weight: bold;
-}
-
-.hljs-list .hljs-keyword,
-.hljs-subst {
-    font-weight: normal;
-}
-
-.hljs-class .hljs-title,
-.hljs-type,
-.vhdl .hljs-literal,
-.tex .hljs-command {
-    color: #458;
-    font-weight: bold;
-}
-
-.hljs-tag,
-.hljs-tag .hljs-title,
-.hljs-rule .hljs-property,
-.django .hljs-tag .hljs-keyword {
-    color: #000080;
-    font-weight: normal;
-}
-
-.hljs-attribute,
-.hljs-variable,
-.lisp .hljs-body,
-.hljs-name {
-    color: #008080;
-}
-
-.hljs-regexp {
-    color: #009926;
-}
-
-.hljs-symbol,
-.ruby .hljs-symbol .hljs-string,
-.lisp .hljs-keyword,
-.clojure .hljs-keyword,
-.scheme .hljs-keyword,
-.tex .hljs-special,
-.hljs-prompt {
-    color: #990073;
-}
-
-.hljs-built_in {
-    color: #0086B3;
-}
-
-.hljs-preprocessor,
-.hljs-pragma,
-.hljs-pi,
-.hljs-doctype,
-.hljs-shebang,
-.hljs-cdata {
-    color: #999;
-    font-weight: bold;
-}
-
-.hljs-deletion {
-    background: #FDD;
-}
-
-.hljs-addition {
-    background: #DFD;
-}
-
-.diff .hljs-change {
-    background: #0086B3;
-}
-
-.hljs-chunk {
-    color: #AAA;
-}
--- a/src/app/core/scss/partials/plugins/_plugins.scss
+++ b/src/app/core/scss/partials/plugins/_plugins.scss
@@ -1,4 +1,3 @@
-@import "highlight";
@import "prism";
@import "perfect-scrollbar";
@import "ngx-datatable";
--- a/src/app/core/scss/partials/plugins/_prism.scss
+++ b/src/app/core/scss/partials/plugins/_prism.scss
@@ -2,7 +2,7 @@

 $base00: #263238;
 $base01: #2C393F;
-$base02: #37474F;
+$base02: #62727A;
 $base03: #707880;
 $base04: #C9CCD3;
 $base05: #CDD3DE;
--- a/src/app/main/content/apps/apps.module.ts
+++ b/src/app/main/content/apps/apps.module.ts
@@ -0,0 +1,63 @@
+import { NgModule } from '@angular/core';
+import { SharedModule } from '../../../core/modules/shared.module';
+import { RouterModule } from '@angular/router';
+import { FuseAngularMaterialModule } from '../components/angular-material/angular-material.module';
+
+const routes = [
+    {
+        path        : 'dashboards/project',
+        loadChildren: './dashboards/project/project.module#FuseProjectDashboardModule'
+    },
+    {
+        path        : 'mail',
+        loadChildren: './mail/mail.module#FuseMailModule'
+    },
+    {
+        path        : 'mail-ngrx',
+        loadChildren: './mail-ngrx/mail.module#FuseMailNgrxModule'
+    },
+    {
+        path        : 'chat',
+        loadChildren: './chat/chat.module#FuseChatModule'
+    },
+    {
+        path        : 'calendar',
+        loadChildren: './calendar/calendar.module#FuseCalendarModule'
+    },
+    {
+        path        : 'e-commerce',
+        loadChildren: './e-commerce/e-commerce.module#FuseEcommerceModule'
+    },
+    {
+        path        : 'academy',
+        loadChildren: './academy/academy.module#FuseAcademyModule'
+    },
+    {
+        path        : 'todo',
+        loadChildren: './todo/todo.module#FuseTodoModule'
+    },
+    {
+        path        : 'file-manager',
+        loadChildren: './file-manager/file-manager.module#FuseFileManagerModule'
+    },
+    {
+        path        : 'contacts',
+        loadChildren: './contacts/contacts.module#FuseContactsModule'
+    },
+    {
+        path        : 'scrumboard',
+        loadChildren: './scrumboard/scrumboard.module#FuseScrumboardModule'
+    }
+];
+
+@NgModule({
+    imports     : [
+        SharedModule,
+        RouterModule.forChild(routes),
+        FuseAngularMaterialModule
+    ],
+    declarations: []
+})
+export class FuseAppsModule
+{
+}
--- a/src/app/main/content/apps/calendar/calendar.component.ts
+++ b/src/app/main/content/apps/calendar/calendar.component.ts
@@ -25,21 +25,13 @@ import { fuseAnimations } from '../../../../core/animations';
 export class FuseCalendarComponent implements OnInit
 {
    view: string;
-
    viewDate: Date;
-
    events: CalendarEvent[];
-
    public actions: CalendarEventAction[];
-
    activeDayIsOpen: boolean;
-
    refresh: Subject<any> = new Subject();
-
    dialogRef: any;
-
    confirmDialogRef: MatDialogRef<FuseConfirmDialogComponent>;
-
    selectedDay: any;

    constructor(
--- a/src/app/main/content/apps/contacts/sidenavs/main/main.component.ts
+++ b/src/app/main/content/apps/contacts/sidenavs/main/main.component.ts
@@ -1,26 +1,25 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnDestroy } from '@angular/core';
 import { ContactsService } from '../../contacts.service';
+import { Subscription } from 'rxjs/Subscription';

@Component({
    selector   : 'fuse-contacts-main-sidenav',
    templateUrl: './main.component.html',
    styleUrls  : ['./main.component.scss']
 })
-export class FuseContactsMainSidenavComponent implements OnInit
+export class FuseContactsMainSidenavComponent implements OnDestroy
 {
    user: any;
    filterBy: string;
+    onUserDataChangedSubscription: Subscription;

    constructor(private contactsService: ContactsService)
    {
-        this.filterBy = 'all';
-        this.contactsService.onUserDataChanged.subscribe(user => {
-            this.user = user;
-        });
-    }
-
-    ngOnInit()
-    {
+        this.filterBy = this.contactsService.filterBy || 'all';
+        this.onUserDataChangedSubscription =
+            this.contactsService.onUserDataChanged.subscribe(user => {
+                this.user = user;
+            });
    }

    changeFilter(filter)
@@ -28,4 +27,9 @@ export class FuseContactsMainSidenavComponent implements OnInit
        this.filterBy = filter;
        this.contactsService.onFilterChanged.next(this.filterBy);
    }
+
+    ngOnDestroy()
+    {
+        this.onUserDataChangedSubscription.unsubscribe();
+    }
 }
--- a/src/app/main/content/apps/dashboards/project/project.module.ts
+++ b/src/app/main/content/apps/dashboards/project/project.module.ts
@@ -8,7 +8,7 @@ import { NgxChartsModule } from '@swimlane/ngx-charts';

 const routes: Routes = [
    {
-        path     : 'apps/dashboards/project',
+        path     : '**',
        component: FuseProjectComponent,
        resolve  : {
            data: ProjectsDashboardService
@@ -30,7 +30,7 @@ const routes: Routes = [
        ProjectsDashboardService
    ]
 })
-export class ProjectModule
+export class FuseProjectDashboardModule
 {
 }

--- a/src/app/main/content/apps/mail-ngrx/mail.component.ts
+++ b/src/app/main/content/apps/mail-ngrx/mail.component.ts
@@ -7,6 +7,8 @@ import { locale as english } from './i18n/en';
 import { locale as turkish } from './i18n/tr';
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs/Observable';
+import 'rxjs/add/operator/debounceTime';
+import 'rxjs/add/operator/distinctUntilChanged';
 import * as fromStore from './store';
 import { FuseConfigService } from '../../../../core/services/config.service';

--- a/src/app/main/content/apps/mail-ngrx/store/effects/mails.effects.ts
+++ b/src/app/main/content/apps/mail-ngrx/store/effects/mails.effects.ts
@@ -4,6 +4,7 @@ import { Actions, Effect } from '@ngrx/effects';
 import { Observable } from 'rxjs/Observable';
 import { of } from 'rxjs/observable/of';
 import { map, mergeMap, exhaustMap, withLatestFrom } from 'rxjs/operators';
+import 'rxjs/add/operator/debounceTime';
 import { getRouterState, State } from '../../../../../../store/reducers';
 import { getMailsState } from '../selectors';
 import * as MailsActions from '../actions/mails.actions';
--- a/src/app/main/content/apps/todo/todo-list/todo-list-item/todo-list-item.component.scss
+++ b/src/app/main/content/apps/todo/todo-list/todo-list-item/todo-list-item.component.scss
@@ -10,13 +10,6 @@
    flex-shrink: 0;
    background: #FFFFFF;

-    &.todo-item-placeholder {
-        background: rgba(0, 0, 0, 0.12);
-        * {
-            opacity: 0;
-        }
-    }
-
    .handle {
        height: 48px;
        line-height: 48px;
--- a/src/app/main/content/components-third-party/components-third-party.module.ts
+++ b/src/app/main/content/components-third-party/components-third-party.module.ts
@@ -6,7 +6,7 @@ import { GoogleMapsModule } from './google-maps/google-maps.module';

 const routes = [
    {
-        path     : 'components-third-party/datatables/ngx-datatable',
+        path     : 'datatables/ngx-datatable',
        component: FuseNgxDatatableComponent
    }
 ];
@@ -21,6 +21,6 @@ const routes = [
        FuseNgxDatatableComponent
    ]
 })
-export class ComponentsThirdPartyModule
+export class FuseComponentsThirdPartyModule
 {
 }
--- a/src/app/main/content/components-third-party/google-maps/google-maps.component.html
+++ b/src/app/main/content/components-third-party/google-maps/google-maps.component.html
@@ -38,13 +38,13 @@
        <div class="my-48">
            <h2>Usage</h2>
            <p class="mat-grey-200-bg py-8">
-                <fuse-hljs lang="html" class="source-code">
-                    <textarea #source hidden="hidden">
+                <fuse-highlight lang="html">
+                    <textarea #source>
                        <agm-map [latitude]="lat" [longitude]="lng">
                            <agm-marker [latitude]="lat" [longitude]="lng"></agm-marker>
                        </agm-map>
                    </textarea>
-                </fuse-hljs>
+                </fuse-highlight>
            </p>
        </div>

--- a/src/app/main/content/components-third-party/google-maps/google-maps.module.ts
+++ b/src/app/main/content/components-third-party/google-maps/google-maps.module.ts
@@ -6,7 +6,7 @@ import { AgmCoreModule } from '@agm/core';

 const routes = [
    {
-        path     : 'components-third-party/google-maps',
+        path     : 'google-maps',
        component: FuseGoogleMapsDocsComponent
    }
 ];
--- a/src/app/main/content/components/angular-material/angular-material.module.ts
+++ b/src/app/main/content/components/angular-material/angular-material.module.ts
@@ -8,7 +8,7 @@ import { FuseAngularMaterialComponent } from './angular-material.component';

 const routes: Routes = [
    {
-        path    : 'components/angular-material',
+        path    : 'angular-material',
        children: [
            {
                path     : ':id',
--- a/src/app/main/content/components/angular-material/example-viewer/example-viewer.html
+++ b/src/app/main/content/components/angular-material/example-viewer/example-viewer.html
@@ -7,9 +7,11 @@
        <button mat-icon-button type="button" (click)="toggleSourceView()"
                [matTooltip]="'View source'">
            <mat-icon>
-                <svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 24 24" fit="" preserveAspectRatio="xMidYMid meet" focusable="false">
+                <svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 24 24" fit=""
+                     preserveAspectRatio="xMidYMid meet" focusable="false">
                    <path fill="none" d="M0 0h24v24H0V0z"></path>
-                    <path d="M9.4 16.6L4.8 12l4.6-4.6L8 6l-6 6 6 6 1.4-1.4zm5.2 0l4.6-4.6-4.6-4.6L16 6l6 6-6 6-1.4-1.4z"></path>
+                    <path
+                        d="M9.4 16.6L4.8 12l4.6-4.6L8 6l-6 6 6 6 1.4-1.4zm5.2 0l4.6-4.6-4.6-4.6L16 6l6 6-6 6-1.4-1.4z"></path>
                </svg>
            </mat-icon>
        </button>
@@ -23,29 +25,40 @@
            <mat-tab label="CSS"></mat-tab>
        </mat-tab-group>
        <div class="tab-content">
-            <section class="tab" *ngIf="selectedIndex === 0" [@animate]="{value:'*',params:{opacity:'0',duration:'200ms'}}">
+            <section class="tab" *ngIf="selectedIndex === 0"
+                     [@animate]="{value:'*',params:{opacity:'0',duration:'200ms'}}">
                <button mat-icon-button type="button" class="example-source-copy"
                        title="Copy example source" aria-label="Copy example source to clipboard"
                        (click)="copySource(htmlView.el.nativeElement.innerText)">
                    <mat-icon>content_copy</mat-icon>
                </button>
-                <div Markdown #htmlView class="example-source" [path]="'/assets/angular-material-examples/'+example+'/'+example+'-example.html'"></div>
+                <fuse-highlight lang="html"
+                                [path]="'/assets/angular-material-examples/'+example+'/'+example+'-example.html'">
+                </fuse-highlight>
            </section>
-            <section class="tab" *ngIf="selectedIndex === 1" [@animate]="{value:'*',params:{opacity:'0',duration:'200ms'}}">
+
+            <section class="tab" *ngIf="selectedIndex === 1"
+                     [@animate]="{value:'*',params:{opacity:'0',duration:'200ms'}}">
                <button mat-icon-button type="button" class="example-source-copy"
                        title="Copy example source" aria-label="Copy example source to clipboard"
                        (click)="copySource(tsView.el.nativeElement.innerText)">
                    <mat-icon>content_copy</mat-icon>
                </button>
-                <div Markdown #tsView class="example-source" [path]="'/assets/angular-material-examples/'+example+'/'+example+'-example.ts'"></div>
+                <fuse-highlight lang="typescript"
+                                [path]="'/assets/angular-material-examples/'+example+'/'+example+'-example.ts'">
+                </fuse-highlight>
            </section>
-            <section class="tab" *ngIf="selectedIndex === 2" [@animate]="{value:'*',params:{opacity:'0',duration:'200ms'}}">
+
+            <section class="tab" *ngIf="selectedIndex === 2"
+                     [@animate]="{value:'*',params:{opacity:'0',duration:'200ms'}}">
                <button mat-icon-button type="button" class="example-source-copy"
                        title="Copy example source" aria-label="Copy example source to clipboard"
                        (click)="copySource(cssView.el.nativeElement.innerText)">
                    <mat-icon>content_copy</mat-icon>
                </button>
-                <div Markdown #cssView class="example-source" [path]="'/assets/angular-material-examples/'+example+'/'+example+'-example.css'"></div>
+                <fuse-highlight lang="css"
+                                [path]="'/assets/angular-material-examples/'+example+'/'+example+'-example.css'">
+                </fuse-highlight>
            </section>
        </div>
    </div>
--- a/src/app/main/content/components/cards/cards.component.html
+++ b/src/app/main/content/components/cards/cards.component.html
--- a/src/app/main/content/components/cards/cards.component.scss
+++ b/src/app/main/content/components/cards/cards.component.scss
@@ -4,25 +4,49 @@

    .content {

-        .card-row {
+        .cards {
            display: flex;
-            width: 100%;
-            padding: 24px 24px 48px 24px;
-            margin-bottom: 24px;
-            border-bottom: 1px solid rgba(0, 0, 0, 0.12);
+            flex-direction: row;
+            flex-wrap: wrap;
+            justify-content: flex-start;
+            align-items: flex-start;

-            .card-preview {
+            .card {
                display: flex;
-                min-width: 320px;
+                padding: 24px 24px 48px 24px;
+                margin-bottom: 96px;
+
+                .card-preview {
+                    display: flex;
+                    min-width: 320px;
+                }
+
+                .card-source {
+                    display: none;
+                }
            }
+        }

-            .card-source {
-                display: flex;
-                flex: 1;
-                max-height: 400px;
-                overflow: auto;
-                min-width: 400px;
-                margin-left: 24px;
+        &.source {
+
+            .cards {
+                flex-direction: column;
+
+                .card {
+                    width: 100%;
+                    margin-bottom: 24px;
+                    border-bottom: 1px solid rgba(0, 0, 0, 0.12);
+
+                    .card-source {
+                        background: #263238;
+                        display: flex !important;
+                        flex: 1;
+                        max-height: 400px;
+                        overflow: auto;
+                        min-width: 400px;
+                        margin-left: 24px;
+                    }
+                }
            }
        }
    }
--- a/src/app/main/content/components/cards/cards.component.ts
+++ b/src/app/main/content/components/cards/cards.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+import * as shape from 'd3-shape';
 import { fuseAnimations } from '../../../../core/animations';

@Component({
@@ -9,11 +10,207 @@ import { fuseAnimations } from '../../../../core/animations';
 })
 export class FuseCardsDocsComponent
 {
+    view = 'preview';
+
+    // Card 9
    card9Expanded = false;
+
+    // Card 10
    card10Expanded = false;

+    // Card 19
+    card19 = {
+        scheme: {
+            domain: ['#5c84f1']
+        },
+        data  : [
+            {
+                'name'  : 'GOOG',
+                'series': [
+                    {
+                        'name' : 'Jan 1',
+                        'value': 540.2
+                    },
+                    {
+                        'name' : 'Jan 2',
+                        'value': 539.4
+                    },
+                    {
+                        'name' : 'Jan 3',
+                        'value': 538.9
+                    },
+                    {
+                        'name' : 'Jan 4',
+                        'value': 539.6
+                    },
+                    {
+                        'name' : 'Jan 5',
+                        'value': 540
+                    },
+                    {
+                        'name' : 'Jan 6',
+                        'value': 540.2
+                    },
+                    {
+                        'name' : 'Jan 7',
+                        'value': 540.48
+                    }
+                ]
+            }
+        ],
+        curve         : shape.curveBasis
+    };
+
+    // Card 24
+    card24 = {
+        scheme : {
+            domain: ['#4867d2', '#5c84f1', '#89a9f4']
+        },
+        devices: [
+            {
+                'name'  : 'Desktop',
+                'value' : 92.8,
+                'change': -0.6
+            },
+            {
+                'name'  : 'Mobile',
+                'value' : 6.1,
+                'change': 0.7
+            },
+            {
+                'name'  : 'Tablet',
+                'value' : 1.1,
+                'change': 0.1
+            }
+        ]
+    };
+
+    // Card 25
+    card25 = {
+        scheme: {
+            domain: ['#5c84f1']
+        },
+        data  : [
+            {
+                'name' : 'Monday',
+                'value': 221
+            },
+            {
+                'name' : 'Tuesday',
+                'value': 428
+            },
+            {
+                'name' : 'Wednesday',
+                'value': 492
+            },
+            {
+                'name' : 'Thursday',
+                'value': 471
+            },
+            {
+                'name' : 'Friday',
+                'value': 413
+            },
+            {
+                'name' : 'Saturday',
+                'value': 344
+            },
+            {
+                'name' : 'Sunday',
+                'value': 294
+            }
+        ]
+    };
+
+    // Card 26
+    card26 = {
+        scheme: {
+            domain: ['#5c84f1']
+        },
+        data  : [
+            {
+                'name'  : 'Impressions',
+                'series': [
+                    {
+                        'name' : 'Jan 1',
+                        'value': 670000
+                    },
+                    {
+                        'name' : 'Jan 2',
+                        'value': 540000
+                    },
+                    {
+                        'name' : 'Jan 3',
+                        'value': 820000
+                    },
+                    {
+                        'name' : 'Jan 4',
+                        'value': 570000
+                    },
+                    {
+                        'name' : 'Jan 5',
+                        'value': 720000
+                    },
+                    {
+                        'name' : 'Jan 6',
+                        'value': 570000
+                    },
+                    {
+                        'name' : 'Jan 7',
+                        'value': 870000
+                    },
+                    {
+                        'name' : 'Jan 8',
+                        'value': 720000
+                    },
+                    {
+                        'name' : 'Jan 9',
+                        'value': 890000
+                    },
+                    {
+                        'name' : 'Jan 10',
+                        'value': 987000
+                    },
+                    {
+                        'name' : 'Jan 11',
+                        'value': 1120000
+                    },
+                    {
+                        'name' : 'Jan 12',
+                        'value': 1360000
+                    },
+                    {
+                        'name' : 'Jan 13',
+                        'value': 1100000
+                    },
+                    {
+                        'name' : 'Jan 14',
+                        'value': 1490000
+                    },
+                    {
+                        'name' : 'Jan 15',
+                        'value': 980000
+                    }
+                ]
+            }
+        ],
+        curve         : shape.curveBasis
+    };
+
    constructor()
    {

    }
+
+    toggleView()
+    {
+        if ( this.view === 'preview' )
+        {
+            this.view = 'source';
+        }
+        else
+        {
+            this.view = 'preview';
+        }
+    }
 }
--- a/src/app/main/content/components/components.module.ts
+++ b/src/app/main/content/components/components.module.ts
@@ -3,50 +3,52 @@ import { SharedModule } from '../../../core/modules/shared.module';
 import { RouterModule } from '@angular/router';
 import { FuseCardsDocsComponent } from './cards/cards.component';
 import { FuseCountdownDocsComponent } from './countdown/countdown.component';
-import { FuseHljsDocsComponent } from './hljs/hljs.component';
+import { FuseHighlightDocsComponent } from './highlight/highlight.component';
 import { FuseMaterialColorPickerDocsComponent } from './material-color-picker/material-color-picker.component';
 import { FuseMultiLanguageDocsComponent } from './multi-language/multi-language.component';
 import { FuseNavigationDocsComponent } from './navigation/navigation.component';
+import { FuseSearchBarDocsComponent } from './search-bar/search-bar.component';
 import { FuseShortcutsDocsComponent } from './shortcuts/shortcuts.component';
-import { FuseSearchBarDocsComponent } from 'app/main/content/components/search-bar/search-bar.component';
 import { FuseWidgetDocsComponent } from './widget/widget.component';
 import { FuseWidgetModule } from '../../../core/components/widget/widget.module';
+import { FuseAngularMaterialModule } from './angular-material/angular-material.module';
+import { NgxChartsModule } from '@swimlane/ngx-charts';

 const routes = [
    {
-        path     : 'components/cards',
+        path     : 'cards',
        component: FuseCardsDocsComponent
    },
    {
-        path     : 'components/countdown',
+        path     : 'countdown',
        component: FuseCountdownDocsComponent
    },
    {
-        path     : 'components/highlightjs',
-        component: FuseHljsDocsComponent
+        path     : 'highlight',
+        component: FuseHighlightDocsComponent
    },
    {
-        path     : 'components/material-color-picker',
+        path     : 'material-color-picker',
        component: FuseMaterialColorPickerDocsComponent
    },
    {
-        path     : 'components/multi-language',
+        path     : 'multi-language',
        component: FuseMultiLanguageDocsComponent
    },
    {
-        path     : 'components/navigation',
+        path     : 'navigation',
        component: FuseNavigationDocsComponent
    },
    {
-        path     : 'components/search-bar',
+        path     : 'search-bar',
        component: FuseSearchBarDocsComponent
    },
    {
-        path     : 'components/shortcuts',
+        path     : 'shortcuts',
        component: FuseShortcutsDocsComponent
    },
    {
-        path     : 'components/widget',
+        path     : 'widget',
        component: FuseWidgetDocsComponent
    }
 ];
@@ -55,12 +57,14 @@ const routes = [
    imports     : [
        SharedModule,
        RouterModule.forChild(routes),
-        FuseWidgetModule
+        FuseWidgetModule,
+        FuseAngularMaterialModule,
+        NgxChartsModule
    ],
    declarations: [
        FuseCardsDocsComponent,
        FuseCountdownDocsComponent,
-        FuseHljsDocsComponent,
+        FuseHighlightDocsComponent,
        FuseMaterialColorPickerDocsComponent,
        FuseMultiLanguageDocsComponent,
        FuseNavigationDocsComponent,
@@ -69,6 +73,6 @@ const routes = [
        FuseWidgetDocsComponent
    ]
 })
-export class ComponentsModule
+export class FuseComponentsModule
 {
 }
--- a/src/app/main/content/components/countdown/countdown.component.html
+++ b/src/app/main/content/components/countdown/countdown.component.html
@@ -29,12 +29,12 @@

        <div class="my-48">
            <h2>Usage</h2>
-            <p class="mat-grey-200-bg py-8">
-                <fuse-hljs lang="html" class="source-code">
-                    <textarea #source hidden="hidden">
+            <p class="py-8">
+                <fuse-highlight lang="html">
+                    <textarea #source>
                        <fuse-countdown eventDate="2019-07-28"></fuse-countdown>
                    </textarea>
-                </fuse-hljs>
+                </fuse-highlight>
            </p>
        </div>

--- a/src/app/main/content/components/highlight/highlight.component.html
+++ b/src/app/main/content/components/highlight/highlight.component.html
@@ -1,4 +1,4 @@
-<div id="hljs" class="page-layout simple fullwidth" fusePerfectScrollbar>
+<div id="highlight" class="page-layout simple fullwidth" fusePerfectScrollbar>

    <!-- HEADER -->
    <div class="header mat-accent-bg p-24 h-160" fxLayout="row" fxLayoutAlign="start center">
@@ -8,7 +8,7 @@
                <mat-icon class="secondary-text s-16">chevron_right</mat-icon>
                <span class="secondary-text">Components</span>
            </div>
-            <div class="h2 mt-16">highlight.js</div>
+            <div class="h2 mt-16">Highlight</div>
        </div>
    </div>
    <!-- / HEADER -->
@@ -17,36 +17,42 @@
    <div class="content p-24">

        <p>
-            <code>fuse-hljs</code> is a custom built Fuse component allows to show syntax highlighted codes.
+            <code>fuse-highlight</code> is a custom built Fuse component allows to show syntax highlighted codes.
        </p>

        <div class="my-48">
            <h2>Sample</h2>
            <p fxLayout="row" fxLayoutAlign="start start">
-                <fuse-hljs lang="html" class="source-code">
-                    <textarea #source hidden="hidden">
+
+                <fuse-highlight lang="html">
+                    <textarea #source>
+
                        <div class="title">
                            <span>Example Title</span>
                        </div>
+
                    </textarea>
-                </fuse-hljs>
+                </fuse-highlight>
+
            </p>
        </div>

        <div class="my-48">
            <h2>Usage</h2>
            <p class="mat-grey-200-bg py-8">
-                <fuse-hljs lang="html" class="source-code">
-                    <textarea #source hidden="hidden">
-&lt;fuse-hljs lang="html" class="source-code"&gt;
-    &lt;textarea #source hidden="hidden"&gt;
+                <fuse-highlight lang="html">
+                    <textarea #source>
+
+&lt;fuse-highlight lang="html"&gt;
+    &lt;textarea #source&gt;
        &lt;div class="title"&gt;
            &lt;span&gt;Example Title&lt;/span&gt;
        &lt;/div&gt;
    &lt;/textarea&gt;
-&lt;/fuse-hljs&gt;
+&lt;/fuse-highlight&gt;
+
                    </textarea>
-                </fuse-hljs>
+                </fuse-highlight>
            </p>
        </div>

@@ -55,7 +61,7 @@
            <p class="py-8" fxLayout="row" fxLayoutAlign="start center">
                <code class="mr-16">lang</code>
                <span>
-                    Language of the code to be highlighted. All highlight.js languages can be used.
+                    Language of the code to be highlighted.
                </span>
            </p>
        </div>
--- a/src/app/main/content/components/highlight/highlight.component.scss
+++ b/src/app/main/content/components/highlight/highlight.component.scss
--- a/src/app/main/content/components/highlight/highlight.component.ts
+++ b/src/app/main/content/components/highlight/highlight.component.ts
@@ -0,0 +1,14 @@
+import { Component } from '@angular/core';
+
+@Component({
+    selector   : 'fuse-highlight-docs',
+    templateUrl: './highlight.component.html',
+    styleUrls  : ['./highlight.component.scss']
+})
+export class FuseHighlightDocsComponent
+{
+    constructor()
+    {
+
+    }
+}
--- a/src/app/main/content/components/hljs/hljs.component.ts
+++ b/src/app/main/content/components/hljs/hljs.component.ts
@@ -1,14 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-    selector   : 'fuse-hljs-docs',
-    templateUrl: './hljs.component.html',
-    styleUrls  : ['./hljs.component.scss']
-})
-export class FuseHljsDocsComponent
-{
-    constructor()
-    {
-
-    }
-}
--- a/src/app/main/content/components/material-color-picker/material-color-picker.component.html
+++ b/src/app/main/content/components/material-color-picker/material-color-picker.component.html
@@ -30,14 +30,14 @@

        <div class="my-48">
            <h2>Usage</h2>
-            <p class="mat-grey-200-bg py-8">
-                <fuse-hljs lang="html" class="source-code">
-                    <textarea #source hidden="hidden">
+            <p class="py-8">
+                <fuse-highlight lang="html">
+                    <textarea #source>
                        <fuse-material-color-picker [(selectedClass)]="colorClass"
                                                    (onValueChange)="onSettingsChange()">
                        </fuse-material-color-picker>
                    </textarea>
-                </fuse-hljs>
+                </fuse-highlight>
            </p>
        </div>

--- a/src/app/main/content/components/multi-language/multi-language.component.html
+++ b/src/app/main/content/components/multi-language/multi-language.component.html
@@ -41,9 +41,9 @@
                translation data:
            </p>

-            <p class="mat-grey-200-bg py-8">
-                <fuse-hljs lang="ts" class="source-code">
-                    <textarea #source hidden="hidden">
+            <p class="py-8">
+                <fuse-highlight lang="typescript">
+                    <textarea #source>
                        // i18n/en.ts
                        export const locale = {
                            lang: 'en',
@@ -64,7 +64,7 @@
                            }
                        };
                    </textarea>
-                </fuse-hljs>
+                </fuse-highlight>
            </p>
        </div>

@@ -75,9 +75,9 @@
                <code>mail.component.ts</code> file:
            </p>

-            <p class="mat-grey-200-bg py-8">
-                <fuse-hljs lang="ts" class="source-code">
-                    <textarea #source hidden="hidden">
+            <p class="py-8">
+                <fuse-highlight lang="typescript">
+                    <textarea #source>
                        // Your imports
                        import { ... } from '..';

@@ -100,7 +100,7 @@
                            ...
                        }
                    </textarea>
-                </fuse-hljs>
+                </fuse-highlight>
            </p>
        </div>

@@ -110,9 +110,9 @@
                Changing the current language can happen instantly. Simply call the <code>use</code> method from the
                translate service:
            </p>
-            <p class="mat-grey-200-bg py-8">
-                <fuse-hljs lang="ts" class="source-code">
-                    <textarea #source hidden="hidden">
+            <p class="py-8">
+                <fuse-highlight lang="typescript">
+                    <textarea #source>
                        import { TranslateService } from '@ngx-translate/core';

                        constructor(private translate: TranslateService) {}
@@ -123,7 +123,7 @@
                            this.translate.use('tr');
                        }
                    </textarea>
-                </fuse-hljs>
+                </fuse-highlight>
            </p>
            <p>
                More detailed usage of the translation service can be found in the <code>toolbar.component.ts</code>
--- a/src/app/main/content/components/navigation/navigation.component.html
+++ b/src/app/main/content/components/navigation/navigation.component.html
@@ -23,12 +23,12 @@

        <div class="my-48">
            <h2>Usage</h2>
-            <p class="mat-grey-200-bg py-8">
-                <fuse-hljs lang="html" class="source-code">
-                    <textarea #source hidden="hidden">
+            <p class="py-8">
+                <fuse-highlight lang="html">
+                    <textarea #source>
                        <fuse-navigation></fuse-navigation>
                    </textarea>
-                </fuse-hljs>
+                </fuse-highlight>
            </p>
        </div>

@@ -49,9 +49,9 @@

        <div class="my-48">
            <h3>Grouping</h3>
-            <p class="mat-grey-200-bg py-8">
-                <fuse-hljs lang="json" class="source-code">
-                    <textarea #source hidden="hidden">
+            <p class="py-8">
+                <fuse-highlight lang="json">
+                    <textarea #source>
                        {
                            'title'    : 'COMPONENTS',
                            'translate': 'NAV.COMPONENTS',
@@ -65,15 +65,15 @@
                            ]
                        },
                    </textarea>
-                </fuse-hljs>
+                </fuse-highlight>
            </p>
        </div>

        <div class="my-48">
            <h3>Collapsable</h3>
-            <p class="mat-grey-200-bg py-8">
-                <fuse-hljs lang="json" class="source-code">
-                    <textarea #source hidden="hidden">
+            <p class="py-8">
+                <fuse-highlight lang="json">
+                    <textarea #source>
                        {
                            'title'    : 'Datatables',
                            'translate': 'NAV.DATATABLES',
@@ -88,15 +88,15 @@
                            ]
                        },
                    </textarea>
-                </fuse-hljs>
+                </fuse-highlight>
            </p>
        </div>

        <div class="my-48">
            <h3>Item</h3>
-            <p class="mat-grey-200-bg py-8">
-                <fuse-hljs lang="json" class="source-code">
-                    <textarea #source hidden="hidden">
+            <p class="py-8">
+                <fuse-highlight lang="json">
+                    <textarea #source>
                        {
                            'title'    : 'Countdown',
                            'translate': 'NAV.COUNTDOWN',
@@ -105,7 +105,7 @@
                            'url'      : '/components/countdown'
                        },
                    </textarea>
-                </fuse-hljs>
+                </fuse-highlight>
            </p>
        </div>

@@ -132,9 +132,9 @@

            <h4>Update navigation item on-the-fly</h4>

-            <p class="mat-grey-200-bg py-8">
-                <fuse-hljs lang="ts" class="source-code">
-                    <textarea #source hidden="hidden">
+            <p class="py-8">
+                <fuse-highlight lang="typescript">
+                    <textarea #source>
                        updateMailBadge()
                        {
                            // Get the mail nav item
@@ -144,7 +144,7 @@
                            mailNavItem.badge.title = 35;
                        }
                    </textarea>
-                </fuse-hljs>
+                </fuse-highlight>
            </p>

            <div class="mt-24 mb-64">
@@ -157,9 +157,9 @@

            <h4>Add a subitem to the Calendar nav item</h4>

-            <p class="mat-grey-200-bg py-8">
-                <fuse-hljs lang="ts" class="source-code">
-                    <textarea #source hidden="hidden">
+            <p class="py-8">
+                <fuse-highlight lang="typescript">
+                    <textarea #source>
                        addSubitemToCalendar()
                        {
                            // Prepare the new nav item
@@ -174,7 +174,7 @@
                            this.navigationService.addNavigationItem('applications.calendar', newNavItem);
                        }
                    </textarea>
-                </fuse-hljs>
+                </fuse-highlight>
            </p>

            <div class="mt-24 mb-64">
@@ -187,9 +187,9 @@

            <h4>Add a nav item with custom function</h4>

-            <p class="mat-grey-200-bg py-8">
-                <fuse-hljs lang="ts" class="source-code">
-                    <textarea #source hidden="hidden">
+            <p class="py-8">
+                <fuse-highlight lang="typescript">
+                    <textarea #source>
                        addNavItemWithCustomFunction()
                        {
                            // Prepare the new nav item
@@ -209,7 +209,7 @@
                            applicationsNavItem.children.unshift(newNavItem);
                        }
                    </textarea>
-                </fuse-hljs>
+                </fuse-highlight>
            </p>

            <div class="mt-24">
--- a/src/app/main/content/components/search-bar/search-bar.component.html
+++ b/src/app/main/content/components/search-bar/search-bar.component.html
@@ -23,12 +23,12 @@

        <div class="my-48">
            <h2>Usage</h2>
-            <p class="mat-grey-200-bg py-8">
-                <fuse-hljs lang="html" class="source-code">
-                    <textarea #source hidden="hidden">
+            <p class="py-8">
+                <fuse-highlight lang="html">
+                    <textarea #source>
                        <fuse-search-bar (onInput)="search($event)"></fuse-search-bar>
                    </textarea>
-                </fuse-hljs>
+                </fuse-highlight>
            </p>
        </div>

--- a/src/app/main/content/components/shortcuts/shortcuts.component.html
+++ b/src/app/main/content/components/shortcuts/shortcuts.component.html
@@ -23,12 +23,12 @@

        <div class="my-48">
            <h2>Usage</h2>
-            <p class="mat-grey-200-bg py-8">
-                <fuse-hljs lang="html" class="source-code">
-                    <textarea #source hidden="hidden">
+            <p class="py-8">
+                <fuse-highlight lang="html">
+                    <textarea #source>
                        <fuse-shortcuts></fuse-shortcuts>
                    </textarea>
-                </fuse-hljs>
+                </fuse-highlight>
            </p>
        </div>

--- a/src/app/main/content/components/widget/widget.component.html
+++ b/src/app/main/content/components/widget/widget.component.html
@@ -62,9 +62,11 @@

        <div class="my-48">
            <h2>Usage</h2>
-            <p class="mat-grey-200-bg py-8">
-                <fuse-hljs lang="html" class="source-code">
-                    <textarea #source hidden="hidden">
+            <p class="py-8">
+
+                <fuse-highlight lang="html">
+                    <textarea #source>
+
                        <fuse-widget class="" fxLayout="column" fxFlex="100" fxFlex.gt-xs="50" fxFlex.gt-md="25">

                            <!-- Front -->
@@ -97,8 +99,10 @@
                            <!-- / Back -->

                        </fuse-widget>
+
                    </textarea>
-                </fuse-hljs>
+                </fuse-highlight>
+
            </p>
        </div>

--- a/src/app/main/content/pages/authentication/forgot-password-2/forgot-password-2.module.ts
+++ b/src/app/main/content/pages/authentication/forgot-password-2/forgot-password-2.module.ts
@@ -6,7 +6,7 @@ import { FuseForgotPassword2Component } from './forgot-password-2.component';

 const routes = [
    {
-        path     : 'pages/auth/forgot-password-2',
+        path     : 'auth/forgot-password-2',
        component: FuseForgotPassword2Component
    }
 ];
--- a/src/app/main/content/pages/authentication/forgot-password/forgot-password.module.ts
+++ b/src/app/main/content/pages/authentication/forgot-password/forgot-password.module.ts
@@ -6,7 +6,7 @@ import { FuseForgotPasswordComponent } from './forgot-password.component';

 const routes = [
    {
-        path     : 'pages/auth/forgot-password',
+        path     : 'auth/forgot-password',
        component: FuseForgotPasswordComponent
    }
 ];
--- a/src/app/main/content/pages/authentication/lock/lock.module.ts
+++ b/src/app/main/content/pages/authentication/lock/lock.module.ts
@@ -6,7 +6,7 @@ import { FuseLockComponent } from './lock.component';

 const routes = [
    {
-        path     : 'pages/auth/lock',
+        path     : 'auth/lock',
        component: FuseLockComponent
    }
 ];
--- a/src/app/main/content/pages/authentication/login-2/login-2.module.ts
+++ b/src/app/main/content/pages/authentication/login-2/login-2.module.ts
@@ -6,7 +6,7 @@ import { FuseLogin2Component } from './login-2.component';

 const routes = [
    {
-        path     : 'pages/auth/login-2',
+        path     : 'auth/login-2',
        component: FuseLogin2Component
    }
 ];
--- a/src/app/main/content/pages/authentication/login/login.module.ts
+++ b/src/app/main/content/pages/authentication/login/login.module.ts
@@ -6,7 +6,7 @@ import { FuseLoginComponent } from './login.component';

 const routes = [
    {
-        path     : 'pages/auth/login',
+        path     : 'auth/login',
        component: FuseLoginComponent
    }
 ];
--- a/src/app/main/content/pages/authentication/mail-confirm/mail-confirm.module.ts
+++ b/src/app/main/content/pages/authentication/mail-confirm/mail-confirm.module.ts
@@ -6,7 +6,7 @@ import { FuseMailConfirmComponent } from './mail-confirm.component';

 const routes = [
    {
-        path     : 'pages/auth/mail-confirm',
+        path     : 'auth/mail-confirm',
        component: FuseMailConfirmComponent
    }
 ];
--- a/src/app/main/content/pages/authentication/register-2/register-2.module.ts
+++ b/src/app/main/content/pages/authentication/register-2/register-2.module.ts
@@ -6,7 +6,7 @@ import { FuseRegister2Component } from './register-2.component';

 const routes = [
    {
-        path     : 'pages/auth/register-2',
+        path     : 'auth/register-2',
        component: FuseRegister2Component
    }
 ];
--- a/src/app/main/content/pages/authentication/register/register.module.ts
+++ b/src/app/main/content/pages/authentication/register/register.module.ts
@@ -6,7 +6,7 @@ import { FuseRegisterComponent } from './register.component';

 const routes = [
    {
-        path     : 'pages/auth/register',
+        path     : 'auth/register',
        component: FuseRegisterComponent
    }
 ];
--- a/src/app/main/content/pages/authentication/reset-password-2/reset-password-2.module.ts
+++ b/src/app/main/content/pages/authentication/reset-password-2/reset-password-2.module.ts
@@ -6,7 +6,7 @@ import { FuseResetPassword2Component } from './reset-password-2.component';

 const routes = [
    {
-        path     : 'pages/auth/reset-password-2',
+        path     : 'auth/reset-password-2',
        component: FuseResetPassword2Component
    }
 ];
--- a/src/app/main/content/pages/authentication/reset-password/reset-password.module.ts
+++ b/src/app/main/content/pages/authentication/reset-password/reset-password.module.ts
@@ -6,7 +6,7 @@ import { FuseResetPasswordComponent } from './reset-password.component';

 const routes = [
    {
-        path     : 'pages/auth/reset-password',
+        path     : 'auth/reset-password',
        component: FuseResetPasswordComponent
    }
 ];
--- a/src/app/main/content/pages/coming-soon/coming-soon.module.ts
+++ b/src/app/main/content/pages/coming-soon/coming-soon.module.ts
@@ -6,7 +6,7 @@ import { FuseComingSoonComponent } from './coming-soon.component';

 const routes = [
    {
-        path     : 'pages/coming-soon',
+        path     : 'coming-soon',
        component: FuseComingSoonComponent
    }
 ];
--- a/src/app/main/content/pages/errors/404/error-404.module.ts
+++ b/src/app/main/content/pages/errors/404/error-404.module.ts
@@ -6,7 +6,7 @@ import { FuseError404Component } from './error-404.component';

 const routes = [
    {
-        path     : 'pages/errors/error-404',
+        path     : 'errors/error-404',
        component: FuseError404Component
    }
 ];
--- a/src/app/main/content/pages/errors/500/error-500.module.ts
+++ b/src/app/main/content/pages/errors/500/error-500.module.ts
@@ -6,7 +6,7 @@ import { FuseError500Component } from './error-500.component';

 const routes = [
    {
-        path     : 'pages/errors/error-500',
+        path     : 'errors/error-500',
        component: FuseError500Component
    }
 ];
--- a/src/app/main/content/pages/faq/faq.module.ts
+++ b/src/app/main/content/pages/faq/faq.module.ts
@@ -6,7 +6,7 @@ import { FaqService } from './faq.service';

 const routes = [
    {
-        path     : 'pages/faq',
+        path     : 'faq',
        component: FuseFaqComponent,
        resolve  : {
            faq: FaqService
--- a/src/app/main/content/pages/invoices/compact/compact.module.ts
+++ b/src/app/main/content/pages/invoices/compact/compact.module.ts
@@ -7,7 +7,7 @@ import { InvoiceService } from '../invoice.service';

 const routes = [
    {
-        path     : 'pages/invoices/compact',
+        path     : 'invoices/compact',
        component: FuseInvoiceCompactComponent,
        resolve  : {
            search: InvoiceService
--- a/src/app/main/content/pages/invoices/modern/modern.module.ts
+++ b/src/app/main/content/pages/invoices/modern/modern.module.ts
@@ -7,7 +7,7 @@ import { InvoiceService } from '../invoice.service';

 const routes = [
    {
-        path     : 'pages/invoices/modern',
+        path     : 'invoices/modern',
        component: FuseInvoiceModernComponent,
        resolve  : {
            search: InvoiceService
--- a/src/app/main/content/pages/knowledge-base/knowledge-base.module.ts
+++ b/src/app/main/content/pages/knowledge-base/knowledge-base.module.ts
@@ -7,7 +7,7 @@ import { FuseKnowledgeBaseArticleComponent } from './dialogs/article/article.com

 const routes = [
    {
-        path     : 'pages/knowledge-base',
+        path     : 'knowledge-base',
        component: FuseKnowledgeBaseComponent,
        resolve  : {
            knowledgeBase: KnowledgeBaseService
--- a/src/app/main/content/pages/maintenance/maintenence.module.ts
+++ b/src/app/main/content/pages/maintenance/maintenence.module.ts
@@ -6,7 +6,7 @@ import { FuseMaintenanceComponent } from './maintenance.component';

 const routes = [
    {
-        path     : 'pages/maintenance',
+        path     : 'maintenance',
        component: FuseMaintenanceComponent
    }
 ];
--- a/src/app/main/content/pages/pages.module.ts
+++ b/src/app/main/content/pages/pages.module.ts
@@ -66,6 +66,7 @@ import { KnowledgeBaseModule } from './knowledge-base/knowledge-base.module';
        KnowledgeBaseModule
    ]
 })
-export class PagesModule
+export class FusePagesModule
 {
+
 }
--- a/src/app/main/content/pages/pricing/pricing.module.ts
+++ b/src/app/main/content/pages/pricing/pricing.module.ts
@@ -8,15 +8,15 @@ import { FusePricingStyle3Component } from './style-3/style-3.component';

 const routes = [
    {
-        path     : 'pages/pricing/style-1',
+        path     : 'pricing/style-1',
        component: FusePricingStyle1Component
    },
    {
-        path     : 'pages/pricing/style-2',
+        path     : 'pricing/style-2',
        component: FusePricingStyle2Component
    },
    {
-        path     : 'pages/pricing/style-3',
+        path     : 'pricing/style-3',
        component: FusePricingStyle3Component
    }
 ];
--- a/src/app/main/content/pages/profile/profile.module.ts
+++ b/src/app/main/content/pages/profile/profile.module.ts
@@ -10,7 +10,7 @@ import { ProfileService } from './profile.service';

 const routes = [
    {
-        path     : 'pages/profile',
+        path     : 'profile',
        component: FuseProfileComponent,
        resolve  : {
            profile: ProfileService
--- a/src/app/main/content/pages/search/search.module.ts
+++ b/src/app/main/content/pages/search/search.module.ts
@@ -9,7 +9,7 @@ import { SearchService } from './search.service';

 const routes = [
    {
-        path     : 'pages/search',
+        path     : 'search',
        component: FuseSearchComponent,
        resolve  : {
            search: SearchService
--- a/src/app/main/content/services/config/config.component.html
+++ b/src/app/main/content/services/config/config.component.html
@@ -24,8 +24,10 @@
        <div class="my-48">
            <h2>Usage</h2>
            <p class="mat-grey-200-bg py-8">
-                <fuse-hljs lang="ts" class="source-code">
-                    <textarea #source hidden="hidden">
+
+                <fuse-highlight lang="typescript">
+                    <textarea #source>
+
                        export class SomeComponent
                        {
                            settings: any;
@@ -61,8 +63,10 @@
                                });
                            }
                        }
+
                    </textarea>
-                </fuse-hljs>
+                </fuse-highlight>
+
            </p>
        </div>

--- a/src/app/main/content/services/services.module.ts
+++ b/src/app/main/content/services/services.module.ts
@@ -6,11 +6,11 @@ import { FuseSplashScreenServiceDocsComponent } from './splash-screen/splash-scr

 const routes = [
    {
-        path     : 'services/config',
+        path     : 'config',
        component: FuseConfigServiceDocsComponent
    },
    {
-        path     : 'services/splash-screen',
+        path     : 'splash-screen',
        component: FuseSplashScreenServiceDocsComponent
    }
 ];
@@ -25,6 +25,7 @@ const routes = [
        FuseSplashScreenServiceDocsComponent
    ]
 })
-export class ServicesModule
+
+export class FuseServicesModule
 {
 }
--- a/src/app/main/content/services/splash-screen/splash-screen.component.html
+++ b/src/app/main/content/services/splash-screen/splash-screen.component.html
@@ -25,8 +25,10 @@
        <div class="my-48">
            <h2>Usage</h2>
            <p class="mat-grey-200-bg py-8">
-                <fuse-hljs lang="ts" class="source-code">
-                    <textarea #source hidden="hidden">
+
+                <fuse-highlight lang="typescript">
+                    <textarea #source>
+
                        export class SomeComponent
                        {
                            constructor(private fuseSplashScreen: FuseSplashScreenService) {}
@@ -36,8 +38,10 @@
                                this.fuseSplashScreen.hide();
                            }
                        }
+
                    </textarea>
-                </fuse-hljs>
+                </fuse-highlight>
+
            </p>
        </div>

--- a/src/app/main/content/ui/colors/colors.module.ts
+++ b/src/app/main/content/ui/colors/colors.module.ts
@@ -6,7 +6,7 @@ import { FuseColorsComponent } from './colors.component';

 const routes: Routes = [
    {
-        path     : 'ui/colors',
+        path     : 'colors',
        component: FuseColorsComponent
    }
 ];
--- a/src/app/main/content/ui/forms/forms.module.ts
+++ b/src/app/main/content/ui/forms/forms.module.ts
@@ -6,7 +6,7 @@ import { FuseFormsComponent } from './forms.component';

 const routes: Routes = [
    {
-        path     : 'ui/forms',
+        path     : 'forms',
        component: FuseFormsComponent
    }
 ];
--- a/src/app/main/content/ui/helper-classes/helper-classes.module.ts
+++ b/src/app/main/content/ui/helper-classes/helper-classes.module.ts
@@ -8,7 +8,7 @@ import { FuseHelperClassesWidthHeightComponent } from './tabs/width-height/width

 const routes: Routes = [
    {
-        path     : 'ui/helper-classes',
+        path     : 'helper-classes',
        component: FuseHelperClassesComponent
    }
 ];
--- a/src/app/main/content/ui/helper-classes/tabs/padding-margin/padding-margin.component.html
+++ b/src/app/main/content/ui/helper-classes/tabs/padding-margin/padding-margin.component.html
@@ -10,12 +10,12 @@
                <span>p-0</span>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <span class="p-0">No padding</span>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -26,12 +26,12 @@
                <span>p-4</span>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <span class="p-4">4px padding</span>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -42,12 +42,12 @@
                <span>p-12</span>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <span class="p-12">12px padding</span>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -69,7 +69,7 @@
                <span>py-0</span>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <span class="pt-0">0 padding from top</span>
@@ -79,7 +79,7 @@
                    <span class="px-0">0 padding from left and right</span>
                    <span class="py-0">0 padding from top and bottom</span>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -95,7 +95,7 @@
                <span>py-4</span>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <span class="pt-4">4px padding from top</span>
@@ -105,7 +105,7 @@
                    <span class="px-4">4px padding from left and right</span>
                    <span class="py-4">4px padding from top and bottom</span>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -121,12 +121,12 @@
                <span>m-0</span>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <span class="m-0">No margin</span>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -137,12 +137,12 @@
                <span>m-4</span>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <span class="m-4">4px margin</span>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -153,12 +153,12 @@
                <span>m-12</span>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <span class="m-12">12px margin</span>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -180,7 +180,7 @@
                <span>my-0</span>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <span class="mt-0">0 margin from top</span>
@@ -190,7 +190,7 @@
                    <span class="mx-0">0 margin from left and right</span>
                    <span class="my-0">0 margin from top and bottom</span>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -206,7 +206,7 @@
                <span>my-4</span>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <span class="mt-4">4px margin from top</span>
@@ -216,7 +216,7 @@
                    <span class="mx-4">4px margin from left and right</span>
                    <span class="my-4">4px margin from top and bottom</span>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

--- a/src/app/main/content/ui/helper-classes/tabs/padding-margin/padding-margin.component.scss
+++ b/src/app/main/content/ui/helper-classes/tabs/padding-margin/padding-margin.component.scss
@@ -4,7 +4,6 @@

        .source-code {
            position: relative;
-            background: #F3F4F6;
            margin-bottom: 24px;
            min-height: 180px;

--- a/src/app/main/content/ui/helper-classes/tabs/width-height/width-height.component.html
+++ b/src/app/main/content/ui/helper-classes/tabs/width-height/width-height.component.html
@@ -10,12 +10,12 @@
                <span>w-0</span>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <span class="w-0">0px width</span>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -26,12 +26,12 @@
                <span>w-100</span>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <span class="w-100">100px width</span>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -42,12 +42,12 @@
                <span>w-25-p</span>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <span class="w-25-p">25% width</span>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -58,12 +58,12 @@
                <span>w-100-p</span>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <span class="w-100-p">100% width</span>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -79,12 +79,12 @@
                <span>h-0</span>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <span class="h-0">0px height</span>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -95,12 +95,12 @@
                <span>h-100</span>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <span class="h-100">100px height</span>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -111,12 +111,12 @@
                <span>h-25-p</span>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <span class="h-25-p">25% height</span>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -127,12 +127,12 @@
                <span>h-100-p</span>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <span class="h-100-p">100% height</span>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

--- a/src/app/main/content/ui/helper-classes/tabs/width-height/width-height.component.scss
+++ b/src/app/main/content/ui/helper-classes/tabs/width-height/width-height.component.scss
@@ -4,7 +4,6 @@

        .source-code {
            position: relative;
-            background: #F3F4F6;
            margin-bottom: 24px;
            min-height: 180px;

--- a/src/app/main/content/ui/icons/icons.module.ts
+++ b/src/app/main/content/ui/icons/icons.module.ts
@@ -5,7 +5,7 @@ import { FuseIconsComponent } from './icons.component';

 const routes: Routes = [
    {
-        path     : 'ui/icons',
+        path     : 'icons',
        component: FuseIconsComponent
    }
 ];
--- a/src/app/main/content/ui/page-layouts/page-layouts.module.ts
+++ b/src/app/main/content/ui/page-layouts/page-layouts.module.ts
@@ -24,79 +24,79 @@ import { FuseBlankComponent } from './blank/blank.component';

 const routes: Routes = [
    {
-        path     : 'ui/page-layouts/carded/full-width',
+        path     : 'page-layouts/carded/full-width',
        component: FuseCardedFullWidthComponent
    },
    {
-        path     : 'ui/page-layouts/carded/full-width-2',
+        path     : 'page-layouts/carded/full-width-2',
        component: FuseCardedFullWidth2Component
    },
    {
-        path     : 'ui/page-layouts/carded/left-sidenav',
+        path     : 'page-layouts/carded/left-sidenav',
        component: FuseCardedLeftSidenavComponent
    },
    {
-        path     : 'ui/page-layouts/carded/left-sidenav-tabbed',
+        path     : 'page-layouts/carded/left-sidenav-tabbed',
        component: FuseCardedLeftSidenavTabbedComponent
    },
    {
-        path     : 'ui/page-layouts/carded/left-sidenav-2',
+        path     : 'page-layouts/carded/left-sidenav-2',
        component: FuseCardedLeftSidenav2Component
    },
    {
-        path     : 'ui/page-layouts/carded/left-sidenav-2-tabbed',
+        path     : 'page-layouts/carded/left-sidenav-2-tabbed',
        component: FuseCardedLeftSidenav2TabbedComponent
    },
    {
-        path     : 'ui/page-layouts/carded/right-sidenav',
+        path     : 'page-layouts/carded/right-sidenav',
        component: FuseCardedRightSidenavComponent
    },
    {
-        path     : 'ui/page-layouts/carded/right-sidenav-tabbed',
+        path     : 'page-layouts/carded/right-sidenav-tabbed',
        component: FuseCardedRightSidenavTabbedComponent
    },
    {
-        path     : 'ui/page-layouts/carded/right-sidenav-2',
+        path     : 'page-layouts/carded/right-sidenav-2',
        component: FuseCardedRightSidenav2Component
    },
    {
-        path     : 'ui/page-layouts/carded/right-sidenav-2-tabbed',
+        path     : 'page-layouts/carded/right-sidenav-2-tabbed',
        component: FuseCardedRightSidenav2TabbedComponent
    },
    {
-        path     : 'ui/page-layouts/simple/full-width',
+        path     : 'page-layouts/simple/full-width',
        component: FuseSimpleFullWidthComponent
    },
    {
-        path     : 'ui/page-layouts/simple/left-sidenav',
+        path     : 'page-layouts/simple/left-sidenav',
        component: FuseSimpleLeftSidenavComponent
    },
    {
-        path     : 'ui/page-layouts/simple/left-sidenav-2',
+        path     : 'page-layouts/simple/left-sidenav-2',
        component: FuseSimpleLeftSidenav2Component
    },
    {
-        path     : 'ui/page-layouts/simple/left-sidenav-3',
+        path     : 'page-layouts/simple/left-sidenav-3',
        component: FuseSimpleLeftSidenav3Component
    },
    {
-        path     : 'ui/page-layouts/simple/right-sidenav',
+        path     : 'page-layouts/simple/right-sidenav',
        component: FuseSimpleRightSidenavComponent
    },
    {
-        path     : 'ui/page-layouts/simple/right-sidenav-2',
+        path     : 'page-layouts/simple/right-sidenav-2',
        component: FuseSimpleRightSidenav2Component
    },
    {
-        path     : 'ui/page-layouts/simple/right-sidenav-3',
+        path     : 'page-layouts/simple/right-sidenav-3',
        component: FuseSimpleRightSidenav3Component
    },
    {
-        path     : 'ui/page-layouts/simple/tabbed',
+        path     : 'page-layouts/simple/tabbed',
        component: FuseTabbedComponent
    },
    {
-        path     : 'ui/page-layouts/blank',
+        path     : 'page-layouts/blank',
        component: FuseBlankComponent
    }
 ];
--- a/src/app/main/content/ui/typography/tabs/blockquotes-lists/blockquotes-lists.component.html
+++ b/src/app/main/content/ui/typography/tabs/blockquotes-lists/blockquotes-lists.component.html
@@ -14,7 +14,7 @@
                </blockquote>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <blockquote>
@@ -23,7 +23,7 @@
                        </p>
                    </blockquote>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -40,7 +40,7 @@
                </blockquote>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <blockquote>
@@ -52,7 +52,7 @@
                        </footer>
                    </blockquote>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -69,7 +69,7 @@
                </blockquote>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <blockquote class="reverse">
@@ -81,7 +81,7 @@
                        </footer>
                    </blockquote>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -108,7 +108,7 @@
                </ol>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <ol>
@@ -124,7 +124,7 @@
                        <li>Ordered list item</li>
                    </ol>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -145,7 +145,7 @@
                </ul>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <ul>
@@ -161,7 +161,7 @@
                        <li>Unordered list item</li>
                    </ul>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -183,7 +183,7 @@
                </dl>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <dl>
@@ -194,7 +194,7 @@
                        <dd>This is also another definition description</dd>
                    </dl>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

--- a/src/app/main/content/ui/typography/tabs/blockquotes-lists/blockquotes-lists.component.scss
+++ b/src/app/main/content/ui/typography/tabs/blockquotes-lists/blockquotes-lists.component.scss
@@ -4,7 +4,6 @@

        .source-code {
            position: relative;
-            background: #F3F4F6;
            margin-bottom: 24px;
            min-height: 180px;

--- a/src/app/main/content/ui/typography/tabs/headings/headings.component.html
+++ b/src/app/main/content/ui/typography/tabs/headings/headings.component.html
@@ -11,12 +11,12 @@
                <span class="mat-display-4">Display 4</span>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <span class="mat-display-4">Display 4</span>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -27,12 +27,12 @@
                <span class="mat-display-3">Display 3</span>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <span class="mat-display-3">Display 3</span>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -43,12 +43,12 @@
                <span class="mat-display-2">Display 2</span>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <span class="mat-display-2">Display 2</span>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>
        </div>

        <div fxLayout="column" fxLayout.gt-md="row">
@@ -58,12 +58,12 @@
                <span class="mat-display-1">Display 1</span>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <span class="mat-display-1">Display 1</span>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -74,12 +74,12 @@
                <span class="mat-headline">Headline</span>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <span class="mat-headline">Headline</span>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -90,12 +90,12 @@
                <span class="mat-title">Title</span>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <span class="mat-title">Title</span>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -106,12 +106,12 @@
                <span class="mat-subheading-2">Subheading 2</span>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <span class="mat-subheading-2">Subheading 2</span>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -122,12 +122,12 @@
                <span class="mat-subheading-1">Subheading 1</span>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <span class="mat-subheading-1">Subheading 1</span>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -138,12 +138,12 @@
                <span class="mat-body-1">Body 1</span>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <span class="mat-body-1">Body 1</span>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -154,12 +154,12 @@
                <span class="mat-body-2">Body 2</span>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <span class="mat-body-2">Body 2</span>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -170,12 +170,12 @@
                <span class="mat-caption">Caption</span>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <span class="mat-caption">Caption</span>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -192,13 +192,13 @@
                <span class="h1">Heading 1</span>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <h1>Heading 1</h1>
                    <span class="h1">Heading 1</span>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -209,13 +209,13 @@
                <span class="h2">Heading 2</span>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <h2>Heading 2</h2>
                    <span class="h2">Heading 2</span>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -226,13 +226,13 @@
                <span class="h3">Heading 3</span>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <h3>Heading 3</h3>
                    <span class="h3">Heading 3</span>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -243,13 +243,13 @@
                <span class="h4">Heading 4</span>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <h4>Heading 4</h4>
                    <span class="h4">Heading 4</span>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -260,13 +260,13 @@
                <span class="h5">Heading 5</span>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <h5>Heading 5</h5>
                    <span class="h5">Heading 5</span>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -277,13 +277,13 @@
                <span class="h6">Heading 6</span>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <h6>Heading 6</h6>
                    <span class="h6">Heading 6</span>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

--- a/src/app/main/content/ui/typography/tabs/headings/headings.component.scss
+++ b/src/app/main/content/ui/typography/tabs/headings/headings.component.scss
@@ -4,7 +4,6 @@

        .source-code {
            position: relative;
-            background: #F3F4F6;
            margin-bottom: 24px;
            min-height: 180px;

--- a/src/app/main/content/ui/typography/tabs/helpers/helpers.component.html
+++ b/src/app/main/content/ui/typography/tabs/helpers/helpers.component.html
@@ -13,14 +13,14 @@
                <span class="font-weight-900">font-weight: 900</span>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <span class="font-weight-100">100 font weight</span>
                    ...
                    <span class="font-weight-900">900 font weight</span>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -37,12 +37,12 @@
                <span class="font-size-20">font-size: 20</span>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <span class="font-size-20">font-size: 20</span>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -61,14 +61,14 @@
                <span>line-height: 120</span>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <span class="line-height-2">2px line height</span>
                    ...
                    <span class="line-height-120">120px line height</span>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -84,12 +84,12 @@
                <div class="text-left">Left aligned text</div>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <div class="text-left">Left aligned text</div>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -99,12 +99,12 @@
                <div class="text-center">Center aligned text</div>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <div class="text-center">Center aligned text</div>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -114,12 +114,12 @@
                <div class="text-right">Right aligned text</div>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <div class="text-right">Right aligned text</div>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -131,14 +131,14 @@
                </p>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <p>
                        <span class="text-boxed">Boxed text</span>
                    </p>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -150,14 +150,14 @@
                </p>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <p>
                        <span class="text-boxed-light">Boxed text light</span>
                    </p>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -169,14 +169,14 @@
                </p>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <p>
                        <span class="text-strike">Strike-through text</span>
                    </p>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -186,12 +186,12 @@
                <div class="text-italic">Italic text</div>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <div class="text-italic">Italic text</div>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -201,12 +201,12 @@
                <div class="text-semibold">Semi-bold text</div>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <div class="text-semibold">Semi-bold text</div>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -216,12 +216,12 @@
                <div class="text-bold">Bold text</div>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <div class="text-bold">Bold text</div>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -233,14 +233,14 @@
                </span>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <span class="text-truncate">
                        This is a truncated text. It will be truncated if it's too long. Vivamus convallis dui porta massa.
                    </span>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

--- a/src/app/main/content/ui/typography/tabs/helpers/helpers.component.scss
+++ b/src/app/main/content/ui/typography/tabs/helpers/helpers.component.scss
@@ -4,7 +4,6 @@

        .source-code {
            position: relative;
-            background: #F3F4F6;
            margin-bottom: 24px;
            min-height: 180px;

--- a/src/app/main/content/ui/typography/tabs/inline-text-elements/inline-text-elements.component.html
+++ b/src/app/main/content/ui/typography/tabs/inline-text-elements/inline-text-elements.component.html
@@ -8,12 +8,12 @@
                <span><abbr title="Cascaded Style Sheet">CSS</abbr></span>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <abbr title="Cascaded Style Sheet">CSS</abbr>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -23,12 +23,12 @@
                <span>This is a <mark>marked</mark> text.</span>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    This is a <mark>marked</mark> text.
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -40,12 +40,12 @@
                </span>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <del>This is a deleted text.</del>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -55,12 +55,12 @@
                <span><s>This is a strike-through text.</s></span>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <s>This is a strike-through text.</s>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -70,12 +70,12 @@
                <span><u>This is an underlined text.</u></span>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <u>This is an underlined text.</u>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -87,12 +87,12 @@
                </span>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <small>This is a small text.</small>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -102,12 +102,12 @@
                <span><strong>This is a strong text.</strong></span>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <strong>This is a strong text.</strong>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -117,12 +117,12 @@
                <span><em>This is an italic text.</em></span>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    <em>This is an italic text.</em>
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -135,14 +135,14 @@
                </span>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    This is a
                    <span class="text-super">super</span>
                    text.
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -156,14 +156,14 @@
                </span>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    This is a
                    <span class="text-sub">sub</span>
                    text.
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -176,14 +176,14 @@
                </span>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    This is a
                    <span class="text-capitalized">capitalized</span>
                    text.
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -196,14 +196,14 @@
                </span>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    This is an
                    <span class="text-uppercase">uppercase</span>
                    text.
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

@@ -216,14 +216,14 @@
                </span>
            </div>

-            <fuse-hljs lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
+            <fuse-highlight lang="html" class="source-code" fxLayout="column" fxLayoutAlign="center"
                       fxFlex="50">
                <textarea #source hidden="hidden">
                    This is a
                    <span class="text-lowercase">LOWERCASE</span>
                    text.
                </textarea>
-            </fuse-hljs>
+            </fuse-highlight>

        </div>

--- a/src/app/main/content/ui/typography/tabs/inline-text-elements/inline-text-elements.component.scss
+++ b/src/app/main/content/ui/typography/tabs/inline-text-elements/inline-text-elements.component.scss
@@ -4,7 +4,6 @@

        .source-code {
            position: relative;
-            background: #F3F4F6;
            margin-bottom: 24px;
            min-height: 180px;

--- a/src/app/main/content/ui/typography/typography.module.ts
+++ b/src/app/main/content/ui/typography/typography.module.ts
@@ -10,7 +10,7 @@ import { FuseTypographyHelpersComponent } from './tabs/helpers/helpers.component

 const routes: Routes = [
    {
-        path     : 'ui/typography',
+        path     : 'typography',
        component: FuseTypographyComponent
    }
 ];
--- a/src/app/main/content/ui/ui.module.ts
+++ b/src/app/main/content/ui/ui.module.ts
@@ -17,6 +17,6 @@ import { UIColorsModule } from './colors/colors.module';
        UIColorsModule
    ]
 })
-export class UIModule
+export class FuseUIModule
 {
 }
--- a/src/app/main/toolbar/toolbar.component.html
+++ b/src/app/main/toolbar/toolbar.component.html
@@ -36,7 +36,7 @@
                </div>
            </button>

-            <mat-menu #userMenu="matMenu">
+            <mat-menu #userMenu="matMenu" [overlapTrigger]="false">

                <button mat-menu-item>
                    <mat-icon>account_circle</mat-icon>
@@ -70,7 +70,7 @@
                </div>
            </button>

-            <mat-menu #languageMenu="matMenu">
+            <mat-menu #languageMenu="matMenu" [overlapTrigger]="false">

                <button mat-menu-item *ngFor="let lang of languages" (click)="setLanguage(lang)">
                    <div fxLayout="row" fxLayoutAlign="start center">
--- a/src/app/navigation/navigation.model.ts
+++ b/src/app/navigation/navigation.model.ts
@@ -823,11 +823,11 @@ export class FuseNavigationModel implements FuseNavigationModelInterface
                        'url'  : '/components/countdown'
                    },
                    {
-                        'id'   : 'highlightjs',
-                        'title': 'Highlight.js',
+                        'id'   : 'highlight',
+                        'title': 'Highlight',
                        'type' : 'item',
                        'icon' : 'settings_input_component',
-                        'url'  : '/components/highlightjs'
+                        'url'  : '/components/highlight'
                    },
                    {
                        'id'   : 'material-color-picker',
Author	SHA1	Message	Date
Sercan Yemen	8b590408b0	Updated Angular & Angular Material + Increased the Fuse version	2018-01-11 12:57:38 +03:00
Sercan Yemen	18b2bdf5ab	Mail-Ngrx app throws errors for certain rxjs operators + Various other small code fixes	2018-01-11 12:31:06 +03:00
Sercan Yemen	ba49621e79	Update perfect scrollbar on document click... This isn't the most elegant solution but there is no other way of knowing when the contents of the scrollable container changes. Therefore, we update scrollbars on every document click.	2018-01-09 11:30:11 +03:00
Sercan Yemen	416f1997a9	Updated Angular Material, Angular and various other modules to latest versions	2018-01-08 16:39:44 +03:00
Sercan Yemen	fcfbedfd74	Increase the version number to 1.3.2	2018-01-08 16:02:45 +03:00
Sercan Yemen	35f3512e89	Added the [path] input to the fuse-highlight for loading source code externally + Removed highlight.js and angular2-markdown + Updated the Angular Material example viewer	2018-01-08 16:02:00 +03:00
Sercan Yemen	2288905cbd	Merge branch 'master' of https://github.com/withinpixels/fuse2 + fuse-hljs replaced with fuse-highlight	2018-01-08 15:29:04 +03:00
Sercan Yemen	5a40116c7b	Merge branch 'master' of https://github.com/withinpixels/fuse2 + fuse-hljs replaced with fuse-highlight	2018-01-08 15:28:50 +03:00
Sercan Yemen	b7c10a515c	Added new cards	2018-01-08 12:40:39 +03:00
Sercan Yemen	65e637eeb9	Use [overlapTrigger] in toolbar menus	2018-01-08 12:40:25 +03:00
Sercan Yemen	b56088948c	added --open to the "npm start"	2018-01-08 12:39:55 +03:00
mustafahlvc	0c5066e7d0	Lazy loading applied to group of demo modules.	2018-01-08 12:37:52 +03:00
Sercan Yemen	751497556a	(Contacts App) Fixed: Selected filter is not preserved on route changes	2018-01-03 10:32:15 +03:00